Merge branch 'feature-7-31' into feature

src/views/components/resiSearch.vue

@@ -397,6 +397,16 @@ export default {
         },{
           label:'特扶人员',
           value:'SPECIAL_SUPPORT_FLAG',
+          children:[
+           {
+              label: "子女伤残",
+              value: "CHILDREN_DISABILITY_FLAG",
+           },
+           {
+              label: "子女死亡",
+              value: "CHILDREN_DEATH",
+           },
+          ],
         },{
           label: "留守儿童",
           value: "LBC_FLAG",
@@ -546,9 +556,19 @@ export default {
         "children": null
     },
     {
+      
         "label": "特扶人员",
         "value": "SPECIAL_SUPPORT_FLAG",
-        "children": null
+        "children": [
+        {
+              'label': "子女伤残",
+              'value': "CHILDREN_DISABILITY_FLAG",
+           },
+           {
+              'label': "子女死亡",
+              'value': "CHILDREN_DEATH",
+           },
+        ]
     },{
       "label": "新阶层人士",
         "value": "NEW_STRATUM_FLAG",
@@ -899,6 +919,7 @@ export default {
     },
     categoryAll: {
       handler(val, val2) {
+        console.log(val,val2,"dslkkldjsf");
           this.handleCategoryChange(val, val2)
       },
       deep: true
@@ -952,6 +973,7 @@ export default {
   },
   methods: {
     handleCategoryChange(newVal, oldVal) {
+      console.log(newVal, oldVal,"slkdfjlfj");
       let formCopy = JSON.parse(JSON.stringify(this.form));
 
       // 找出被取消选中的值
@@ -978,7 +1000,7 @@ export default {
       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','NEG_FLAG', 'LBC_FLAG', 'AIDS_FLAG'].includes(val)) {
+        } else if (['FLOATING_FLAG', 'OLD_PEOPLE_FLAG','OLD_PEOPLE_FLAG', 'CHILDREN_DISABILITY_FLAG','CHILDREN_DEATH','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','NEG_FLAG', 'LBC_FLAG', 'AIDS_FLAG'].includes(val)) {
           if (!formCopy.attentionCrowds.includes(val)) {
             formCopy.attentionCrowds.push(val);
           }