From 036ce60a6705345b17634e92e7a501bd7b2b4955 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 21 Sep 2022 15:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5=E7=AD=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/natFocus/nfSendNotice.vue   |  7 +-
 src/views/modules/base/epidemic/travel.vue    | 86 +++++++++++--------
 .../base/epidemic/veroFocus/vfSendNotice.vue  |  2 +-
 3 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
index aad7ca0b3..9abd4a5af 100644
--- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
@@ -96,8 +96,13 @@ export default {
     async initForm (selectionAll) {
 
       this.$refs['ref_form1'].resetFields();
-      this.formData.userList = selectionAll
+      // this.formData.userList = selectionAll
+      this.formData.userList = JSON.parse(JSON.stringify(selectionAll))
 
+      this.formData.userList.forEach(element => {
+
+        element.idCard = element.realIdCard
+      });
 
     },
 
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index 2cafb341a..fbd2186b7 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="div_main">
-    <div ref="div_search" class="div_search">
+    <div ref="div_search"
+         class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -35,7 +36,7 @@
                       class="list_item_width_1"
                       clearable
                       placeholder="请输入身份证号或证件号">
-          </el-input>
+            </el-input>
 
           </el-form-item>
 
@@ -85,11 +86,11 @@
                    size="small"
                    @click="handleAdd">新增</el-button>
 
-        <el-button
-                   class="diy-button--export"
+        <el-button class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
                    :multiple='false'
                    :show-file-list='false'
                    :before-upload="beforeUpload"
@@ -99,9 +100,9 @@
                    :on-exceed="handleExceed"
                    :http-request="uploadHttpRequest">
           <el-button size="small"
-            style="margin-left: 10px"
-            class="diy-button--delete"
-            :loading="importLoading">{{importBtnTitle}}</el-button>
+                     style="margin-left: 10px"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
 
         <el-button style="margin-left:10px"
@@ -130,20 +131,23 @@
                 v-loading="tableLoading"
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 style="width: 100%"
-                 @selection-change="handleSelectionChange">
+                @selection-change="handleSelectionChange">
         <el-table-column type="selection"
-                         width="55" fixed="left"></el-table-column>
+                         width="55"
+                         fixed="left"></el-table-column>
         <el-table-column label="序号"
                          header-align="center"
                          align="center"
                          type="index"
-                         width="50" fixed="left"></el-table-column>
+                         width="50"
+                         fixed="left"></el-table-column>
 
         <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
-                         width="100" fixed="left">
+                         width="100"
+                         fixed="left">
         </el-table-column>
         <el-table-column prop="mobile"
                          header-align="center"
@@ -218,8 +222,8 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-                       <!-- v-if="scope.row.userType != 'resi'"  -->
-            <el-button  type="text"
+            <!-- v-if="scope.row.userType != 'resi'"  -->
+            <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -255,30 +259,31 @@
                          slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
             </el-popover> -->
             <el-dropdown trigger="hover">
-              <span class="el-dropdown-link" style="margin-left:10px;">
+              <span class="el-dropdown-link"
+                    style="margin-left:10px;">
                 <el-button type="text"
-                         size="small"
-                         class="div-table-button--more"
-                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+                           size="small"
+                           class="div-table-button--more"
+                           slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item>
                   <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleNoticeList(scope.row)">通知记录</el-button>
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleNoticeList(scope.row)">通知记录</el-button>
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleVisiteList(scope.row) ">随访记录</el-button>
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-button type="text"
-                       class="div-table-button--delete--noline "
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+                             class="div-table-button--delete--noline "
+                             size="small"
+                             @click="handleDelete(scope.row)">删除</el-button>
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -307,9 +312,10 @@
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <travel-form v-if="formShow" ref="ref_form"
-                @dialogCancle="addFormCancle"
-                @dialogOk="addFormOk"></travel-form>
+      <travel-form v-if="formShow"
+                   ref="ref_form"
+                   @dialogCancle="addFormCancle"
+                   @dialogOk="addFormOk"></travel-form>
     </el-dialog>
     <!-- 发送通知弹出框 -->
     <el-dialog :visible.sync="sendNoticeFormShow"
@@ -321,6 +327,7 @@
                class="dialog-h"
                @closed="diaClose">
       <nf-send-notice ref="ref_sendnotice"
+                      @dialogOk="addFormOk"
                       @dialogCancle="diaClose"></nf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
@@ -427,7 +434,7 @@ export default {
   },
 
   methods: {
-    lzayLoadArea(node, resolve) {
+    lzayLoadArea (node, resolve) {
       this.getArea(node, resolve)
       // setTimeout(() => {
 
@@ -437,7 +444,7 @@ export default {
       this.loadTable()
     },
 
-    handleSelectionChange(val) {
+    handleSelectionChange (val) {
       console.log('val----', val)
       this.selectionAll = val
     },
@@ -495,7 +502,7 @@ export default {
       }
       this.tableLoading = false
     },
-    handleAreaChange(val) {
+    handleAreaChange (val) {
 
       if (val.length > 0) {
         const len = val.length - 1
@@ -546,9 +553,11 @@ export default {
       this.sendNoticeFormShow = true
       this.$nextTick(() => {
         const arr = this.selectionAll.map(item => {
+
           return {
             userId: item.userId,
             idCard: item.idCard,
+            realIdCard: item.realIdCard,
             mobile: item.mobile
           }
         })
@@ -556,7 +565,7 @@ export default {
       })
 
     },
-    handleAttention(row) {
+    handleAttention (row) {
       if (this.selectionAll.length === 0) {
         this.$message.info('请选择要加入关注的名单')
         return false
@@ -607,7 +616,7 @@ export default {
           return {
             name: item.name,
             mobile: item.mobile,
-            idCard: item.idCard,
+            idCard: item.realIdCard,
             attentionType: 2
           }
         })
@@ -629,14 +638,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.realIdCard)
       });
       let params = {
         attentionType: 2,
-        idCards: idCards
+        ids: ids
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -682,6 +691,7 @@ export default {
     },
     addFormOk () {
       this.formShow = false
+      this.sendNoticeFormShow = false
       this.loadTable()
 
     },
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
index 985a689ab..de1450d8d 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -96,7 +96,7 @@ export default {
     async initForm (selectionAll) {
       console.log(selectionAll)
       this.$refs['ref_form1'].resetFields();
-      this.formData.userList = JSON.stringify(selectionAll)
+      this.formData.userList = JSON.parse(JSON.stringify(selectionAll))
 
       this.formData.userList.forEach(element => {
         element.idCard = element.realIdCard