From ad526adb1e01aa5bec472d7b05860390639b49bc Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 19 Sep 2022 18:21:00 +0800
Subject: [PATCH] =?UTF-8?q?Thanks=E2=99=AA(=EF=BD=A5=CF=89=EF=BD=A5)?=
 =?UTF-8?q?=EF=BE=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/natFocus/natFocusAdd.vue     |  8 ++++++--
 .../base/epidemic/natFocus/natFocusEdit.vue    | 18 ++++++++++++++++--
 .../base/epidemic/natFocus/natFocusList.vue    |  6 +++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 256a78224..1a2ee4f09 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/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"
               >
@@ -875,6 +876,9 @@ export default {
         mobile: [
           { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
+        isolatedState: [
+          { required: true, message: "隔离状态必填", trigger: "blur" },
+        ],
       };
     },
   },
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index a19b62c10..3952bbb0e 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/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({
@@ -328,6 +339,9 @@ export default {
         mobile: [
           { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
+        isolatedState: [
+          { required: true, message: "隔离状态必填", trigger: "blur" },
+        ],
 
         channel: [{ required: false }],
         content: [{ required: false }],
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index de99dfcbb..9c7878d99 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/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);