|
@@ -196,7 +196,7 @@
|
|
|
<div class="table_cell" style="flex: 3; max-width: 50%" v-if="showMsg">
|
|
|
<!-- <el-form-item label-width="130px" label="附加信息:" :rules="rules.parMsg" prop="parMsg">
|
|
|
<el-input type="textarea" :rows="1" placeholder="请输入附加信息" v-model.trim="form.parMsg"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 表格 -->
|
|
@@ -334,7 +334,6 @@ export default {
|
|
|
} else if (item.subEqValue) {
|
|
|
item.dataType = '2';
|
|
|
}
|
|
|
-
|
|
|
// disable
|
|
|
if (this.form.parHasSub && this.firstPlace) {
|
|
|
const del =
|
|
@@ -367,6 +366,17 @@ export default {
|
|
|
if (dragDel.length > 0) {
|
|
|
const obj = this.baseTypeList.find(it => it.type === 1);
|
|
|
if (arr[i - 1] && arr[i - 1].groupId == item.groupId) {
|
|
|
+ let klRuleByIdSub = this.form.klRuleByIdSub;
|
|
|
+ klRuleByIdSub.forEach((item, i, arr) => {
|
|
|
+ if (arr[0].subType == 1) {
|
|
|
+ const arr = this.baseTypeList.filter(it => {
|
|
|
+ return it.type == 1;
|
|
|
+ });
|
|
|
+ if (i > 0) {
|
|
|
+ this.$set(item, 'baseTypes', arr);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
if (i == 2) {
|
|
|
//获取互斥项code
|
|
|
const list = obj.subMenuList.filter(it => {
|
|
@@ -623,7 +633,9 @@ export default {
|
|
|
const arr = this.baseTypeList.filter(it => {
|
|
|
return it.type == 1;
|
|
|
});
|
|
|
- this.$set(item, 'baseTypes', arr);
|
|
|
+ if (i > 0) {
|
|
|
+ this.$set(item, 'baseTypes', arr);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -718,7 +730,9 @@ export default {
|
|
|
const arr = this.baseTypeList.filter(it => {
|
|
|
return it.type == 1;
|
|
|
});
|
|
|
- this.$set(item, 'baseTypes', arr);
|
|
|
+ if (i > 0) {
|
|
|
+ this.$set(item, 'baseTypes', arr);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -1012,23 +1026,23 @@ export default {
|
|
|
return Object.keys(this.firstPlace || {}).length > 0;
|
|
|
},
|
|
|
ruleTermCodeStr: function() {
|
|
|
- const str = this.form.parRuleType + '-' + this.form.parLenCode+ "-" + 1;
|
|
|
+ const str = this.form.parRuleType + '-' + this.form.parLenCode + '-' + 1;
|
|
|
if (str.length <= 1) {
|
|
|
return '';
|
|
|
}
|
|
|
return str;
|
|
|
},
|
|
|
ruleTermCodeStr2: function() {
|
|
|
- const str = this.form.parRuleType + '-' + this.form.parLenCode+ "-" + 0;
|
|
|
+ const str = this.form.parRuleType + '-' + this.form.parLenCode + '-' + 0;
|
|
|
if (str.length <= 1) {
|
|
|
return '';
|
|
|
}
|
|
|
return str;
|
|
|
},
|
|
|
- ruleTermCodeStrs: function () {
|
|
|
- const str = this.form.parRuleType + "-" + this.form.parLenCode;
|
|
|
+ ruleTermCodeStrs: function() {
|
|
|
+ const str = this.form.parRuleType + '-' + this.form.parLenCode;
|
|
|
if (str.length <= 1) {
|
|
|
- return "";
|
|
|
+ return '';
|
|
|
}
|
|
|
return str;
|
|
|
},
|