Merge branch 'dev-fangyi' into test

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

@@ -271,7 +271,7 @@
                width="50%"
                top="5vh"
                class="dialog-h"
-               @closed="diaClose">
+               @closed="handleCnalceForm">
       <div class="dialog-h-content scroll-h">
         <el-form :inline="true"
                :model="formDetail"

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

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

src/views/modules/base/resi.vue

@@ -34,6 +34,10 @@
                    class="diy-button--reset"
                    :loading="exportBtn"
                    @click="handleExport">{{exportBtnTitle}}</el-button>
+        <el-button
+                     class="diy-button--add"
+                     size="small"
+                     @click="deleteBatch">批量删除</el-button>
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
 
       </div>
@@ -111,7 +115,7 @@
       </el-table>
       <div class="div-flex">
         <div class="div_del">
-          <el-checkbox :indeterminate="isIndeterminate"
+          <!-- <el-checkbox :indeterminate="isIndeterminate"
                        v-model="selAllFlag"
                        :disabled="selAllFlagDisabled"
                        @change="handleSelectAll">全选</el-checkbox>
@@ -119,7 +123,7 @@
                      style="margin-left:15px"
                      type="danger"
                      size="small"
-                     @click="deleteBatch">删除</el-button>
+                     @click="deleteBatch">删除</el-button> -->
         </div>
         <div>
           <el-pagination @size-change="handleSizeChange"