elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch '节前新需求' into dev

feature
mk 1 year ago
parent
eba8610fa5 1fafc23e1b
commit
aa8cef13d7
7 changed files with 337 additions and 245 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 121
      src/views/components/addResi.vue
  2. 299
      src/views/components/editResi.vue
  3. 13
      src/views/components/resiExpand/editExpand.vue
  4. 13
      src/views/components/resiExpand/index.vue
  5. 30
      src/views/components/resiSearch.vue
  6. 16
      src/views/modules/portrayal/jumin/cpts/staffTag.vue
  7. 90
      src/views/modules/portrayal/jumin/index.vue

121
src/views/components/addResi.vue
View File

@ -232,65 +232,65 @@
placeholder="请输入内容" size="small" clearable></el-input> placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原工作单位" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"> <!-- <el-form-item label="原工作单位" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.originWorkUnit" <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.originWorkUnit"
placeholder="请输入内容" size="small" clearable></el-input> placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="失业时间" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"> <!-- <el-form-item label="失业时间" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-date-picker v-model.trim="form.unemployedDto.unemploymentTime" <el-date-picker v-model.trim="form.unemployedDto.unemploymentTime"
class="list_item_width_1" type="date" size="small" clearable placeholder="选择日期" class="list_item_width_1" type="date" size="small" clearable placeholder="选择日期"
format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd"> format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
<el-form-item label="月收入" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5"> <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" <el-input class="list_item_width_1" v-model.trim="form.economyDto.monthIncome"
placeholder="请输入内容" size="small" clearable></el-input> placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="失业证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[ <!-- <el-form-item label="失业证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[
{ required: true, message: '请填写失业证号', trigger: 'blur' }, { required: true, message: '请填写失业证号', trigger: 'blur' },
]" prop="unemployedDto.unemploymentNum"> ]" prop="unemployedDto.unemploymentNum">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.unemploymentNum" <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.unemploymentNum"
placeholder="请输入内容" size="small" clearable></el-input> placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="失业原因" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"> <!-- <el-form-item label="失业原因" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-select v-model.trim="form.unemployedDto.unemploymentReason" placeholder="请选择" <el-select v-model.trim="form.unemployedDto.unemploymentReason" placeholder="请选择"
size="small" class="list_item_width_1" clearable> size="small" class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.unemploymentReasonList" :key="index" <el-option v-for="(item, index) in dicts.unemploymentReasonList" :key="index"
:label="item.label" :value="item.value"></el-option> :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="再就业优惠证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"> <!-- <el-form-item label="再就业优惠证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.employmentNum" <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.employmentNum"
placeholder="请输入内容" size="small" clearable></el-input> placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="技术特长"class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"> <!-- <el-form-item label="技术特长"class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.specialSkill" <el-input class="list_item_width_1" v-model.trim="form.unemployedDto.specialSkill"
placeholder="请输入内容" size="small" clearable></el-input> placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="是否领取失业金" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"> <!-- <el-form-item label="是否领取失业金" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-radio-group v-model.trim="form.unemployedDto.unempCompensationFlag"> <el-radio-group v-model.trim="form.unemployedDto.unempCompensationFlag">
<el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{ <el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
item.label item.label
}}</el-radio> }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item> -->
<el-form-item label="是否就业困难对象" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus"> <!-- <el-form-item label="是否就业困难对象" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-radio-group v-model.trim="form.unemployedDto.employmentHardFlag"> <el-radio-group v-model.trim="form.unemployedDto.employmentHardFlag">
<el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{ <el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
item.label item.label
}}</el-radio> }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item> -->
<el-form-item label="劳动就业愿望" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[ <!-- <el-form-item label="劳动就业愿望" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[
{ required: true, message: '请选择劳动就业愿望', trigger: 'blur' }, { required: true, message: '请选择劳动就业愿望', trigger: 'blur' },
]" prop="workInfoDto.employmentWish"> ]" prop="workInfoDto.employmentWish">
<el-select v-model.trim="form.workInfoDto.employmentWish" placeholder="请选择" size="small" <el-select v-model.trim="form.workInfoDto.employmentWish" placeholder="请选择" size="small"
@ -298,7 +298,7 @@
<el-option v-for="(item, index) in dicts.employmentWishList" :key="index" <el-option v-for="(item, index) in dicts.employmentWishList" :key="index"
:label="item.label" :value="item.value"></el-option> :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="有无赡养人" class="flex_item_width1"> <el-form-item label="有无赡养人" class="flex_item_width1">
<el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag"> <el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag">
@ -447,6 +447,9 @@ export default {
unitChiefFlag: 0, unitChiefFlag: 0,
riskyFlag: 0, riskyFlag: 0,
delFlag: 0, delFlag: 0,
aidsFlag:0,
lbcFlag:0,
negFlag :0
} }
}, },
eduInfoDto: { 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, idTypeList,
genderList, genderList,
@ -975,7 +1048,6 @@ export default {
careerStatusList: [], //就业状况 careerStatusList: [], //就业状况
spouseSituationList: [], //配偶情况 spouseSituationList: [], //配偶情况
unemploymentReasonList: [], //失业原因 unemploymentReasonList: [], //失业原因
employmentWishList: [], //就业意愿
resiHouseRelList: [ resiHouseRelList: [
{ {
label: "自住", label: "自住",
@ -1065,9 +1137,7 @@ export default {
this.$http.post("sys/dict/data/dictlist", { this.$http.post("sys/dict/data/dictlist", {
dictType: "unemployment_reason", dictType: "unemployment_reason",
}), }),
this.$http.post("sys/dict/data/dictlist", {
dictType: "career_goals",
}),
]; ];
const dictKeys = [ const dictKeys = [
"nationalityList", "nationalityList",
@ -1079,7 +1149,6 @@ export default {
"careerStatusList", "careerStatusList",
"spouseSituationList", "spouseSituationList",
"unemploymentReasonList", "unemploymentReasonList",
"employmentWishList",
]; // 对应的键名 ]; // 对应的键名
const results = await Promise.all(requests); const results = await Promise.all(requests);
@ -1339,11 +1408,6 @@ export default {
workUnit: null,//工作单位 workUnit: null,//工作单位
occupation: null,//职业 occupation: null,//职业
} }
if (val == 0) {
this.form.baseInfoDto.categoryInfo.unemployedFlag = 1
}else{
this.form.baseInfoDto.categoryInfo.unemployedFlag = 0
}
}, },
handlerCancle() { handlerCancle() {
this.$store.state.contentTabs = this.$store.state.contentTabs.filter( this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
@ -1450,6 +1514,7 @@ export default {
'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' }, 'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' },
'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' }, 'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' }, 'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
'unemployedFlag': { formId: 'unemployedDto', formType: 'unemployedDto', title: '失业人员' }
}; };
if (map[value]) { if (map[value]) {

299
src/views/components/editResi.vue
View File

@ -547,45 +547,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
class="flex_item_width1"
label="原工作单位"
prop="unemployedDto.originWorkUnit"
>
<el-input
class="list_item_width_1"
v-model.trim="form.unemployedDto.originWorkUnit"
placeholder="请输入内容"
size="small"
clearable
></el-input>
</el-form-item>
<el-form-item class="flex_item_width1" v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
label="失业时间"
prop="unemployedDto.unemploymentTime"
>
<el-date-picker
v-model.trim="form.unemployedDto.unemploymentTime"
class="list_item_width_1"
type="date"
size="small"
clearable
placeholder="选择日期"
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=" <el-form-item label="月收入" class="flex_item_width1" v-if="
form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus >= 1 &&
@ -600,153 +561,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="flex_item_width1"
label="失业证号"
prop="unemployedDto.unemploymentNum"
v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
:rules="[{ required: true, message: '请填写失业证号', trigger: 'blur' }]"
>
<el-input
class="list_item_width_1"
v-model.trim="form.unemployedDto.unemploymentNum"
placeholder="请输入内容"
size="small"
clearable
></el-input>
</el-form-item>
<el-form-item class="flex_item_width1"
label="失业原因"
prop="unemployedDto.unemploymentReason"
v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
>
<el-select
v-model.trim="form.unemployedDto.unemploymentReason"
placeholder="请选择"
size="small"
class="list_item_width_1"
clearable
>
<el-option
v-for="(item, index) in dicts.unemploymentReasonList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="flex_item_width1"
label="再就业优惠证号"
prop="unemployedDto.employmentNum"
v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
>
<el-input
class="list_item_width_1"
v-model.trim="form.unemployedDto.employmentNum"
placeholder="请输入内容"
size="small"
clearable
></el-input>
</el-form-item>
<el-form-item label="技术特长" class="flex_item_width1" prop="unemployedDto.specialSkill" v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
">
<el-input
class="list_item_width_1"
v-model.trim="form.unemployedDto.specialSkill"
placeholder="请输入内容"
size="small"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
class="flex_item_width1"
label="是否领取失业金"
prop="unemployedDto.unempCompensationFlag"
>
<el-radio-group
v-model.trim="form.unemployedDto.unempCompensationFlag"
>
<el-radio
:label="item.value"
v-for="item in disabilityFlagList"
:key="item.value"
>{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
class="flex_item_width1"
label="是否就业困难对象"
prop="unemployedDto.employmentHardFlag"
>
<el-radio-group v-model.trim="form.unemployedDto.employmentHardFlag">
<el-radio
:label="item.value"
v-for="item in disabilityFlagList"
:key="item.value"
>{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
class="flex_item_width1"
label="劳动就业愿望"
prop="workInfoDto.employmentWish"
:rules="[
{ required: true, message: '请选择劳动就业愿望', trigger: 'blur' },
]"
>
<el-select
v-model.trim="form.workInfoDto.employmentWish"
placeholder="请选择"
size="small"
class="list_item_width_1"
clearable
>
<el-option
v-for="(item, index) in dicts.employmentWishList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="有无赡养人" class="flex_item_width1" prop="familyInfoDto.elderlyFlag"> <el-form-item label="有无赡养人" class="flex_item_width1" prop="familyInfoDto.elderlyFlag">
<el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag"> <el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag">
<el-radio <el-radio
@ -923,6 +737,9 @@ export default {
unitChiefFlag: 0, unitChiefFlag: 0,
riskyFlag: 0, riskyFlag: 0,
delFlag: 0, delFlag: 0,
aidsFlag:0,
lbcFlag:0,
negFlag :0
}, },
}, },
eduInfoDto: { eduInfoDto: {
@ -1453,7 +1270,86 @@ export default {
opction: [], opction: [],
}, },
], ],
}, },
{
id:'unemployedDto',
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: []
}
]
}
], ],
workInfoDtoId: null, workInfoDtoId: null,
idTypeList, idTypeList,
@ -1489,7 +1385,6 @@ export default {
careerStatusList: [], //就业状况 careerStatusList: [], //就业状况
spouseSituationList: [], //配偶情况 spouseSituationList: [], //配偶情况
unemploymentReasonList: [], //失业原因 unemploymentReasonList: [], //失业原因
employmentWishList: [], //就业意愿
resiHouseRelList: [ resiHouseRelList: [
{ {
label: "自住", label: "自住",
@ -1558,6 +1453,11 @@ export default {
formType: "volunteerDto", formType: "volunteerDto",
title: "志愿者", title: "志愿者",
}, },
unemployedFlag: {
formId: "unemployedDto",
formType: "unemployedDto",
title: "失业人员",
},
}, },
formCopy: null, formCopy: null,
}; };
@ -1733,9 +1633,6 @@ export default {
this.$http.post("sys/dict/data/dictlist", { this.$http.post("sys/dict/data/dictlist", {
dictType: "unemployment_reason", dictType: "unemployment_reason",
}), }),
this.$http.post("sys/dict/data/dictlist", {
dictType: "career_goals",
}),
]; ];
const dictKeys = [ const dictKeys = [
"nationalityList", "nationalityList",
@ -1747,7 +1644,6 @@ export default {
"careerStatusList", "careerStatusList",
"spouseSituationList", "spouseSituationList",
"unemploymentReasonList", "unemploymentReasonList",
"employmentWishList",
]; // 对应的键名 ]; // 对应的键名
const results = await Promise.all(requests); const results = await Promise.all(requests);
@ -2007,24 +1903,6 @@ export default {
if (!this.workInfoDtoId) { if (!this.workInfoDtoId) {
delete this.form.workInfoDto.id; delete this.form.workInfoDto.id;
} }
console.log(this.form.workInfoDto);
if (val == 0) {
this.form.baseInfoDto.categoryInfo.unemployedFlag = 1;
this.form.unemployedDto = {
originWorkUnit: null, //原工作单位
unemploymentTime: null, //失业时间yyyy-MM-dd
unemploymentNum: null, //失业证号
employmentNum: null, //再就业优惠证号
specialSkill: null, //技术特长
unempCompensationFlag: null, //是否领取失业补助金
unemploymentReason: null, //失业原因【字典表】code
employmentHardFlag: null, //是否就业困难对象；1是0不是
employmentWish: null, //劳动能力就业愿望
};
} else {
this.form.unemployedDto = null;
this.form.baseInfoDto.categoryInfo.unemployedFlag = 0;
}
}, },
handlerCancle() { handlerCancle() {
this.$store.state.contentTabs = this.$store.state.contentTabs.filter( this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
@ -2213,6 +2091,7 @@ export default {
'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' }, 'specialSupportFlag': { formId: 'specialSupportDto', formType: 'specialSupportDto', title: '特扶人员' },
'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' }, 'unitedFrontFlag': { formId: 'unitedFrontDto', formType: 'unitedFrontDto', title: '统战人员' },
'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' }, 'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
'unemployedFlag': { formId: 'unemployedDto', formType: 'unemployedDto', title: '失业人员' }
}; };
if (map[value] && event == true) { if (map[value] && event == true) {
this.dialogTitle = map[value].title; this.dialogTitle = map[value].title;

13
src/views/components/resiExpand/editExpand.vue
View File

@ -186,7 +186,18 @@ export default {
// 死亡时间 // 死亡时间
baseInfoDto:{ baseInfoDto:{
deathDate:null deathDate:null
} },
unemployedDto: {
originWorkUnit: null,//原工作单位
unemploymentTime: null,//失业时间yyyy-MM-dd
unemploymentNum: null,//失业证号
employmentNum: null,//再就业优惠证号
specialSkill: null,//技术特长
unempCompensationFlag: null,//是否领取失业补助金
unemploymentReason: null,//失业原因【字典表】code
employmentHardFlag: null,//是否就业困难对象；1是0不是
employmentWish: null,//劳动能力就业愿望
},
}, },
casProps: { casProps: {
value: 'id', value: 'id',

13
src/views/components/resiExpand/index.vue
View File

@ -170,7 +170,18 @@ export default {
}, },
baseInfoDto:{ baseInfoDto:{
deathDate:null deathDate:null
} },
unemployedDto: {
originWorkUnit: null,//原工作单位
unemploymentTime: null,//失业时间yyyy-MM-dd
unemploymentNum: null,//失业证号
employmentNum: null,//再就业优惠证号
specialSkill: null,//技术特长
unempCompensationFlag: null,//是否领取失业补助金
unemploymentReason: null,//失业原因【字典表】code
employmentHardFlag: null,//是否就业困难对象；1是0不是
employmentWish: null,//劳动能力就业愿望
},
}, },
casProps: { casProps: {
value: 'id', value: 'id',

30
src/views/components/resiSearch.vue
View File

@ -308,6 +308,14 @@ export default {
},{ },{
label:'特扶人员', label:'特扶人员',
value:'SPECIAL_SUPPORT_FLAG', value:'SPECIAL_SUPPORT_FLAG',
},{
label: "留守儿童",
value: "LBC_FLAG",
children: null
},{
label: "艾滋病人员",
value: "AIDS_FLAG",
children: null
},{ },{
label:'失业人员', label:'失业人员',
value:'UNEMPLOYED_FLAG', value:'UNEMPLOYED_FLAG',
@ -315,7 +323,11 @@ export default {
label:'新阶层人士', label:'新阶层人士',
value:'NEW_STRATUM_FLAG', value:'NEW_STRATUM_FLAG',
},{ },{
label:'安置帮教人员', label: "新就业群体",
value: "NEG_FLAG",
"children": null
},{
label:'安置帮教人员',
value:'anzhibangjiao', value:'anzhibangjiao',
},{ },{
label:'吸毒人员', label:'吸毒人员',
@ -449,6 +461,18 @@ export default {
"label": "新阶层人士", "label": "新阶层人士",
"value": "NEW_STRATUM_FLAG", "value": "NEW_STRATUM_FLAG",
"children": null "children": null
},{
"label": "留守儿童",
"value": "LBC_FLAG",
"children": null
},{
"label": "艾滋病人员",
"value": "AIDS_FLAG",
"children": null
},{
"label": "新就业群体",
"value": "NEG_FLAG",
"children": null
},{ },{
"label": "流动人员", "label": "流动人员",
"value": "FLOATING_FLAG", "value": "FLOATING_FLAG",
@ -820,7 +844,7 @@ export default {
cancelledValues.forEach(val => { cancelledValues.forEach(val => {
if (['partyFlag0', 'partyFlag1', 'partyFlag2'].includes(val)) { if (['partyFlag0', 'partyFlag1', 'partyFlag2'].includes(val)) {
formCopy.partyFlag = null; 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); formCopy.attentionCrowds = formCopy.attentionCrowds.filter(item => item !== val);
} else if (['DISABILITY_FLAG', 'SERIOUS_ILLNESS_FLAG', 'CHRONIC_DISEASE_FLAG'].includes(val)) { } else if (['DISABILITY_FLAG', 'SERIOUS_ILLNESS_FLAG', 'CHRONIC_DISEASE_FLAG'].includes(val)) {
formCopy.healthStatus = formCopy.healthStatus.filter(item => item !== val); formCopy.healthStatus = formCopy.healthStatus.filter(item => item !== val);
@ -837,7 +861,7 @@ export default {
newVal.forEach(val => { newVal.forEach(val => {
if (val === 'partyFlag0' || val === 'partyFlag1' || val === 'partyFlag2') { if (val === 'partyFlag0' || val === 'partyFlag1' || val === 'partyFlag2') {
formCopy.partyFlag = val === 'partyFlag0' ? 0 : val === 'partyFlag1' ? 1 : 2; 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)) { if (!formCopy.attentionCrowds.includes(val)) {
formCopy.attentionCrowds.push(val); formCopy.attentionCrowds.push(val);
} }

16
src/views/modules/portrayal/jumin/cpts/staffTag.vue
View File

@ -104,12 +104,24 @@ export default {
{ {
label: '特扶人员', label: '特扶人员',
value: 'specialSupportFlag' value: 'specialSupportFlag'
},{
label: '留守儿童',
value: 'lbcFlag'
},{
label: '艾滋病人员',
value: 'aidsFlag'
},{ },{
label: '流动人员', label: '流动人员',
value: 'floatingFlag' value: 'floatingFlag'
},{ },{
label: '新阶层人士', label: '新阶层人士',
value: 'newStratumFlag' value: 'newStratumFlag'
},{
label: '新就业群体',
value: 'negFlag'
},{
label: '失业人员',
value: 'unemployedFlag'
} }
] ]
}, },
@ -210,6 +222,10 @@ export default {
updateValue('emptyNesterFlag', 2); updateValue('emptyNesterFlag', 2);
updateValue('liveAloneFlag', 2); updateValue('liveAloneFlag', 2);
updateValue('oldPeopleFlag', 2); updateValue('oldPeopleFlag', 2);
updateValue('negFlag', 2);
updateValue('aidsFlag', 2);
updateValue('lbcFlag', 2);
updateValue('unemployedFlag', 2);
updateValue('subsistenceAllowanceFlag', 2); updateValue('subsistenceAllowanceFlag', 2);
updateValue('veteranFlag', 2); updateValue('veteranFlag', 2);
updateValue('ensureHouseFlag', 2); updateValue('ensureHouseFlag', 2);

90
src/views/modules/portrayal/jumin/index.vue
View File

@ -1038,7 +1038,87 @@ export default {
opction: [], 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: [], expandList: [],
form: { form: {
@ -1108,7 +1188,12 @@ export default {
formId: "baseInfoDto", formId: "baseInfoDto",
formType: "baseInfoDto", formType: "baseInfoDto",
title: "死亡信息", title: "死亡信息",
} },
unemployedFlag: {
formId: "unemployedDto",
formType: "unemployedDto",
title: "失业人员",
},
}, },
}; };
}, },
@ -1159,6 +1244,7 @@ export default {
serious_illness: "大病信息", serious_illness: "大病信息",
veteran: "退役军人信息", veteran: "退役军人信息",
special_support: "特扶人员信息", special_support: "特扶人员信息",
unemployed:"失业人员信息",
old_people: "老年人信息", old_people: "老年人信息",
ensure_house: "保障房信息", ensure_house: "保障房信息",
chronic_disease: "慢病信息", chronic_disease: "慢病信息",

Write Preview
Loading…
Cancel
Save