11

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

@@ -95,7 +95,8 @@
                         label-width="150px"
                         style="display: block">
             <rule :ref="'ref_rule'+index"
-                  :formType="formType"></rule>
+                  :formType="formType"
+                  :index="index"></rule>
           </el-form-item>
           <div v-if="index===(ruleList.length-1)"
                class="btn-add-rule">
@@ -372,14 +373,14 @@ export default {
 
     async handleAdd () {
       let isOk = false
-      this.ruleList.forEach((oneRule, index) => {
-        // if (!oneRule.ruleName) {
-        //   this.$message.error('政策细则不能为空')
-        //   isOk = false
-        // }
+
+      for (let index = 0; index < this.ruleList.length; index++) {
+        let oneRule = this.ruleList[index]
+
         let refObj = this.$refs['ref_rule' + index][0]
 
         refObj.getRule(true, true, true)
+
         if (refObj.okflag) {
           oneRule.resiRuleList = refObj.resiRuleList
           oneRule.resiRuleList.forEach(element => {
@@ -434,11 +435,11 @@ export default {
 
         } else {
           isOk = false
-
-        }
-      });
+          break
 
 
+        }
+      }
 
       if (!isOk) {
         return false
@@ -487,7 +488,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.$message.success('新增成功')
+        this.$message.success('操作成功')
         this.resetData()
         this.$emit('handleOk')
       } else {

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

@@ -126,7 +126,7 @@
           <el-table-column fixed="right"
                            label="操作"
                            align="center"
-                           width="180">
+                           width="200">
             <template slot-scope="scope">
               <el-button @click="handleDetail(scope.row)"
                          type="text"

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

@@ -556,7 +556,7 @@ export default {
               item.colKey === '' ||
               item.colVal === '') {
 
-              message = '人员信息不完整，请填写完整！'
+              message = '匹配规则' + (this.index + 1) + '人员信息不完整，请填写完整！'
               return message
             }
           } else {
@@ -567,7 +567,7 @@ export default {
               item.colKey === '' ||
               item.colVal === '') {
 
-              message = '人员信息不完整，请填写完整！'
+              message = '匹配规则' + (this.index + 1) + '人员信息不完整，请填写完整！'
               return message
             }
           }
@@ -586,7 +586,7 @@ export default {
               item.colKey === '' ||
               item.colVal === '') {
 
-              message = '房屋信息不完整，请填写完整！'
+              message = '匹配规则' + (this.index + 1) + '房屋信息不完整，请填写完整！'
               return message
             }
           } else {
@@ -595,7 +595,7 @@ export default {
               item.colKey === '' ||
               item.colVal === '') {
 
-              message = '房屋信息不完整，请填写完整！'
+              message = '匹配规则' + (this.index + 1) + '房屋信息不完整，请填写完整！'
               return message
             }
           }
@@ -609,7 +609,7 @@ export default {
               item.colKey === '' ||
               item.colVal === '') {
 
-              message = '统计信息不完整，请填写完整！'
+              message = '匹配规则' + (this.index + 1) + '统计信息不完整，请填写完整！'
               return message
             }
           } else {
@@ -618,7 +618,7 @@ export default {
               item.colKey === '' ||
               item.colVal === '') {
 
-              message = '统计信息不完整，请填写完整！'
+              message = '匹配规则' + (this.index + 1) + '统计信息不完整，请填写完整！'
               return message
             }
           }
@@ -1140,6 +1140,10 @@ export default {
       type: String,
       required: 'true'
     },
+    index: {
+      type: Number,
+      required: 'true'
+    },
 
   }
 }