111

src/views/modules/communityService/policy/rule.vue

@@ -62,7 +62,7 @@
                      :value="item.value">
           </el-option>
         </el-select>
-        <div>
+        <div v-if="personItem.queryType!=='is_null'&&personItem.queryType!=='is_not_null'">
 
           <el-select v-if="personItem.colType==='select'||personItem.colType==='radio'||personItem.colType==='checkbox'"
                      class="item_width_2"
@@ -97,6 +97,7 @@
                     placeholder="请输入"
                     v-model="personItem.colVal">
           </el-input>
+
         </div>
 
         <el-select v-if="personIndex<(resiRuleList.length-1)"
@@ -158,7 +159,7 @@
                      :value="item.value">
           </el-option>
         </el-select>
-        <div>
+        <div v-if="houseItem.queryType!=='is_null'&&houseItem.queryType!=='is_not_null'">
 
           <el-select v-if="houseItem.colType==='select'||houseItem.colType==='radio'||houseItem.colType==='checkbox'"
                      class="item_width_2"
@@ -254,8 +255,8 @@
                      :value="item.value">
           </el-option>
         </el-select>
-        <div>
 
+        <div v-if="staticItem.queryType!=='is_null'&&staticItem.queryType!=='is_not_null'">
           <el-select v-if="staticItem.colType==='select'||staticItem.colType==='radio'||staticItem.colType==='checkbox'"
                      class="item_width_2"
                      v-model="staticItem.colVal"
@@ -564,27 +565,22 @@ export default {
 
         this.resiRuleList.forEach((item, index) => {
 
-          if (index === this.resiRuleList.length - 1) {
           if (item.itemGroupId === '' ||
             item.itemId === '' ||
             item.queryType === '' ||
-              item.colKey === '' ||
+            item.colKey === ''
-              item.colVal === '') {
+          ) {
-
             message = '匹配规则' + (this.index + 1) + '人员信息不完整，请填写完整！'
             return message
           }
-          } else {
+          if ((index != this.resiRuleList.length - 1) && item.nextLogicalRel === '') {
-            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 === '') {
 
+
+          if (item.itemGroupId === '' ||
+            item.itemId === '' ||
+            item.queryType === '' ||
+            item.colKey === ''
+          ) {
             message = '匹配规则' + (this.index + 1) + '房屋信息不完整，请填写完整！'
             return message
           }
-          } else {
+          if ((index != this.houseRuleList.length - 1) && item.nextLogicalRel === '') {
-            if (item.nextLogicalRel === '' ||
-              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
           }
+
+
         });
       }
 
       if (valStatic) {
         this.statRuleList.forEach((item, index) => {
-          if (index === this.statRuleList.length - 1) {
-            if (item.queryType === '' ||
-              item.colKey === '' ||
-              item.colVal === '') {
 
+
+          if (item.itemGroupId === '' ||
+            item.itemId === '' ||
+            item.queryType === '' ||
+            item.colKey === ''
+          ) {
             message = '匹配规则' + (this.index + 1) + '统计信息不完整，请填写完整！'
             return message
           }
-          } else {
+          if ((index != this.statRuleList.length - 1) && item.nextLogicalRel === '') {
-            if (item.nextLogicalRel === '' ||
-              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
           }
+
         });
       }