Merge branch 'feature_bug' into dev

src/views/components/addResi.vue

@@ -243,8 +243,6 @@
                                     format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
                                 </el-date-picker>
                             </el-form-item>
-                  
-                  
                             <el-form-item label="月收入" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
                                 <el-input class="list_item_width_1" v-model.trim="form.economyDto.monthIncome"
                                     placeholder="请输入内容" size="small" clearable></el-input>

src/views/components/resiSearch.vue

@@ -3,6 +3,18 @@
     <!-- <el-card class="resi-card"> -->
     <div class="g-main">
       <el-form :inline="true" class="header_form_box" :model="form" :label-width="'105px'">
+        <el-form-item label="居民分类">
+          <el-cascader
+          ref="categoryAll"
+          size="small"
+          class="u-item-width-normal"
+          v-model.trim="categoryAll" 
+          :options="categoryAllList"
+          :props="{ multiple: true,checkStrictly: true,emitPath:false}"
+          collapse-tags
+          clearable
+          ></el-cascader>
+        </el-form-item>
         <el-form-item label="政治面貌">
           <el-select v-model.trim="form.partyFlag" class="u-item-width-normal" clearable size="small">
             <template v-for="item in partyList">
@@ -45,7 +57,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="身份">
-          <el-select v-model.trim="form.identity" class="u-item-width-normal" clearable size="small">
+          <el-select v-model.trim="form.identity" class="u-item-width-normal" clearable size="small" >
             <template v-for="item in projectStaffList">
               <el-option :label='item.label' :value='item.value'> </el-option>
             </template>
@@ -234,6 +246,112 @@ export default {
     }
 
     return {
+      categoryAll:[],
+      categoryAllList:[
+        {
+          label:'群众',
+          value:'partyFlag0',
+        },{
+          label:'流动人员',
+          value:'FLOATING_FLAG',
+        },{
+          label:'党员',
+          value:'partyFlag1',
+        },{
+          label:'共青团员',
+          value:'partyFlag2',
+        },{
+          label:'残疾人',
+          value:'DISABILITY_FLAG',
+        },{
+          label:'大病',
+          value:'SERIOUS_ILLNESS_FLAG',
+        },{
+          label:'慢病',
+          value:'CHRONIC_DISEASE_FLAG',
+        },{
+          label:'老年人',
+          value:'OLD_PEOPLE_FLAG',
+          children:[
+          {
+              label: "失能老人",
+              value: "DISABLED_FLAG",
+          }, {
+              label: "空巢老人",
+              value: "EMPTY_NESTER_FLAG",
+          },
+          {
+              label: "失智老人",
+              value: "DEMENTED_FLAG",
+          },
+          {
+              label: "独居老人",
+              value: "LIVE_ALONE_FLAG",
+          },
+          {
+              label: "普通老年人",
+              value: "OLD_PEOPLE_FLAG",
+          }
+          ]
+        },{
+          label:'低保人员',
+          value:'SUBSISTENCE_ALLOWANCE_FLAG',
+        },{
+          label:'退役军人',
+          value:'VETERAN_FLAG',
+        },{
+          label:'保障房人员',
+          value:'ENSURE_HOUSE_FLAG',
+        },{
+          label:'育龄妇女',
+          value:'FERTILE_WOMAN_FLAG',
+        },{
+          label:'特扶人员',
+          value:'SPECIAL_SUPPORT_FLAG',
+        },{
+          label:'失业人员',
+          value:'UNEMPLOYED_FLAG',
+        },{
+          label:'新阶层人士',
+          value:'NEW_STRATUM_FLAG',
+        },{
+          label:'安置帮教人员',
+          value:'anzhibangjiao',
+        },{
+          label:'吸毒人员',
+          value:'xidurenyuan',
+        },{
+          label:'社区矫正人员',
+          value:'shequjiaozheng',
+        },{
+          label:'不良青少年',
+          value:'buliangqingshaonian',
+        },{
+          label:'肇事肇祸精神障碍患者',
+          value:'zhaoshizhaohuojingshenbing',
+        },{
+          label:'邪教人员',
+          value:'xiejiaorenyuan',
+        },{
+          label:'信访人员',
+          value:'xinfangrenyaun',
+        },{
+          label:'统战人员',
+          value:'tongzhanrenyuan',
+        },{
+          label:'志愿者',
+          value:'VOLUNTEER_FLAG',
+        },{
+          label:'楼长',
+          value:'BUILDING_CHIEF_FLAG',
+        },{
+          label:'单元长',
+          value:'UNIT_CHIEF_FLAG',
+        },{
+          label:'公益岗',
+          value:'PUBLIC_WELFARE_FLAG',
+        }
+      ],
       boxHeight: true,
       pageLoading: false,
       openSearch: false,
@@ -272,7 +390,6 @@ export default {
       nationalityList: [],
       household: [],
       resiClass: [
-   
     {
         "label": "老年人",
         "value": "OLD_PEOPLE_FLAG",
@@ -443,6 +560,7 @@ export default {
       form: {
         name: '',
         mobile: '',
+        // careerStatus:'',
         idNum: '',
         birthdayStart: '',
         birthdayEnd: '',
@@ -474,7 +592,6 @@ export default {
         level: '',
         orgType: ''
       },
-      GRID_ID: '',
       tempFormList,
       pickerOptions: {
         shortcuts: [
@@ -604,7 +721,7 @@ export default {
           }
         }
       },
-      optionsVPageNo: 1
+      optionsVPageNo: 1,
     }
   },
   computed: {
@@ -656,7 +773,13 @@ export default {
       },
       deep: true,
       immediate: true
-    }
+    },
+    categoryAll: {
+      handler(val, val2) {
+          this.handleCategoryChange(val, val2)
+      },
+      deep: true
+    },
   },
   directives: {
     "el-select-loadmore": {
@@ -687,14 +810,56 @@ export default {
     if (this.columnName) this.handleChangeForm(this.columnName)
   },
   methods: {
+    handleCategoryChange(newVal, oldVal) {
+      let formCopy = JSON.parse(JSON.stringify(this.form));
 
-    handleSmartSearch() {
-      this.showSmartSearchForm = !this.showSmartSearchForm
-    },
-    handelSelSmartBtn(index) {
+      // 找出被取消选中的值
+      let cancelledValues = oldVal.filter(val => !newVal.includes(val));
 
-      this.selBtnIndex = index
+      // 处理取消选中的值
+      cancelledValues.forEach(val => {
+        if (['partyFlag0', 'partyFlag1', 'partyFlag2'].includes(val)) {
+          formCopy.partyFlag = null;
+        } else if (['FLOATING_FLAG', 'OLD_PEOPLE_FLAG','OLD_PEOPLE_FLAG', 'LIVE_ALONE_FLAG', 'DEMENTED_FLAG', 'EMPTY_NESTER_FLAG', 'DISABLED_FLAG', 'SUBSISTENCE_ALLOWANCE_FLAG', 'ENSURE_HOUSE_FLAG', 'VETERAN_FLAG', 'FERTILE_WOMAN_FLAG', 'SPECIAL_SUPPORT_FLAG', 'NEW_STRATUM_FLAG'].includes(val)) {
+          formCopy.attentionCrowds = formCopy.attentionCrowds.filter(item => item !== val);
+        } else if (['DISABILITY_FLAG', 'SERIOUS_ILLNESS_FLAG', 'CHRONIC_DISEASE_FLAG'].includes(val)) {
+          formCopy.healthStatus = formCopy.healthStatus.filter(item => item !== val);
+        } else if (['anzhibangjiao', 'xidurenyuan', 'shequjiaozheng', 'buliangqingshaonian', 'zhaoshizhaohuojingshenbing', 'xiejiaorenyuan', 'tongzhanrenyuan', 'xinfangrenyaun'].includes(val)) {
+          formCopy.specialCategoryCodes = formCopy.specialCategoryCodes.filter(item => item !== val);
+        } else if (['VOLUNTEER_FLAG', 'BUILDING_CHIEF_FLAG', 'UNIT_CHIEF_FLAG', 'PUBLIC_WELFARE_FLAG'].includes(val)) {
+          formCopy.identity = null;
+        } else if (val === 'UNEMPLOYED_FLAG') {
+          formCopy.careerStatus = null;
+        }
+      });
+
+      // 处理新选中的值
+      newVal.forEach(val => {
+        if (val === 'partyFlag0' || val === 'partyFlag1' || val === 'partyFlag2') {
+          formCopy.partyFlag = val === 'partyFlag0' ? 0 : val === 'partyFlag1' ? 1 : 2;
+        } else if (['FLOATING_FLAG', 'OLD_PEOPLE_FLAG','OLD_PEOPLE_FLAG', 'LIVE_ALONE_FLAG', 'DEMENTED_FLAG', 'EMPTY_NESTER_FLAG', 'DISABLED_FLAG' ,'SUBSISTENCE_ALLOWANCE_FLAG', 'ENSURE_HOUSE_FLAG', 'VETERAN_FLAG', 'FERTILE_WOMAN_FLAG', 'SPECIAL_SUPPORT_FLAG', 'NEW_STRATUM_FLAG'].includes(val)) {
+          if (!formCopy.attentionCrowds.includes(val)) {
+            formCopy.attentionCrowds.push(val);
+          }
+        } else if (['DISABILITY_FLAG', 'SERIOUS_ILLNESS_FLAG', 'CHRONIC_DISEASE_FLAG'].includes(val)) {
+          if (!formCopy.healthStatus.includes(val)) {
+            formCopy.healthStatus.push(val);
+          }
+        } else if (['anzhibangjiao', 'xidurenyuan', 'shequjiaozheng', 'buliangqingshaonian', 'zhaoshizhaohuojingshenbing', 'xiejiaorenyuan', 'tongzhanrenyuan', 'xinfangrenyaun'].includes(val)) {
+          if (!formCopy.specialCategoryCodes.includes(val)) {
+            formCopy.specialCategoryCodes.push(val);
+          }
+        } else if (['VOLUNTEER_FLAG', 'BUILDING_CHIEF_FLAG', 'UNIT_CHIEF_FLAG', 'PUBLIC_WELFARE_FLAG'].includes(val)) {
+          formCopy.identity = val;
+        } else if (val === 'UNEMPLOYED_FLAG') {
+          formCopy.careerStatus = '0';
+        }
+      });
+
+      // 更新表单数据
+      this.form = formCopy;
     },
+
     handelWatchStartDate(val) {
       return val
     },

src/views/modules/base/resi.vue

@@ -737,6 +737,7 @@ export default {
         this.$refs.myResiSearch.form[n] = "";
       }
       this.$refs.myResiSearch.form.healthStatus = [];
+      this.$refs.myResiSearch.categoryAll = [];
       this.$refs.myResiSearch.form.attentionCrowds = [];
       this.$refs.myResiSearch.form.specialCategoryCodes = [];
       this.currentPage = 1;