From e36d7e3a8f95e297ae4bf0dc4866fa7ac48f1643 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 31 Mar 2022 14:08:54 +0800
Subject: [PATCH] dd

---
 .../modules/base/epidemic/natFocus/natFocusList.vue   |  4 ++--
 .../modules/base/epidemic/natFocus/nfNoticeList.vue   |  7 ++++---
 .../modules/base/epidemic/natFocus/nfSendNotice.vue   | 10 +++++-----
 src/views/modules/base/epidemic/travel.vue            | 11 +++++++++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 16a5910e..10892a79 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -497,7 +497,7 @@ export default {
       }
       this.sendNoticeFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_sendnotice.initForm(this.selectionAll)
+        this.$refs.ref_sendnotice.initForm(this.selectionAll, '2')
       })
 
     },
@@ -505,7 +505,7 @@ export default {
     handleNoticeList (row) {
       this.noticeListFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard)
+        this.$refs.ref_noticelist.initTable(row.idCard, '2')
       })
 
     },
diff --git a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
index 7b7fb33c..ad0a06c9 100644
--- a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
@@ -70,7 +70,7 @@ export default {
       tableData: [],
       pageSize: 20,
       pageNo: 1,
-
+      origin: ''
     }
   },
   components: {},
@@ -80,8 +80,9 @@ export default {
 
   methods: {
 
-    async initTable (idCard) {
+    async initTable (idCard, origin) {
       this.idCard = idCard
+      this.origin = origin
       await this.loadTable()
 
     },
@@ -95,7 +96,7 @@ export default {
         idCard: this.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        origin: '1'
+        origin: this.origin
       }
 
       const { data, code, msg } = await requestPost(url, params)
diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
index 9274d928..370df9ac 100644
--- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
@@ -73,7 +73,7 @@ export default {
       btnDisable: false,
 
       formData: {
-        origin: '1',
+        origin: '',
         isSelChannel: false,
         channel: [],
         content: '',
@@ -92,10 +92,11 @@ export default {
 
   methods: {
 
-    async initForm (selectionAll) {
+    async initForm (selectionAll, origin) {
 
       this.$refs['ref_form1'].resetFields();
       this.formData.userList = selectionAll
+      this.formData.origin = origin
 
     },
 
@@ -119,7 +120,7 @@ export default {
       }
 
       console.log(this.formData)
-      return false
+      // return false
 
       this.btnDisable = true
       setTimeout(() => {
@@ -128,8 +129,7 @@ export default {
 
       let url = ''
 
-      url = '/epmetuser/icNotice/batchnotice'
-      // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/batchnotice"
+      url = '/epmetuser/icNotice/sendNotice'
 
 
       const { data, code, msg } = await requestPost(url, this.formData)
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index d816136f..695a37fe 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -445,7 +445,7 @@ export default {
     handleNoticeList (row) {
       this.noticeListFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_noticelist.initTable(row.idCard)
+        this.$refs.ref_noticelist.initTable(row.idCard, '0')
       })
 
     },
@@ -465,7 +465,14 @@ export default {
       }
       this.sendNoticeFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_sendnotice.initForm(this.selectionAll)
+        const arr = this.selectionAll.map(item => {
+          return {
+            userId: item.userId,
+            idCard: item.idCard,
+            mobile: item.mobile
+          }
+        })
+        this.$refs.ref_sendnotice.initForm(arr, '0')
       })
 
     },