Merge branch 'bug_mk' into dev

# Conflicts:
#	src/views/modules/base/resi.vue

src/views/modules/base/diyInfo.vue

@@ -304,10 +304,11 @@ export default {
       if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
       this.exportLoading = true
       this.exportTemplate()
-
+      this.$emit('close')
     },
     handleExportTemplate(id) {
       this.exportTemplate(id)
+      this.$emit('close')
     },
     async exportTemplate(id) {
       let url = "/actual/base/residentBaseInfo/exportExcelCustom"

src/views/modules/base/resi.vue

@@ -358,7 +358,6 @@ export default {
       exportList: [],
       diyDialog: false,
 
-
       treeData: [],
       autoOpenArr: [],
       selTreeObj: {},