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

关注人群字典更换,详情控制台报错,失业人员信息报错

feature
mk 2 years ago
parent
fae29d9c5a
commit
1639195d09
5 changed files with 1514 additions and 1097 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. 27
      src/views/components/addResi.vue
  2. 49
      src/views/components/editResi.vue
  3. 1
      src/views/components/resiExpand/editExpand.vue
  4. 2
      src/views/components/resiSearch.vue
  5. 2528
      src/views/modules/portrayal/jumin/index.vue

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

@ -1,7 +1,7 @@
<template> <template>
<div class="div_form"> <div class="div_form">
<div class="form"> <div class="form">
<el-form :model="form" :rules="rules" label-width="100px" ref="addForm"> <el-form :model="form" :rules="rules" label-width="105px" ref="addForm">
<h5 style="margin-top: 6px;">基础信息登记</h5> <h5 style="margin-top: 6px;">基础信息登记</h5>
<div class="basicInfo"> <div class="basicInfo">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
@ -342,7 +342,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否领取失业金" label-width="120px"> <el-form-item label="是否领取失业金" label-width="120px">
<el-radio-group v-model="form.unemployedDto.unempCompensationFlag"> <el-radio-group v-model="form.unemployedDto.unempCompensationFlag">
<el-radio :label="item.value" v-for="item in hasOptions" :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>
@ -351,7 +351,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否就业困难对象" label-width="150px"> <el-form-item label="是否就业困难对象" label-width="150px">
<el-radio-group v-model="form.unemployedDto.employmentHardFlag"> <el-radio-group v-model="form.unemployedDto.employmentHardFlag">
<el-radio :label="item.value" v-for="item in hasOptions" :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>
@ -420,7 +420,7 @@
import { requestGet, requestPost } from "@/js/dai/request"; import { requestGet, requestPost } from "@/js/dai/request";
import { isCard, isPassport, isMobile, isPhone, isHKPassport, isTwPassport, isSoldier } from '@/utils/validate' import { isCard, isPassport, isMobile, isPhone, isHKPassport, isTwPassport, isSoldier } from '@/utils/validate'
import { computedCard } from '@/utils/index' import { computedCard } from '@/utils/index'
import { idTypeList, genderList, hasOptions } from "@/js/columns/constants"; import { idTypeList, genderList, hasOptions ,disabilityFlagList} from "@/js/columns/constants";
import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue"; import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue";
import resiExpand from './resiExpand'; import resiExpand from './resiExpand';
export default { export default {
@ -948,7 +948,7 @@ export default {
idTypeList, idTypeList,
genderList, genderList,
hasOptions, hasOptions,
disabilityFlagList,
btnLoading: false, btnLoading: false,
rules: { rules: {
'baseInfoDto.name': [{ required: true, message: '请输入姓名', trigger: 'blur' }], 'baseInfoDto.name': [{ required: true, message: '请输入姓名', trigger: 'blur' }],
@ -1076,10 +1076,10 @@ export default {
}, },
handleChangeH(i) { handleChangeH(i) {
// let item = this.optionsH.find((item, index) => index === i); // let item = this.optionsH.find((item, index) => index === i);
if (item && item.type == '1') { // if (item && item.type == '1') {
// this.form.IS_TENANT = '1' // // this.form.IS_TENANT = '1'
console.log('item-----', item) // console.log('item-----', item)
} // }
// else // else
// this.form.IS_TENANT = '0' // this.form.IS_TENANT = '0'
}, },
@ -1236,6 +1236,11 @@ 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(
@ -1272,7 +1277,7 @@ export default {
} }
let { code, data, msg } = await requestPost(url, parm) let { code, data, msg } = await requestPost(url, parm)
if (code == 0) { if (code == 0) {
if (house!= 'house') { if (house != 'house') {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.handlerCancle(); this.handlerCancle();
@ -1282,7 +1287,7 @@ export default {
this.$refs['addForm'].resetFields(); this.$refs['addForm'].resetFields();
this.form.resideInfoDtos = homeArr this.form.resideInfoDtos = homeArr
} }
}else if(code >= 8000){ } else if (code >= 8000) {
this.$message.error(msg); this.$message.error(msg);
} }
} }

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

@ -343,7 +343,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否领取失业金" label-width="120px"> <el-form-item label="是否领取失业金" label-width="120px">
<el-radio-group v-model="form.unemployedDto.unempCompensationFlag"> <el-radio-group v-model="form.unemployedDto.unempCompensationFlag">
<el-radio :label="item.value" v-for="item in hasOptions" :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>
@ -352,14 +352,14 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否就业困难对象" label-width="150px"> <el-form-item label="是否就业困难对象" label-width="150px">
<el-radio-group v-model="form.unemployedDto.employmentHardFlag"> <el-radio-group v-model="form.unemployedDto.employmentHardFlag">
<el-radio :label="item.value" v-for="item in hasOptions" :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-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="劳动就业愿望"> <el-form-item label="劳动就业愿望" label-width="105px">
<el-select v-model="form.workInfoDto.employmentWish" placeholder="请选择" size="small" <el-select v-model="form.workInfoDto.employmentWish" placeholder="请选择" size="small"
class="list_item_width_1" clearable> class="list_item_width_1" clearable>
<el-option v-for="(item, index) in dicts.employmentWishList" :key="index" <el-option v-for="(item, index) in dicts.employmentWishList" :key="index"
@ -420,7 +420,7 @@
import { requestGet, requestPost } from "@/js/dai/request"; import { requestGet, requestPost } from "@/js/dai/request";
import { isCard, isPassport, isMobile, isPhone, isHKPassport, isTwPassport, isSoldier } from '@/utils/validate' import { isCard, isPassport, isMobile, isPhone, isHKPassport, isTwPassport, isSoldier } from '@/utils/validate'
import { computedCard } from '@/utils/index' import { computedCard } from '@/utils/index'
import { idTypeList, genderList, hasOptions } from "@/js/columns/constants"; import { idTypeList, genderList, hasOptions,disabilityFlagList } from "@/js/columns/constants";
import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue"; import stafftag from "../modules/portrayal/jumin/cpts/staffTag.vue";
import resiExpand from './resiExpand/editExpand.vue'; import resiExpand from './resiExpand/editExpand.vue';
export default { export default {
@ -996,10 +996,12 @@ export default {
] ]
}, },
], ],
workInfoDtoId:null,
idTypeList, idTypeList,
genderList, genderList,
hasOptions, hasOptions,
disabilityFlagList,
btnLoading: false, btnLoading: false,
rules: { rules: {
@ -1110,6 +1112,20 @@ export default {
specialCategoryCodes: [] specialCategoryCodes: []
} }
} }
if (!res.data.data.unemployedDto) {
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,//劳动能力就业愿望
}
}
for (const key in this.form.baseInfoDto.categoryInfo) { for (const key in this.form.baseInfoDto.categoryInfo) {
if (this.form.baseInfoDto.categoryInfo[key] === 1 && this.incidence[key] || (this.form.baseInfoDto.categoryInfo.partyFlag == 1 && key === 'partyFlag')) { if (this.form.baseInfoDto.categoryInfo[key] === 1 && this.incidence[key] || (this.form.baseInfoDto.categoryInfo.partyFlag == 1 && key === 'partyFlag')) {
const formId = key === 'partyFlag' ? 'parymemberInfoDto' : key; const formId = key === 'partyFlag' ? 'parymemberInfoDto' : key;
@ -1130,7 +1146,8 @@ export default {
} }
} }
} }
console.log(this.footerInputList); 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);
@ -1382,7 +1399,19 @@ export default {
this.form.familyInfoDto.dependantMobile = null this.form.familyInfoDto.dependantMobile = null
}, },
handelClickCareerStatus(val) { handelClickCareerStatus(val) {
this.form.unemployedDto = { this.form.workInfoDto = {
careerStatus: val,//就业状况
workUnit: null,//工作单位
occupation: null,//职业
id:this.workInfoDtoId|| null
}
if(!this.workInfoDtoId){
delete this.form.workInfoDto.id
}
console.log(this.form.workInfoDto);
if (val == 0) {
this.form.baseInfoDto.categoryInfo.unemployedFlag = 1
this.form.unemployedDto = {
originWorkUnit: null,//原工作单位 originWorkUnit: null,//原工作单位
unemploymentTime: null,//失业时间yyyy-MM-dd unemploymentTime: null,//失业时间yyyy-MM-dd
unemploymentNum: null,//失业证号 unemploymentNum: null,//失业证号
@ -1394,10 +1423,9 @@ export default {
employmentWish: null,//劳动能力就业愿望 employmentWish: null,//劳动能力就业愿望
} }
this.form.workInfoDto = { }else{
careerStatus: val,//就业状况 this.form.unemployedDto = null;
workUnit: null,//工作单位 this.form.baseInfoDto.categoryInfo.unemployedFlag = 0
occupation: null,//职业
} }
}, },
handlerCancle() { handlerCancle() {
@ -1474,6 +1502,7 @@ export default {
}, },
showDialog({ index, value }, event) { showDialog({ index, value }, event) {
console.log(value);
// 设置 partyFlag // 设置 partyFlag
if (value === 1 || value === 0 || value === 2) { if (value === 1 || value === 0 || value === 2) {
this.form.baseInfoDto.categoryInfo.partyFlag = value; this.form.baseInfoDto.categoryInfo.partyFlag = value;

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

@ -281,7 +281,6 @@ export default {
await this.getTreeChildenList(node, resolve) await this.getTreeChildenList(node, resolve)
}, },
async getTreeChildenList(node, resolve) { async getTreeChildenList(node, resolve) {
console.log(node);
if (node.data.partyOrgLevel <= 8) { if (node.data.partyOrgLevel <= 8) {
resolve(null); resolve(null);
return; return;

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

@ -1132,7 +1132,7 @@ export default {
}, },
async getResident() { async getResident() {
try { try {
const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'resident_category' }) const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'attention_crowd' })
this.resiClass = data.data this.resiClass = data.data
} catch (error) { } catch (error) {
console.log(error, '获取居民类别字典'); console.log(error, '获取居民类别字典');

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

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save