From fc456a54df705db26f7d13b3c52586307d5ace21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 19 Aug 2024 14:49:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=B9=8B=20=E7=89=B9=E6=9C=8D=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 55e53e191..533c56934 100644 --- a/src/views/components/resiSearch.vue +++ b/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", @@ -899,6 +909,7 @@ export default { }, categoryAll: { handler(val, val2) { + console.log(val,val2,"dslkkldjsf"); this.handleCategoryChange(val, val2) }, deep: true @@ -952,6 +963,7 @@ export default { }, methods: { handleCategoryChange(newVal, oldVal) { + console.log(newVal, oldVal,"slkdfjlfj"); let formCopy = JSON.parse(JSON.stringify(this.form)); // 找出被取消选中的值 @@ -978,7 +990,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); } From 6ed67e10eb981fe23493925e1c51919ec0a300df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Mon, 19 Aug 2024 17:34:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 533c56934..d397ef80b 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -556,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",