From 8d583d91e4da3c568d2c7f663d4980fc67c3e2b8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 14 Aug 2023 16:17:37 +0800
Subject: [PATCH] =?UTF-8?q?bug#457=E5=B1=85=E6=B0=91=E8=BF=81=E5=87=BA?=
 =?UTF-8?q?=E4=B8=8E=E6=AD=BB=E4=BA=A1=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue   | 61 +++++++++----------------
 src/views/components/resiSearch.vue | 46 +++----------------
 src/views/modules/base/resi.vue     | 69 ++++-------------------------
 3 files changed, 33 insertions(+), 143 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 05339ec84..cd3a53a9f 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -149,7 +149,7 @@
                        :false-label="'0'"
                        size="small"
                        v-model="form[items.formName]"
-                       @change="val => handleChangeCheckbox(val,items)">
+                       @change="val => handleChangeCheckbox(items,val)">
           </el-checkbox>
         </template>
         <template v-else-if="item.itemType == 'datepicker'"
@@ -1639,50 +1639,29 @@ export default {
         return this.$message.error('网络错误')
       })
     },
-    handleChangeCheckbox (e, val) {
-      this.handleTabShow(val, e)
+    handleChangeCheckbox (item, val) {
+      this.handleTabShow(item,val )
     },
-    handleTabShow (val, e) {
+    handleTabShow(item, val) {
+      const mapping = {
+        partyFlag: { label: '党员', id: '0', groupId: 'parymemberInfoDto' },
+        ensureHouseFlag: { label: '保障房信息', id: '1', groupId: 'ensureHouseDto' },
+        unemployedFlag: { label: '失业', id: '2', groupId: 'unemployedDto' },
+        veteranFlag: { label: '退役军人', id: '3', groupId: 'veteranDto' },
+        unitedFrontFlag: { label: '统战', id: '4', groupId: 'unitedFrontDto' },
+        volunteerFlag: { label: '志愿者信息', id: '5', groupId: 'volunteerDto' },
+        oldPeopleFlag: { label: '老年人', id: '6', groupId: 'oldPeopleDto' },
+        specialCrowdFlag: { label: '特殊人群', id: '7', groupId: 'specialDto' },
+        publicWelfareFlag: { label: '公益岗人员', id: '8', groupId: 'postDto' }
+      };
 
-      if (e == 1) {
-        if (val.formName == 'partyFlag') {
-          this.tabsList.push({ label: '党员', id: '0', groupId: 'parymemberInfoDto' })
-        } else if (val.formName == 'ensureHouseFlag') {
-          this.tabsList.push({ label: '保障房信息', id: '1', groupId: 'ensureHouseDto' })
-        } else if (val.formName == 'unemployedFlag') {
-          this.tabsList.push({ label: '失业', id: '2', groupId: 'unemployedDto' })
-        } else if (val.formName == 'veteranFlag') {
-          this.tabsList.push({ label: '退役军人', id: '3', groupId: 'veteranDto' })
-        } else if (val.formName == 'unitedFrontFlag') {
-          this.tabsList.push({ label: '统战', id: '4', groupId: 'unitedFrontDto' })
-        } else if (val.formName == 'volunteerFlag') {
-          this.tabsList.push({ label: '志愿者信息', id: '5', groupId: 'volunteerDto' })
-        } else if (val.formName == 'oldPeopleFlag') {
-          this.tabsList.push({ label: '老年人', id: '6', groupId: 'oldPeopleDto' })
-        } else if (val.formName == 'specialCrowdFlag') {
-          this.tabsList.push({ label: '特殊人群', id: '7', groupId: 'specialDto' })
-        } else if (val.formName == 'publicWelfareFlag') {
-          this.tabsList.push({ label: '公益岗人员', id: '7', groupId: 'postDto' })
-        }
-      } else {
-        let i = val.formName == 'partyFlag' ? '0' :
-          val.formName == 'ensureHouseFlag' ? '1' :
-            val.formName == 'unemployedFlag' ? '2' :
-              val.formName == 'veteranFlag' ? '3' :
-                val.formName == 'unitedFrontFlag' ? '4' :
-                  val.formName == 'volunteerFlag' ? '5' :
-                    val.formName == 'oldPeopleFlag' ? '6' :
-                      val.formName == 'specialCrowdFlag' ? '7' :
-                        val.formName == 'publicWelfareFlag' ? '8' : ''
-        if (i != '') {
-          this.tabsList.forEach(item => {
-            if (i != item.id) {
-              this.tabsList = this.tabsList.filter(items => items.id != i)
-            }
-          })
-        }
+      if (val == 1 && mapping[item.formName]) {
+        this.tabsList.push(mapping[item.formName]);
+      } else if (val != 1 && mapping[item.formName]) {
+        this.tabsList = this.tabsList.filter(tab => tab.id !== mapping[item.formName].id);
       }
     },
+
     checkNumberInput (itemj, itemk) {
       if (isNaN(this.form[itemj][itemk])) {
         this.$message.error("请输入数字");
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index fb814d197..70eeeb43a 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -5,7 +5,7 @@
       <el-form :inline="true" class="header_form_box" :model="form"  :label-width="'100px'">
 
           <el-form-item label="居民姓名" >
-              <el-input v-model="form.name" placeholder="请输入" size="small" class="u-item-width-normal" clearable ></el-input>
+              <el-input v-model="form.name" placeholder="请输入" size="small" @keydown.native.enter="handleSearchFrom" class="u-item-width-normal" clearable ></el-input>
           </el-form-item>
           <el-form-item label="联系电话" >
               <el-input v-model="form.mobile" size="small" placeholder="请输入" class="u-item-width-normal" clearable ></el-input>
@@ -376,46 +376,7 @@ export default {
           ]
         },
 
-        // {
-        //   name: '第一党支部党员',
-        //   index: 3,
-        //   ruleList: [
-        //     {
-        //       selSmartType: 'person',
-        //       nextLogicalRel: "",
-        //       nextLogicalRelName: "",
-        //       personRule: {
-        //         colKey: "IS_BDHJ",
-        //         colTable: "ic_resi_user",
-        //         colVal: "1",
-        //         colValLabel: "是",
-        //         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
-        //         itemGroupName: "基础信息",
-        //         itemId: "20220422102809_1005",
-        //         itemLabel: "本地户籍",
-        //         queryType: "=",
-        //         queryTypeName: "等于",
-        //         ruleDesc: "基础信息本地户籍等于是",
-        //       },
-        //       houseRule: {
-        //         ruleDesc: '',
-        //         queryType: '',
-        //         colTable: '',
-        //         colKey: '',
-        //         colVal: '',
-
-        //         titleName: '房屋信息',
-        //         colType: '',//详细参数的组件类型
-        //         colOption: [],
-        //         itemGroupName: '房屋信息',
-        //         itemLabel: '',
-        //         queryTypeName: '',
-        //         colValLabel: '',
-
-        //       },
-        //     },
-        //   ]
-        // }
+        
       ],
       endPickerOptions: {
         disabledDate: endDisabledDate
@@ -550,6 +511,9 @@ export default {
       this.form.unitId = ''
       this.form.homeId = ''
     },
+    handleSearchFrom(){
+      this.$emit('handleSearchFrom','')
+    },
     resetForm(formName) {
       for (const n in this.form) {
         if (n == 'age') {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index b6ca7a8d4..01c12acf4 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -6,7 +6,7 @@
 						? 'm-form-box-height-auto'
 						: 'm-form-box-height'
 				">
-        <resi-search ref="myResiSearch" />
+        <resi-search ref="myResiSearch" @handleSearchFrom="handleSearchFrom" />
       </section>
       <el-row class="resi-search">
         <el-col :span="24">
@@ -57,30 +57,6 @@
                      class="diy-button--white"
                      @click=""
                      plain>核对</el-button>
-          <!-- <el-button v-if="btnAuths.ic_resi_import"
-                     style="margin-left:10px"
-                     class="diy-button--blue"
-                     size="small"
-                     @click="handleExportModule('room')">下载模板</el-button> -->
-          <!-- <el-upload v-if="btnAuths.ic_resi_import"
-                     :headers="$getElUploadHeaders()"
-                     ref="upload"
-                     class="upload-demo"
-                     action="uploadUlr"
-                     :limit="1"
-                     :accept="'.xls,.xlsx'"
-                     :with-credentials="true"
-                     :show-file-list="false"
-                     :auto-upload="true"
-                     :on-progress="handleProgress"
-                     :on-success="handleExcelSuccess"
-                     :before-upload="beforeExcelUpload"
-                     :http-request="uploadHttpRequest">
-            <el-button style="margin-left:10px"
-                       class="diy-button--yellow"
-                       size="small"
-                       :loading="importLoading">{{ importBtnTitle }}</el-button>
-          </el-upload> -->
 
           <el-button v-if="
 							btnAuths.ic_resi_smart_import && displayedBaobiaoBtn
@@ -506,19 +482,15 @@ export default {
   },
   data () {
     return {
-      activeNames: [],
       showSercahStatus: false,
       diyDialog: false,
-      openSearch: false,
       exportBtn: false,
       exportBtnTitle: "导出",
       importBtnTitle: "导入",
       importLoading: false,
-      rowVisible: false,
       tableLoading: false,
       btnLoading: false,
       disabled: false,
-      pageLoading: false,
       selAllFlag: false,
       selAllFlagDisabled: false,
       isIndeterminate: false,
@@ -526,7 +498,6 @@ export default {
       dialogVisible: false,
       // 显示人员详情
       dialogVisible2: false,
-      resiDetailList: {}, //人员详情数据
       lookResiId: "",
 
       uploadUlr:
@@ -535,13 +506,11 @@ export default {
       currentPage: 1,
       pageSize: 20,
       total: null,
-      resideathAddObj1: {}, // 死亡登记子组件
       conditions: [],
       activeName: "",
       tableData: [],
       searchList: [],
       exportList: [],
-      editAgencyId: "",
       editForm: {
         GRID_ID: "",
         VILLAGE_ID: "",
@@ -564,7 +533,6 @@ export default {
       tabsList: [],
       selection: [],
 
-      defaultCategotyKey: "",
 
       tranferShow: false,
       deathShow: false,
@@ -590,7 +558,6 @@ export default {
         ic_resi_view_real_data: true, //显示脱敏信息
       },
 
-      queryConditions: [],
 
       searchForm:{}
     };
@@ -598,15 +565,6 @@ export default {
 
   props: {},
 
-  // async activated() {
-  //   console.log("this.$route.query---", this.$route.query);
-  //   if (this.$route.query && this.$route.query.columnName) {
-  //     this.searchList = [];
-  //     let query = this.$route.query;
-  //     this.defaultCategotyKey = query.columnName;
-  //     console.log("defaultCategotyKey----", this.defaultCategotyKey);
-  //   }
-  // },
 
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
@@ -619,15 +577,6 @@ export default {
 
   async created () {
     this.updateBtnAuths();
-
-    // if (this.$route.query) {
-    //   let query = this.$route.query;
-    //   this.defaultCategotyKey = query.columnName;
-    // }
-
-    // await this.getFormList()
-    // console.log('this.$refs.resiSearch', this)
-    this.pageLoading = true;
     console.log("storeoooo----0000", this.$store);
   },
 
@@ -710,10 +659,10 @@ export default {
         this.$refs.myResiSearch.form.categoryKey = categoryKey;
         this.$refs.myResiSearch.form.agencyId = agencyId;
     },
-    // 是否可以选中
-    checkSelectable (row, index) {
-      return this.filterEdit(row.agencyId);
-    },
+    // 居民多选是否禁止选中
+    // checkSelectable (row, index) {
+    //   return this.filterEdit(row.agencyId);
+    // },
 
     //迁出记录
     async handleChangeTransfer (row) {
@@ -744,18 +693,16 @@ export default {
 
     transferClose () {
       this.tranferShow = false;
+      this.handleSearchFrom()
     },
     deathClose () {
       this.deathShow = false;
+      this.handleSearchFrom()
     },
     handleDiyClose () {
       this.diyDialog = false;
     },
-    handleOpenSearch () {
-      if (!this.openSearch)
-        this.activeNames = [this.searchList[0].itemGroupId];
-      this.openSearch = !this.openSearch;
-    },
+   
     async diyExport () {
       await this.getExportList();
       console.log(this.$refs['']);