Merge branch 'dev-fangyi' into test

src/views/modules/base/epidemic/antiInfo.vue

@@ -578,6 +578,7 @@ export default {
       this.vaccineList = []
       this.natList = []
       this.tripList = []
+      this.activeName = 'first'
       this.formShow = false
 
     },

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()
 
     },

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 {

src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@@ -642,8 +642,7 @@ export default {
       this.formDataSearch = {
         gridId: '',
         vaccineCount: undefined,
-
-
+        attentionType: 1
       }
     },
 

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()
 

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 {