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

居民详情页面报错

v1.1
mk 2 years ago
parent
1639195d09
commit
45aa1e5f64
2 changed files with 43 additions and 36 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. 7
      src/views/components/editResi.vue
  2. 68
      src/views/modules/portrayal/jumin/index.vue

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

@ -379,7 +379,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="form.familyInfoDto.elderlyFlag == 1"> <el-col :span="6" v-if="form.familyInfoDto.elderlyFlag == 1">
<el-form-item label="与赡养人关系"> <el-form-item label="与赡养人关系" label-width="105px">
<el-select v-model="form.familyInfoDto.elderlyRelation" placeholder="请选择" size="small" <el-select v-model="form.familyInfoDto.elderlyRelation" placeholder="请选择" size="small"
class="list_item_width_1" clearable> class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.houseHolderRelList" :key="index" <el-option v-for="(item, index) in dicts.houseHolderRelList" :key="index"
@ -997,7 +997,6 @@ export default {
}, },
], ],
workInfoDtoId:null, workInfoDtoId:null,
idTypeList, idTypeList,
genderList, genderList,
hasOptions, hasOptions,
@ -1147,7 +1146,6 @@ export default {
} }
} }
this.workInfoDtoId=this.form.workInfoDto.id; this.workInfoDtoId=this.form.workInfoDto.id;
console.log(this.workInfoDtoId);
return Promise.all(promises); return Promise.all(promises);
} else if (res.data.code >= 8000) { } else if (res.data.code >= 8000) {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
@ -1393,6 +1391,7 @@ export default {
}, },
handelClickMarriage() { handelClickMarriage() {
this.form.familyInfoDto.spouseSituation = null this.form.familyInfoDto.spouseSituation = null
// console.log(this.form.familyInfoDto,'更改婚姻情况');
}, },
handelClickelderly() { handelClickelderly() {
this.form.familyInfoDto.elderlyRelation = null this.form.familyInfoDto.elderlyRelation = null
@ -1571,8 +1570,10 @@ export default {
if (!this.form[changPid]) { if (!this.form[changPid]) {
this.$set(this.form, changPid, {}); this.$set(this.form, changPid, {});
} }
if(changPid){
this.$set(this.form[changPid], changId, _form[changPid][changId]); this.$set(this.form[changPid], changId, _form[changPid][changId]);
} }
}
for (let i in this.footerInputList) { for (let i in this.footerInputList) {
if (this.footerInputList[i].id === changPid) { if (this.footerInputList[i].id === changPid) {
for (let index in this.footerInputList[i].children) { for (let index in this.footerInputList[i].children) {

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

@ -321,13 +321,14 @@
<span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto"> <span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
{{ careerStatusText() }} {{ careerStatusText() }}
</span> </span>
<span v-else>--</span>
</el-col> </el-col>
<el-col <el-col
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if=" resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 && ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5 resiDetailObj.workInfoDto.careerStatus <= 5)
" "
> >
<div class="f-label">工作单位：</div> <div class="f-label">工作单位：</div>
@ -343,9 +344,9 @@
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 || (resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6) && resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto
" "
> >
<div class="f-label">原工作单位：</div> <div class="f-label">原工作单位：</div>
@ -362,9 +363,9 @@
<el-col <el-col
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if=" resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 && ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5 resiDetailObj.workInfoDto.careerStatus <= 5)
" "
> >
<div class="f-flex"> <div class="f-flex">
@ -381,10 +382,10 @@
<el-col <el-col
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if="resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 || (resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6) && resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto
" "
> >
<div class="f-label">失业时间：</div> <div class="f-label">失业时间：</div>
@ -399,9 +400,9 @@
<el-col <el-col
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if=" resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 && ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5 resiDetailObj.workInfoDto.careerStatus <= 5)
" "
> >
<div class="f-flex"> <div class="f-flex">
@ -418,10 +419,10 @@
<el-col <el-col
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if="resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 || (resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6) && resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto
" "
> >
<div class="f-label">失业证号：</div> <div class="f-label">失业证号：</div>
@ -437,9 +438,10 @@
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 || (resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6) && resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto
" "
> >
<div class="f-label">失业原因：</div> <div class="f-label">失业原因：</div>
@ -454,9 +456,9 @@
<el-col <el-col
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if=" resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 && ( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5 resiDetailObj.workInfoDto.careerStatus <= 5)
" "
> >
<div class="f-label">有无赡养人：</div> <div class="f-label">有无赡养人：</div>
@ -476,9 +478,10 @@
:span="6" :span="6"
class="f-flex" class="f-flex"
v-if=" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 || (resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6) && resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto
" "
> >
<div class="f-label" style="width: 113px">再就业优惠证号：</div> <div class="f-label" style="width: 113px">再就业优惠证号：</div>
@ -495,9 +498,9 @@
type="flex" type="flex"
class="f-m-top23" class="f-m-top23"
v-if=" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 || (resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6) && resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto
" "
> >
<el-col :span="6" class="f-flex"> <el-col :span="6" class="f-flex">
@ -512,7 +515,7 @@
</el-col> </el-col>
<el-col :span="6" class="f-flex"> <el-col :span="6" class="f-flex">
<div class="f-label" style="width: 113px">是否领取失业金：</div> <div class="f-label" style="width: 113px">是否领取失业金：</div>
<span class="f-left8 f-font-color"> <span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
{{ {{
resiDetailObj.unemployedDto.unempCompensationFlag != null resiDetailObj.unemployedDto.unempCompensationFlag != null
? resiDetailObj.unemployedDto.unempCompensationFlag === 0 ? resiDetailObj.unemployedDto.unempCompensationFlag === 0
@ -523,10 +526,11 @@
: "--" : "--"
}} }}
</span> </span>
<span v-else>--</span>
</el-col> </el-col>
<el-col :span="6" class="f-flex"> <el-col :span="6" class="f-flex">
<div class="f-label" style="width: 113px">是否就业困难对象：</div> <div class="f-label" style="width: 113px">是否就业困难对象：</div>
<span class="f-left8 f-font-color"> <span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
{{ {{
resiDetailObj.unemployedDto.employmentHardFlag != null resiDetailObj.unemployedDto.employmentHardFlag != null
? resiDetailObj.unemployedDto.employmentHardFlag === 0 ? resiDetailObj.unemployedDto.employmentHardFlag === 0
@ -537,6 +541,8 @@
: "--" : "--"
}} }}
</span> </span>
<span v-else>--</span>
</el-col> </el-col>
<el-col :span="6" class="f-flex"> <el-col :span="6" class="f-flex">
<div class="f-label" style="width: 113px">劳动就业愿望：</div> <div class="f-label" style="width: 113px">劳动就业愿望：</div>
@ -552,10 +558,10 @@
</span> </span>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if=" <el-row v-if=" resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 || (resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6) && resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto
" class="f-m-top23"> " class="f-m-top23">
<el-col <el-col
:span="6" :span="6"

Write Preview
Loading…
Cancel
Save