From 1fafc23e1b2a07e660c2a74849dfe9cac9c615cd Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 7 Jun 2024 18:15:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E4=BA=BA=E7=BE=A4=E5=8A=A0?= =?UTF-8?q?=E7=95=99=E5=AE=88=E5=84=BF=E7=AB=A5,=E8=89=BE=E6=BB=8B?= =?UTF-8?q?=E7=97=85=E4=BA=BA=E5=91=98,=E6=96=B0=E5=B0=B1=E4=B8=9A?= =?UTF-8?q?=E7=BE=A4=E4=BD=93,=E5=A4=B1=E4=B8=9A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=94=B9=E5=88=B0=E5=85=B3=E6=B3=A8=E4=BA=BA=E7=BE=A4=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 121 +++++-- src/views/components/editResi.vue | 299 ++++++------------ .../components/resiExpand/editExpand.vue | 13 +- src/views/components/resiExpand/index.vue | 13 +- src/views/components/resiSearch.vue | 30 +- .../modules/portrayal/jumin/cpts/staffTag.vue | 16 + src/views/modules/portrayal/jumin/index.vue | 90 +++++- 7 files changed, 337 insertions(+), 245 deletions(-) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 4f18c3a70..7f9bfbac2 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -232,65 +232,65 @@ placeholder="请输入内容" size="small" clearable> - + - + - - + --> - + - + - + - + - + - - + --> @@ -447,6 +447,9 @@ export default { unitChiefFlag: 0, riskyFlag: 0, delFlag: 0, + aidsFlag:0, + lbcFlag:0, + negFlag :0 } }, eduInfoDto: { @@ -942,6 +945,76 @@ export default { ] }, + { + id:'unemployedDto', + children:[ + { + label: "原工作单位", + itemType: "input1", + formName: "originWorkUnit", + opction: [] + }, + { + label: "失业时间", + itemType: "datepicker1", + formName: "unemploymentTime", + opction: [] + }, + { + label: "失业证号", + itemType: "input1", + formName: "unemploymentNum", + opction: [] + }, + { + label: "失业原因", + itemType: "select1", + formName: "unemploymentReason", + opctionUrl: 'sys/dict/data/dictlist', + opctionParams: { dictType: 'unemployment_reason' }, + opction: [] + }, + { + label: "再就业优惠证号", + itemType: "input1", + formName: "employmentNum", + opction: [] + }, + { + label: "技术特长", + itemType: "input1", + formName: "specialSkill", + opction: [] + }, + { + label: "是否领取失业金", + itemType: "radio1", + formName: "unempCompensationFlag", + opction: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ] + }, + { + label: "是否就业困难对象", + itemType: "radio1", + formName: "employmentHardFlag", + opction: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ] + }, + { + label: "劳动就业愿望", + itemType: "select1", + formName: "employmentWish", + opctionUrl: 'sys/dict/data/dictlist', + opctionParams: { dictType: 'career_goals' }, + opction: [] + } + + ] + } ], idTypeList, genderList, @@ -975,7 +1048,6 @@ export default { careerStatusList: [], //就业状况 spouseSituationList: [], //配偶情况 unemploymentReasonList: [], //失业原因 - employmentWishList: [], //就业意愿 resiHouseRelList: [ { label: "自住", @@ -1065,9 +1137,7 @@ export default { this.$http.post("sys/dict/data/dictlist", { dictType: "unemployment_reason", }), - this.$http.post("sys/dict/data/dictlist", { - dictType: "career_goals", - }), + ]; const dictKeys = [ "nationalityList", @@ -1079,7 +1149,6 @@ export default { "careerStatusList", "spouseSituationList", "unemploymentReasonList", - "employmentWishList", ]; // 对应的键名 const results = await Promise.all(requests); @@ -1339,11 +1408,6 @@ export default { workUnit: null,//工作单位 occupation: null,//职业 } - if (val == 0) { - this.form.baseInfoDto.categoryInfo.unemployedFlag = 1 - }else{ - this.form.baseInfoDto.categoryInfo.unemployedFlag = 0 - } }, handlerCancle() { this.$store.state.contentTabs = this.$store.state.contentTabs.filter( @@ -1450,6 +1514,7 @@ export default { 'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' }, 'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' }, 'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' }, + 'unemployedFlag': { formId: 'unemployedDto', formType: 'unemployedDto', title: '失业人员' } }; if (map[value]) { diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index a8091f3f2..e3176553b 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -547,45 +547,6 @@ clearable > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ item.label }} - - - - - - {{ item.label }} - - - - - - - - - - - { 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)) { + } 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)) { 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); @@ -837,7 +861,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'].includes(val)) { + } 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)) { if (!formCopy.attentionCrowds.includes(val)) { formCopy.attentionCrowds.push(val); } diff --git a/src/views/modules/portrayal/jumin/cpts/staffTag.vue b/src/views/modules/portrayal/jumin/cpts/staffTag.vue index 233630906..801c0ae01 100644 --- a/src/views/modules/portrayal/jumin/cpts/staffTag.vue +++ b/src/views/modules/portrayal/jumin/cpts/staffTag.vue @@ -104,12 +104,24 @@ export default { { label: '特扶人员', value: 'specialSupportFlag' + },{ + label: '留守儿童', + value: 'lbcFlag' + },{ + label: '艾滋病人员', + value: 'aidsFlag' },{ label: '流动人员', value: 'floatingFlag' },{ label: '新阶层人士', value: 'newStratumFlag' + },{ + label: '新就业群体', + value: 'negFlag' + },{ + label: '失业人员', + value: 'unemployedFlag' } ] }, @@ -210,6 +222,10 @@ export default { updateValue('emptyNesterFlag', 2); updateValue('liveAloneFlag', 2); updateValue('oldPeopleFlag', 2); + updateValue('negFlag', 2); + updateValue('aidsFlag', 2); + updateValue('lbcFlag', 2); + updateValue('unemployedFlag', 2); updateValue('subsistenceAllowanceFlag', 2); updateValue('veteranFlag', 2); updateValue('ensureHouseFlag', 2); diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index 1db6095b5..fe87e602b 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -1038,7 +1038,87 @@ export default { opction: [], }, ], - }, + },{ + id:'unemployedDto', + title: "失业人员信息", + scrollId: "unemployed", + children:[ + { + label: "原工作单位", + itemType: "input1", + formName: "originWorkUnit", + pformName: "unemployedDto", + opction: [] + }, + { + label: "失业时间", + itemType: "datepicker1", + formName: "unemploymentTime", + pformName: "unemployedDto", + opction: [] + }, + { + label: "失业证号", + itemType: "input1", + formName: "unemploymentNum", + pformName: "unemployedDto", + opction: [] + }, + { + label: "失业原因", + itemType: "select1", + formName: "unemploymentReason", + pformName: "unemployedDto", + opctionUrl: 'sys/dict/data/dictlist', + opctionParams: { dictType: 'unemployment_reason' }, + opction: [] + }, + { + label: "再就业优惠证号", + itemType: "input1", + pformName: "unemployedDto", + formName: "employmentNum", + opction: [] + }, + { + label: "技术特长", + itemType: "input1", + pformName: "unemployedDto", + formName: "specialSkill", + opction: [] + }, + { + label: "是否领取失业金", + itemType: "radio1", + pformName: "unemployedDto", + formName: "unempCompensationFlag", + opction: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ] + }, + { + label: "是否就业困难对象", + itemType: "radio1", + pformName: "unemployedDto", + formName: "employmentHardFlag", + opction: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ] + }, + { + label: "劳动就业愿望", + itemType: "select1", + formName: "employmentWish", + pformName: "unemployedDto", + opctionUrl: 'sys/dict/data/dictlist', + opctionParams: { dictType: 'career_goals' }, + opction: [] + } + + ] + } ], expandList: [], form: { @@ -1108,7 +1188,12 @@ export default { formId: "baseInfoDto", formType: "baseInfoDto", title: "死亡信息", - } + }, + unemployedFlag: { + formId: "unemployedDto", + formType: "unemployedDto", + title: "失业人员", + }, }, }; }, @@ -1159,6 +1244,7 @@ export default { serious_illness: "大病信息", veteran: "退役军人信息", special_support: "特扶人员信息", + unemployed:"失业人员信息", old_people: "老年人信息", ensure_house: "保障房信息", chronic_disease: "慢病信息",