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

居民列表入参错误,加loading,新增居民如果证件号已存在会提示

feature
mk 2 years ago
parent
45aa1e5f64
commit
edc6696146
5 changed files with 166 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      src/views/components/addResi.vue
  2. 143
      src/views/components/editResi.vue
  3. 3
      src/views/modules/base/resi.vue
  4. 2
      src/views/modules/portrayal/jumin/cpts/staffTag.vue
  5. 92
      src/views/modules/portrayal/jumin/index.vue

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

@ -1185,6 +1185,8 @@ export default {
},
handleValidBlur() {
if (this.form.baseInfoDto.idType != 1) return
this.getResidentInfoByIdNum()
if (!isCard(this.form.baseInfoDto.idNum) && !isPassport(this.form.baseInfoDto.idNum)) return
const { user } = this.$store.state
let huji = '', i = 0
@ -1206,6 +1208,36 @@ export default {
}
},
async getResidentInfoByIdNum(){
try {
let url = '/actual/base/residentBaseInfo/getResidentInfoByIdNum'
let parm = {
idType: this.form.baseInfoDto.idType,
idNum: this.form.baseInfoDto.idNum
}
let { code, data, msg } = await requestGet(url,parm)
if (code == 0 && data != null) {
this.$confirm(`该居民已存在于“${data.name}”是否继续填写`, {
confirmButtonText: '前往修改',
cancelButtonText: '继续填写',
type: 'warning'
}).then(() => {
this.$router.push({ name: 'edit-resi', query: { id: data.id }, params: { idNum: data.idNum, mobile: data.mobile } });
}).catch(() => {
});
} else if (code >= 8000) {
this.$message.error(msg);
this.btnLoading = false;
}
}
catch (error) {
// this.$message.error(msg);
console.log(msg);
}
},
handleLocalRadio(e) {
if (e.target.type === 'radio') return
this.form.baseInfoDto.localResidenceFlag = this.form.baseInfoDto.localResidenceFlag === 0 ? 1 : 0;
@ -1270,6 +1302,7 @@ export default {
})
},
async submitForm(house) {
this.btnLoading = true;
try {
let url = '/actual/base/residentBaseInfo/save'
let parm = {
@ -1287,14 +1320,16 @@ export default {
this.$refs['addForm'].resetFields();
this.form.resideInfoDtos = homeArr
}
this.btnLoading = false;
} else if (code >= 8000) {
this.$message.error(msg);
this.btnLoading = false;
}
}
catch (error) {
this.$message.error(msg);
}
},
showDialog({ index, value }, event) {
if (value == 1) {

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

@ -61,7 +61,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="民族">
<el-form-item label="民族" prop="baseInfoDto.nation">
<el-select v-model="form.baseInfoDto.nation" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.nationList" :key="index"
@ -72,7 +72,7 @@
</el-row>
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item label="文化程度">
<el-form-item label="文化程度" prop="eduInfoDto.cultureLevel">
<el-select v-model="form.eduInfoDto.cultureLevel" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.educationList" :key="index"
@ -81,7 +81,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="婚姻状况">
<el-form-item label="婚姻状况" prop="familyInfoDto.marriage">
<el-select v-model="form.familyInfoDto.marriage" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.marriageList" :key="index"
@ -92,7 +92,7 @@
</el-col>
<el-col :span="6"
v-if="form.familyInfoDto && form.familyInfoDto.marriage == 'chuhun' || form.familyInfoDto.marriage == 'zaihun' || form.familyInfoDto.marriage == 'fuhun'">
<el-form-item label="配偶情况">
<el-form-item label="配偶情况" prop="familyInfoDto.spouseSituation">
<el-select v-model="form.familyInfoDto.spouseSituation" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.spouseSituationList" :key="index"
@ -101,7 +101,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="籍贯">
<el-form-item label="籍贯" prop="baseInfoDto.nativePlace">
<el-input v-model="form.baseInfoDto.nativePlace" placeholder="请输入内容" clearable
size="small" class="list_item_width_1"></el-input>
<el-radio v-model="form.baseInfoDto.localResidenceFlag" style="margin-left: 10px;"
@ -109,7 +109,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
<el-form-item label="备注" prop="baseInfoDto.remark">
<el-input type="textarea" class="item_width_1" :rows="3" placeholder="请输入内容"
v-model="form.baseInfoDto.remark" clearable>
</el-input>
@ -248,13 +248,13 @@
<div class="expand">
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item label="宗教信仰">
<el-form-item label="宗教信仰" prop="religionDto.religion">
<el-input class="list_item_width_1" v-model="form.religionDto.religion"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="就业状态" class="font-color-blue">
<el-form-item label="就业状态" class="font-color-blue" prop="workInfoDto.careerStatus">
<el-select v-model="form.workInfoDto.careerStatus" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.careerStatusList" :key="index"
@ -265,21 +265,21 @@
</el-col>
<el-col :span="6"
v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
<el-form-item label="工作单位">
<el-form-item label="工作单位" prop="workInfoDto.workUnit">
<el-input class="list_item_width_1" v-model="form.workInfoDto.workUnit"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6"
v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
<el-form-item label="职业">
<el-form-item label="职业" prop="workInfoDto.occupation">
<el-input class="list_item_width_1" v-model="form.workInfoDto.occupation"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6"
v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-form-item label="原工作单位">
<el-form-item label="原工作单位" prop="unemployedDto.originWorkUnit">
<el-input class="list_item_width_1" v-model="form.unemployedDto.originWorkUnit"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
@ -287,7 +287,7 @@
<el-col :span="6"
v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-form-item label="失业时间">
<el-form-item 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">
@ -299,7 +299,7 @@
<el-row v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
<el-col :span="6"
v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
<el-form-item label="月收入">
<el-form-item label="月收入" prop="economyDto.monthIncome">
<el-input class="list_item_width_1" v-model="form.economyDto.monthIncome"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
@ -311,13 +311,13 @@
<el-row type="flex" justify=""
v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-col :span="6">
<el-form-item label="失业证号">
<el-form-item label="失业证号" prop="unemployedDto.unemploymentNum">
<el-input class="list_item_width_1" v-model="form.unemployedDto.unemploymentNum"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="失业原因">
<el-form-item label="失业原因" prop="unemployedDto.unemploymentReason">
<el-select v-model="form.unemployedDto.unemploymentReason" placeholder="请选择"
size="small" class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.unemploymentReasonList" :key="index"
@ -326,13 +326,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="再就业优惠证号" label-width="120px">
<el-form-item label="再就业优惠证号" label-width="120px" prop="unemployedDto.employmentNum">
<el-input class="list_item_width_1" v-model="form.unemployedDto.employmentNum"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="技术特长">
<el-form-item label="技术特长" prop="unemployedDto.specialSkill">
<el-input class="list_item_width_1" v-model="form.unemployedDto.specialSkill"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
@ -341,7 +341,7 @@
<el-row type="flex"
v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-col :span="6">
<el-form-item label="是否领取失业金" label-width="120px">
<el-form-item label="是否领取失业金" label-width="120px" prop="unemployedDto.unempCompensationFlag">
<el-radio-group v-model="form.unemployedDto.unempCompensationFlag">
<el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
item.label
@ -350,7 +350,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否就业困难对象" label-width="150px">
<el-form-item label="是否就业困难对象" label-width="150px" prop="unemployedDto.employmentHardFlag">
<el-radio-group v-model="form.unemployedDto.employmentHardFlag">
<el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
item.label
@ -359,7 +359,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="劳动就业愿望" label-width="105px">
<el-form-item label="劳动就业愿望" label-width="105px" prop="workInfoDto.employmentWish">
<el-select v-model="form.workInfoDto.employmentWish" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.employmentWishList" :key="index"
@ -370,7 +370,7 @@
</el-row>
<el-row type="flex" justify="">
<el-col :span="6">
<el-form-item label="有无赡养人">
<el-form-item label="有无赡养人" prop="familyInfoDto.elderlyFlag">
<el-radio-group v-model="form.familyInfoDto.elderlyFlag">
<el-radio :label="item.value" v-for="item in hasOptions" :key="item.value"
@click.native="handelClickelderly">{{ item.label
@ -379,7 +379,7 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.familyInfoDto.elderlyFlag == 1">
<el-form-item label="与赡养人关系" label-width="105px">
<el-form-item label="与赡养人关系" label-width="105px" prop="familyInfoDto.elderlyRelation">
<el-select v-model="form.familyInfoDto.elderlyRelation" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.houseHolderRelList" :key="index"
@ -388,7 +388,7 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.familyInfoDto.elderlyFlag == 1">
<el-form-item label="赡养人联系电话" label-width="150px">
<el-form-item label="赡养人联系电话" label-width="150px" prop="familyInfoDto.dependantMobile">
<el-input class="list_item_width_1" v-model="form.familyInfoDto.dependantMobile"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
@ -404,9 +404,9 @@
<el-row style="margin:24px">
<el-col :span="24" align="center">
<el-button size="small" class="diy-button--white" @click="handlerCancle" plain>取消</el-button>
<el-button type="primary" size="small" @click="handleClickSubmit">保存</el-button>
<el-button type="primary" size="small" @click="handleClickSubmit" :loading="btnLoading">保存</el-button>
<el-button type="primary" size="small"
@click="handleClickSubmit('house')">提交并补充家庭人员信息</el-button>
@click="handleClickSubmit('house')" :loading="btnLoading">提交并补充家庭人员信息</el-button>
</el-col>
</el-row>
</el-form>
@ -426,7 +426,7 @@ import resiExpand from './resiExpand/editExpand.vue';
export default {
data() {
return {
loading: true,
loading: false,
houseType: true,
formList: [],
@ -1056,6 +1056,7 @@ export default {
},
async activated() {
this.resiId = this.$route.query.id;
this.loading = true;
await this.getDicts()
await this.getOrgTreeList()
await this.getResiDetail()
@ -1146,9 +1147,11 @@ export default {
}
}
this.workInfoDtoId=this.form.workInfoDto.id;
this.loading = false;
return Promise.all(promises);
} else if (res.data.code >= 8000) {
this.$message.error(res.data.msg);
this.loading = false;
}
})
.then(() => {
@ -1156,7 +1159,6 @@ export default {
.catch((err) => {
console.log(err);
});
this.loading = false;
},
async getDicts() {
@ -1442,47 +1444,62 @@ export default {
});
},
handleClickSubmit(house) {
this.$refs['editForm'].validate((valid) => {
if (valid) {
this.form.resideInfoDtos.forEach(item => {
delete item.optionsV;
delete item.optionsB;
delete item.optionsH;
delete item.optionsD;
});
delete this.form.integrityData;
this.submitForm(house);
}
})
// this.$refs['editForm'].validate((valid) => {
// if (valid) {
// this.form.resideInfoDtos.forEach(item => {
// delete item.optionsV;
// delete item.optionsB;
// delete item.optionsH;
// delete item.optionsD;
// });
// delete this.form.integrityData;
// this.submitForm(house);
// }
// })
this.submitForm(house);
},
async submitForm(house) {
try {
let url = this.houseType ? '/actual/base/residentBaseInfo/update' : '/actual/base/residentBaseInfo/save';
let parm = {
...this.form
}
let { code, data, msg } = await requestPost(url, parm)
if (code == 0) {
if (house != 'house') {
this.$message.success('保存成功');
this.$refs['editForm'].resetFields();
this.handlerCancle();
} else {
this.$message.success('保存成功');
let homeArr = JSON.parse(JSON.stringify(this.form.resideInfoDtos));
this.$refs['editForm'].resetFields();
this.form.resideInfoDtos = homeArr;
this.removeIdKey(this.form)
this.houseType = false
}
for (let key in this.form.baseInfoDto.categoryInfo) {
if (this.form.baseInfoDto.categoryInfo[key] === 1) {
this.form.baseInfoDto.categoryInfo[key] = 0;
}
}
this.removeIdKey(this.form);
this.houseType = false;
this.btnLoading = true;
// try {
// let url = this.houseType ? '/actual/base/residentBaseInfo/update' : '/actual/base/residentBaseInfo/save';
// let parm = {
// ...this.form
// }
// let { code, data, msg } = await requestPost(url, parm)
// if (code == 0) {
// if (house != 'house') {
// this.$message.success('保存成功');
// this.$refs['editForm'].resetFields();
// this.handlerCancle();
// } else {
// this.$message.success('保存成功');
// let homeArr = JSON.parse(JSON.stringify(this.form.resideInfoDtos));
// this.$refs['editForm'].resetFields();
// this.form.resideInfoDtos = homeArr;
// this.removeIdKey(this.form)
// this.houseType = false
// }
// } else if (code >= 8000) {
// this.$message.error(msg);
// }
// }
// catch (error) {
// this.$message.error(msg);
// }
this.btnLoading = false;
} else if (code >= 8000) {
this.$message.error(msg);
}
}
catch (error) {
this.$message.error(msg);
}
},
removeIdKey(obj) {
if (!obj || typeof obj !== 'object') {
@ -1501,7 +1518,6 @@ export default {
},
showDialog({ index, value }, event) {
console.log(value);
// 设置 partyFlag
if (value === 1 || value === 0 || value === 2) {
this.form.baseInfoDto.categoryInfo.partyFlag = value;
@ -1545,6 +1561,7 @@ export default {
});
this.$refs['resiExpand'].formType = this.incidence[value].formType;
this.$refs['resiExpand'].showForm();
console.log(this.form,'tianjiawanzujian');
});
} else {
this.$refs['resiExpand'].formList = this.$refs['resiExpand'].formList.filter(item => item.formId !== this.incidence[value].formId);

3
src/views/modules/base/resi.vue
View File

@ -588,6 +588,9 @@ export default {
for (const n in this.$refs.myResiSearch.form) {
this.$refs.myResiSearch.form[n] = "";
}
this.$refs.myResiSearch.form.healthStatus = [];
this.$refs.myResiSearch.form.attentionCrowds = [];
this.$refs.myResiSearch.form.specialCategoryCodes = [];
this.currentPage = 1
this.$refs.myResiSearch.level = ''
this.getTableData();

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

@ -161,7 +161,7 @@ export default {
const { data } = await this.$http.post('sys/dict/data/dictlist', { dictType: 'special_resident_category' });
this.formData.tableData[3].option = data.data
} catch (error) {
console.log(error, `获取 ${dictType} 字典`);
console.log(error);
}
},
updatedForm() {

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

@ -326,9 +326,10 @@
<el-col
:span="6"
class="f-flex"
v-if=" resiDetailObj.workInfoDto &&
( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5)
v-if="
resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5
"
>
<div class="f-label">工作单位：</div>
@ -343,7 +344,7 @@
<el-col
:span="6"
class="f-flex"
v-if="
v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
@ -363,9 +364,10 @@
<el-col
:span="6"
class="f-flex"
v-if=" resiDetailObj.workInfoDto &&
( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5)
v-if="
resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5
"
>
<div class="f-flex">
@ -382,10 +384,10 @@
<el-col
:span="6"
class="f-flex"
v-if="resiDetailObj.workInfoDto &&
v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto.careerStatus == 6)
"
>
<div class="f-label">失业时间：</div>
@ -400,9 +402,10 @@
<el-col
:span="6"
class="f-flex"
v-if=" resiDetailObj.workInfoDto &&
( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5)
v-if="
resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5
"
>
<div class="f-flex">
@ -419,10 +422,10 @@
<el-col
:span="6"
class="f-flex"
v-if="resiDetailObj.workInfoDto &&
v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto.careerStatus == 6)
"
>
<div class="f-label">失业证号：</div>
@ -438,10 +441,9 @@
:span="6"
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto.careerStatus == 6)
"
>
<div class="f-label">失业原因：</div>
@ -456,9 +458,10 @@
<el-col
:span="6"
class="f-flex"
v-if=" resiDetailObj.workInfoDto &&
( resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5)
v-if="
resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5
"
>
<div class="f-label">有无赡养人：</div>
@ -478,10 +481,9 @@
:span="6"
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto.careerStatus == 6)
"
>
<div class="f-label" style="width: 113px">再就业优惠证号：</div>
@ -500,7 +502,7 @@
v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
resiDetailObj.workInfoDto.careerStatus == 6)
"
>
<el-col :span="6" class="f-flex">
@ -515,7 +517,7 @@
</el-col>
<el-col :span="6" class="f-flex">
<div class="f-label" style="width: 113px">是否领取失业金：</div>
<span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
<span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
{{
resiDetailObj.unemployedDto.unempCompensationFlag != null
? resiDetailObj.unemployedDto.unempCompensationFlag === 0
@ -530,7 +532,7 @@
</el-col>
<el-col :span="6" class="f-flex">
<div class="f-label" style="width: 113px">是否就业困难对象：</div>
<span class="f-left8 f-font-color" v-if=" resiDetailObj.unemployedDto">
<span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
{{
resiDetailObj.unemployedDto.employmentHardFlag != null
? resiDetailObj.unemployedDto.employmentHardFlag === 0
@ -542,32 +544,29 @@
}}
</span>
<span v-else>--</span>
</el-col>
<el-col :span="6" class="f-flex">
<div class="f-label" style="width: 113px">劳动就业愿望：</div>
<span class="f-left8 f-font-color">
{{
resiDetailObj.workInfoDto
? resiDetailObj.workInfoDto.employmentWish
resiDetailObj.workInfoDto
? resiDetailObj.workInfoDto.employmentWish
? resiDetailObj.workInfoDto.employmentWish
: "--"
: "--"
: "--"
}}
}}
</span>
</el-col>
</el-row>
<el-row v-if=" resiDetailObj.workInfoDto &&
<el-row
v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
" class="f-m-top23">
<el-col
:span="6"
class="f-flex"
>
resiDetailObj.workInfoDto.careerStatus == 6)
"
class="f-m-top23"
>
<el-col :span="6" class="f-flex">
<div class="f-label">有无赡养人：</div>
<div class="f-left8 f-font-color">
{{
@ -661,7 +660,7 @@ import { idTypeList } from "@/js/columns/constants";
export default {
data() {
return {
loading: true,
loading: false,
checkType: "edit", //edit或者view
changeRecordList: [], //更新记录
resiDetailObj: {}, //居民详情
@ -1257,7 +1256,6 @@ export default {
.catch((err) => {
console.log(err);
});
this.loading = false;
},
handelClickJumpEdit() {
this.checkType = "edit";
@ -1477,8 +1475,10 @@ export default {
formCode: "resi_base_info",
});
this.houseHolderRelArr = data.data;
this.loading = false;
} catch (error) {
console.log(error, "获取与户主关系");
this.loading = false;
}
},
houseHolderRelText(index) {
@ -1509,6 +1509,7 @@ export default {
watch: {
"$store.state.huaXiang.userInfo.resiId": {
handler(newValue, oldValue) {
this.loading = true;
this.resiId = newValue;
this.resiDetailObj = {};
this.getNationalityList();
@ -1519,7 +1520,6 @@ export default {
this.getChangeRecordDetailById();
this.getHouseholdSituation();
this.gethouseHolderRel();
this.loading = false;
},
deep: true, // 开启深度监听
immediate: true, // 立即触发一次handler

Write Preview
Loading…
Cancel
Save