diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 82e96a73..67b9f80e 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/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 }, 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"> @@ -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/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 } }, 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"> + @dialogCancle="diaClose" + @dialogOk="addFormOk">