|
|
@@ -40,7 +40,7 @@
|
|
|
.form-texarea {
|
|
|
/deep/ .el-form-item__error {
|
|
|
// position: absolute;
|
|
|
- top: 54px!important;
|
|
|
+ top: 54px !important;
|
|
|
}
|
|
|
/deep/ .el-textarea__inner {
|
|
|
resize: none;
|
|
|
@@ -156,9 +156,9 @@
|
|
|
<el-table-column
|
|
|
width="170px"
|
|
|
label="附加信息"
|
|
|
- prop="subMsg"
|
|
|
v-if="showMsg || showMsg2"
|
|
|
>
|
|
|
+
|
|
|
<template slot="header" slot-scope="scope">
|
|
|
<div :class="showMsg?'custom_table_header':''">附加信息</div>
|
|
|
</template>
|
|
|
@@ -178,12 +178,7 @@
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- width="80px"
|
|
|
- v-if="maxNum && maxNum > 1"
|
|
|
- label="基础规则"
|
|
|
- prop="groupType"
|
|
|
- >
|
|
|
+ <el-table-column width="80px" v-if="maxNum && maxNum > 1" label="基础规则" prop="groupType">
|
|
|
<template slot-scope="scope">
|
|
|
<div class="btn_box">
|
|
|
<div class="btn_div" v-if="!isMax(scope.row.groupId)">
|
|
|
@@ -521,7 +516,7 @@
|
|
|
label="正则表达式："
|
|
|
label-width="120px"
|
|
|
style="width: 100%"
|
|
|
- :prop="`klRuleByIdSub[${scope.$index}].subEqValue1`"
|
|
|
+ :prop="`klRuleByIdSub[${scope.$index}].subEqValue`"
|
|
|
:rules="[
|
|
|
{
|
|
|
required: true,
|
|
|
@@ -646,6 +641,7 @@ export default {
|
|
|
// cellStyle
|
|
|
cellStyle({ row, column, rowIndex, columnIndex }) {
|
|
|
if (column.label == '组' || column.label == '基础规则') return {};
|
|
|
+ if (column.label == '附加信息') return { 'padding-top': '14px' };
|
|
|
return { 'vertical-align': 'top', 'padding-top': '14px' };
|
|
|
},
|
|
|
// 最大值 选择rule
|
|
|
@@ -830,8 +826,6 @@ export default {
|
|
|
: '正则表达式';
|
|
|
},
|
|
|
blurRef() {
|
|
|
- console.log('scroll');
|
|
|
- console.log(this.$refs[this.theRef]);
|
|
|
if (this.theRef) {
|
|
|
this.$refs[this.theRef].blur();
|
|
|
// console.log(document.getElementById(this.theRef).blur,'hehehe');
|
|
|
@@ -888,7 +882,7 @@ export default {
|
|
|
showMsg: {
|
|
|
default: null
|
|
|
},
|
|
|
- showMsg2: {
|
|
|
+ showMsg2:{
|
|
|
default: null
|
|
|
},
|
|
|
ruleTermCodeStr: {
|
wyq