From 121250c36fcbe0aa7b441c3d163bb56176f8c400 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 18 Apr 2024 13:57:09 +0800
Subject: [PATCH] =?UTF-8?q?bug#1141=E8=80=81=E5=B9=B4=E4=BA=BA=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=A1=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 76 +++++++++++++++++++++++------
 src/views/modules/base/resi.vue     |  3 +-
 2 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 8b8e970b8..5a3cc6f04 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -19,12 +19,15 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关注人群">
-          <el-select v-model.trim="form.attentionCrowds" collapse-tags multiple class="u-item-width-normal" clearable
-            size="small">
-            <template v-for="item in resiClass">
-              <el-option :label='item.label' :value='item.value'> </el-option>
-            </template>
-          </el-select>
+          <el-cascader
+          size="small"
+          class="u-item-width-normal"
+          v-model.trim="form.attentionCrowds" 
+          :options="resiClass"
+          :props="{ multiple: true,checkStrictly: true}"
+          collapse-tags
+          clearable
+          ></el-cascader>
         </el-form-item>
         <el-form-item label="特殊人群">
           <el-select v-model.trim="form.specialCategoryCodes" class="u-item-width-normal" clearable size="small" collapse-tags
@@ -268,7 +271,55 @@ export default {
       nation: [],
       nationalityList: [],
       household: [],
-      resiClass: [],
+      resiClass: [
+   
+    {
+        "label": "老年人",
+        "value": "OLD_PEOPLE_FLAG",
+        "children": [
+        {
+        "label": "失能老人",
+        "value": "DISABLED_FLAG",
+        "children": null
+    }, {
+        "label": "空巢老人",
+        "value": "EMPTY_NESTER_FLAG",
+        "children": null
+    },
+    {
+        "label": "失智老人",
+        "value": "DEMENTED_FLAG",
+        "children": null
+    },
+        ]
+    },
+    {
+        "label": "低保人员",
+        "value": "SUBSISTENCE_ALLOWANCE_FLAG",
+        "children": null
+    },
+   
+    {
+        "label": "保障房人员",
+        "value": "ENSURE_HOUSE_FLAG",
+        "children": null
+    },
+    {
+        "label": "退役军人",
+        "value": "VETERAN_FLAG",
+        "children": null
+    },
+    {
+        "label": "育龄妇女",
+        "value": "FERTILE_WOMAN_FLAG",
+        "children": null
+    },
+    {
+        "label": "特扶人员",
+        "value": "SPECIAL_SUPPORT_FLAG",
+        "children": null
+    }
+],
       itemList,
       fixedList: [],
       constForm,
@@ -602,12 +653,12 @@ export default {
     this.getValiheList()
     this.getDictList()
     this.getHousehold()
-    this.getResident()
     this.getNationality()
     this.getCareerStatus()
     if (this.columnName) this.handleChangeForm(this.columnName)
   },
   methods: {
+ 
     handleSmartSearch() {
       this.showSmartSearchForm = !this.showSmartSearchForm
     },
@@ -997,14 +1048,7 @@ export default {
         console.log(error, '获取人户状况字典');
       }
     },
-    async getResident() {
-      try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'attention_crowd' })
-        this.resiClass = data.data
-      } catch (error) {
-        console.log(error, '获取居民类别字典');
-      }
-    },
+  
     computedBirth(age) {
       let now = new Date();
       let nowYear = now.getFullYear();
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 763a14985..d422a7ce9 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -503,6 +503,7 @@ export default {
       const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form;
       // 深复制对象
       let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form));
+      _obj.attentionCrowds = _obj.attentionCrowds.flat()
       console.log('213', _obj)
       switch (this.valueb) {
         case '党员':
@@ -601,7 +602,7 @@ export default {
           this.$refs.myResiSearch.form.categoryKey = categoryKey;
           this.$refs.myResiSearch.form.agencyId = agencyId;
       }
-      // //呵呵呵哒
+      
       // if (this.valueb == '党员') {
       //   _obj.partyFlag = 1
       //   this.getTableData(_obj);