From d79d27443655afb88dc1c54418b1c06571eab5d3 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 8 Apr 2022 13:38:21 +0800
Subject: [PATCH 1/3] 11

---
 src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index ca1f2b4e..1543274a 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -642,8 +642,7 @@ export default {
       this.formDataSearch = {
         gridId: '',
         vaccineCount: undefined,
-
-
+        attentionType: 1
       }
     },
 

From c6f5e167629beb6d4b5555897467a973f6645094 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 8 Apr 2022 13:55:43 +0800
Subject: [PATCH 2/3] 111

---
 src/views/modules/base/epidemic/natFocus/natFocusList.vue   | 3 +++
 src/views/modules/base/epidemic/natFocus/nfSendNotice.vue   | 2 +-
 src/views/modules/base/epidemic/veroFocus/veroFocusList.vue | 4 +++-
 src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 894397ca..c7fe35cd 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -261,6 +261,7 @@
                class="dialog-h"
                @closed="diaClose">
       <nf-send-notice ref="ref_sendnotice"
+                      @dialogOk="addFormOk"
                       @dialogCancle="diaClose"></nf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
@@ -531,6 +532,8 @@ export default {
     addFormOk () {
       this.addFormShow = false
       this.editFormShow = false
+      this.sendNoticeFormShow = false
+
       this.loadTable()
 
     },
diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
index ea3d974d..aad7ca0b 100644
--- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
@@ -137,7 +137,7 @@ export default {
           message: '操作成功'
         })
         this.resetData()
-        this.$emit('dialogCancle')
+        this.$emit('dialogOk')
         this.btnDisable = false
 
       } else {
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index b9deed37..ae5f3431 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -256,7 +256,8 @@
                class="dialog-h"
                @closed="diaClose">
       <vf-send-notice ref="ref_sendnotice"
-                      @dialogCancle="diaClose"></vf-send-notice>
+                      @dialogCancle="diaClose"
+                      @dialogOk="addFormOk"></vf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
     <el-dialog :visible.sync="noticeListFormShow"
@@ -523,6 +524,7 @@ export default {
 
     addFormOk () {
       this.addFormShow = false
+      this.sendNoticeFormShow = false
       this.editFormShow = false
       this.loadTable()
 
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
index 34e3152e..de9747ac 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -131,7 +131,7 @@ export default {
           message: '操作成功'
         })
         this.resetData()
-        this.$emit('dialogCancle')
+        this.$emit('dialogOk')
         this.btnDisable = false
 
       } else {

From 0c41a9bcb55a4f7b12453d076e0e2d59f08c8b9e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 8 Apr 2022 14:49:37 +0800
Subject: [PATCH 3/3] 11

---
 .../modules/base/epidemic/natFocus/natFocusList.vue    | 10 ++++++++--
 .../modules/base/epidemic/veroFocus/veroFocusList.vue  | 10 +++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index c7fe35cd..c0d76793 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -261,7 +261,7 @@
                class="dialog-h"
                @closed="diaClose">
       <nf-send-notice ref="ref_sendnotice"
-                      @dialogOk="addFormOk"
+                      @dialogOk="sendNoticeOk"
                       @dialogCancle="diaClose"></nf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
@@ -532,10 +532,16 @@ export default {
     addFormOk () {
       this.addFormShow = false
       this.editFormShow = false
-      this.sendNoticeFormShow = false
 
       this.loadTable()
 
+    },
+    sendNoticeOk () {
+
+      this.sendNoticeFormShow = false
+      this.selectionAll = []
+      this.loadTable()
+
     },
 
     async handleDelete (row) {
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index ae5f3431..77acaec3 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -257,7 +257,7 @@
                @closed="diaClose">
       <vf-send-notice ref="ref_sendnotice"
                       @dialogCancle="diaClose"
-                      @dialogOk="addFormOk"></vf-send-notice>
+                      @dialogOk="sendNoticeOk"></vf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
     <el-dialog :visible.sync="noticeListFormShow"
@@ -523,9 +523,13 @@ export default {
 
 
     addFormOk () {
-      this.addFormShow = false
       this.sendNoticeFormShow = false
-      this.editFormShow = false
+      this.loadTable()
+
+    },
+    sendNoticeOk () {
+      this.sendNoticeFormShow = false
+      this.selectionAll = []
       this.loadTable()
 
     },