diff --git a/src/views/modules/communityService/policy/rule.vue b/src/views/modules/communityService/policy/rule.vue index 5eb178ed..902653cb 100644 --- a/src/views/modules/communityService/policy/rule.vue +++ b/src/views/modules/communityService/policy/rule.vue @@ -62,7 +62,7 @@ :value="item.value"> -
+
+
-
+
-
+
{ - if (index === this.resiRuleList.length - 1) { - if (item.itemGroupId === '' || - item.itemId === '' || - item.queryType === '' || - item.colKey === '' || - item.colVal === '') { + if (item.itemGroupId === '' || + item.itemId === '' || + item.queryType === '' || + item.colKey === '' + ) { + message = '匹配规则' + (this.index + 1) + '人员信息不完整,请填写完整!' + return message + } + if ((index != this.resiRuleList.length - 1) && item.nextLogicalRel === '') { + message = '匹配规则' + (this.index + 1) + '人员信息不完整,请填写完整!' + return message + } - message = '匹配规则' + (this.index + 1) + '人员信息不完整,请填写完整!' - return message - } - } else { - if (item.nextLogicalRel === '' || - item.itemGroupId === '' || - item.itemId === '' || - item.queryType === '' || - item.colKey === '' || - item.colVal === '') { - - message = '匹配规则' + (this.index + 1) + '人员信息不完整,请填写完整!' - return message - } + if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') { + message = '匹配规则' + (this.index + 1) + '人员信息不完整,请填写完整!' + return message } }); @@ -597,48 +593,53 @@ export default { this.houseRuleList.forEach((item, index) => { - if (index === this.houseRuleList.length - 1) { - if (item.queryType === '' || - item.colKey === '' || - item.colVal === '') { - message = '匹配规则' + (this.index + 1) + '房屋信息不完整,请填写完整!' - return message - } - } else { - if (item.nextLogicalRel === '' || - item.queryType === '' || - item.colKey === '' || - item.colVal === '') { - - message = '匹配规则' + (this.index + 1) + '房屋信息不完整,请填写完整!' - return message - } + + if (item.itemGroupId === '' || + item.itemId === '' || + item.queryType === '' || + item.colKey === '' + ) { + message = '匹配规则' + (this.index + 1) + '房屋信息不完整,请填写完整!' + return message + } + if ((index != this.houseRuleList.length - 1) && item.nextLogicalRel === '') { + message = '匹配规则' + (this.index + 1) + '房屋信息不完整,请填写完整!' + return message + } + + if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') { + message = '匹配规则' + (this.index + 1) + '房屋信息不完整,请填写完整!' + return message } + + }); } if (valStatic) { this.statRuleList.forEach((item, index) => { - if (index === this.statRuleList.length - 1) { - if (item.queryType === '' || - item.colKey === '' || - item.colVal === '') { - message = '匹配规则' + (this.index + 1) + '统计信息不完整,请填写完整!' - return message - } - } else { - if (item.nextLogicalRel === '' || - item.queryType === '' || - item.colKey === '' || - item.colVal === '') { - - message = '匹配规则' + (this.index + 1) + '统计信息不完整,请填写完整!' - return message - } + + if (item.itemGroupId === '' || + item.itemId === '' || + item.queryType === '' || + item.colKey === '' + ) { + message = '匹配规则' + (this.index + 1) + '统计信息不完整,请填写完整!' + return message + } + if ((index != this.statRuleList.length - 1) && item.nextLogicalRel === '') { + message = '匹配规则' + (this.index + 1) + '统计信息不完整,请填写完整!' + return message } + + if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') { + message = '匹配规则' + (this.index + 1) + '统计信息不完整,请填写完整!' + return message + } + }); }