Merge branch 'dev-fangyi0919' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fangyi0919

src/views/modules/base/epidemic/natFocus/natFocusAdd.vue

@@ -74,7 +74,7 @@
             </el-form-item>
             <el-form-item
               label="隔离状态"
-              prop="reason"
+              prop="isolatedState"
               label-width="150px"
               style="display: block"
             >
@@ -324,6 +324,7 @@
               :model="formData2"
               ref="ref_form2"
               :label-width="'90px'"
+              :rules="dataRule1"
             >
               <el-form-item
                 label="关注原因"
@@ -341,7 +342,7 @@
               </el-form-item>
               <el-form-item
                 label="隔离状态"
-                prop="reason"
+                prop="isolatedState"
                 label-width="100px"
                 style="display: block"
               >
@@ -673,7 +674,13 @@ export default {
           }
         });
       } else {
-        this.handleVero();
+        this.$refs["ref_form2"].validate((valid, messageObj) => {
+          if (!valid) {
+            app.util.validateRule(messageObj);
+          } else {
+            this.handleVero();
+          }
+        });
       }
     },
 
@@ -875,6 +882,9 @@ export default {
         mobile: [
           { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
+        isolatedState: [
+          { required: true, message: "隔离状态必填", trigger: "blur" },
+        ],
       };
     },
   },

src/views/modules/base/epidemic/natFocus/natFocusEdit.vue

@@ -6,6 +6,7 @@
         :inline="true"
         :model="formData"
         :disabled="formType === 'detail'"
+        :rules="dataRule"
         class="form"
       >
         <el-form-item
@@ -65,7 +66,7 @@
         </el-form-item>
         <el-form-item
           label="隔离状态"
-          prop="reason"
+          prop="isolatedState"
           label-width="150px"
           style="display: block"
         >
@@ -224,7 +225,17 @@ export default {
       this.formData = JSON.parse(JSON.stringify(row));
     },
 
-    async handleComfirm() {
+    handleComfirm() {
+      this.$refs["ref_form1"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+        } else {
+          this.submit();
+        }
+      });
+    },
+
+    async submit() {
       if (this.formData.isSelChannel) {
         if (!this.formData.content) {
           this.$message({
@@ -321,12 +332,8 @@ export default {
     ...mapGetters(["clientHeight", "iframeHeight"]),
     dataRule() {
       return {
-        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+        isolatedState: [
-        idCard: [
+          { required: true, message: "隔离状态必填", trigger: "blur" },
-          { required: true, message: "证件号不能为空", trigger: "blur" },
-        ],
-        mobile: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
 
         channel: [{ required: false }],

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -944,14 +944,14 @@ export default {
     async deleteFocus(row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
-      let idCards = [];
+      let ids = [];
 
       this.selectionAll.forEach((element) => {
-        idCards.push(element.idCard);
+        ids.push(element.id);
       });
       let params = {
         attentionType: 2,
-        ids: idCards,
+        ids: ids,
       };
 
       const { data, code, msg } = await requestPost(url, params);