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

Merge branch 'fix_bug' into dev 

# Conflicts:
#	src/views/components/addResi.vue
#	src/views/modules/base/smartImport/cpts/createdTask.vue
feature
mk 2 years ago
parent
521dcbc5bb 6940bfe6c7
commit
b1bfa9779d
7 changed files with 1006 additions and 1290 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. 20
      src/assets/scss/pages/resiAdd.scss
  2. 48
      src/assets/scss/pages/resiInfo.scss
  3. 1553
      src/views/components/addResi.vue
  4. 407
      src/views/components/editResi.vue
  5. 10
      src/views/components/resiSearch.vue
  6. 4
      src/views/modules/base/smartImport/cpts/createdTask.vue
  7. 254
      src/views/modules/portrayal/jumin/index.vue

20
src/assets/scss/pages/resiAdd.scss
View File

@ -2,11 +2,29 @@
height: 100%;
padding:16px;
.item_width_1{
width: 514px;
width: 498px;
}
.form{
background-color: #fff;
padding:16px;
.flex_box{
display: flex;
flex-wrap: wrap;
.flex_item_width1{
width: 332px;
}
.flex_item_width2{
width: 700px;
}
.flex_item_width3{
width: 120px;
}
.flex_item_width4{
width: 300px;
}
}
}
}
h5 {

48
src/assets/scss/pages/resiInfo.scss
View File

@ -84,6 +84,7 @@
}
.right{
flex: 1;
width: 100%;
height: 100%;
background: #ffffff;
position: relative;
@ -104,31 +105,40 @@
margin-left: 0px;
margin-top: 22px;
}
.f-label {
width: 100px;
text-align: right;
color: rgba(51, 51, 51, .85) ;
>b{
font-weight: 400;
position: relative;
color: rgba(51, 51, 51, .85) ;
.flex_box{
display: flex;
flex-wrap: wrap;
&::after{
content: '*';
position: absolute;
top: 0px;
color: #ff5107;
left: -7px;
.f-flex{
margin-top: 23px;
width: 332px;
align-items: center;
.f-label {
width: 100px;
text-align: right;
color: rgba(51, 51, 51, .85) ;
>b{
font-weight: 400;
position: relative;
color: rgba(51, 51, 51, .85) ;
&::after{
content: '*';
position: absolute;
top: 0px;
color: #ff5107;
left: -7px;
}
}
}
}
}
.f-labels{
width: 155px;
text-align: right;
}
.f-flex{
align-items: center;
}
.f-m-top23{
margin-top: 23px;
}
@ -138,6 +148,4 @@
::v-deep .el-button--text{
padding: 0;
}
::v-deep .el-row{
padding-left: 37px;
}

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

File diff suppressed because it is too large

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

@ -3,13 +3,11 @@
<div class="form">
<el-form :model="form" :rules="rules" label-width="100px" ref="editForm">
<h5 style="margin-top: 6px">基础信息登记</h5>
<div class="basicInfo">
<el-row type="flex" justify="space-between">
<el-col :span="6">
<div class="flex_box">
<el-form-item
label="姓名"
prop="baseInfoDto.name"
class="font-color-orange"
class="font-color-orange flex_item_width1"
>
<el-input
class="list_item_width_1"
@ -19,12 +17,11 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="证件类型"
prop="baseInfoDto.idType"
class="font-color-orange"
class="font-color-orange flex_item_width1"
>
<el-select
v-model="form.baseInfoDto.idType"
@ -41,12 +38,11 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="证件号"
prop="baseInfoDto.idNum"
class="font-color-orange"
class="flex_item_width1"
>
<el-input
v-model="form.baseInfoDto.idNum"
@ -57,12 +53,11 @@
@blur="handleValidBlur"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="国籍"
prop="baseInfoDto.nationality"
class="font-color-orange"
class="font-color-orange flex_item_width1"
>
<el-select
v-model="form.baseInfoDto.nationality"
@ -79,14 +74,11 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item
label="联系电话"
prop="baseInfoDto.mobile"
class="font-color-orange"
class="font-color-orange flex_item_width1"
>
<el-input
class="list_item_width_1"
@ -96,9 +88,8 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="性别" prop="baseInfoDto.gender">
<el-form-item label="性别" prop="baseInfoDto.gender" class="flex_item_width1">
<el-select
v-model="form.baseInfoDto.gender"
placeholder="请选择"
@ -114,9 +105,8 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="出生日期" prop="baseInfoDto.birthday">
<el-form-item label="出生日期" class="flex_item_width1" prop="baseInfoDto.birthday">
<el-date-picker
v-model.trim="form.baseInfoDto.birthday"
class="list_item_width_1"
@ -128,10 +118,8 @@
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="民族" prop="baseInfoDto.nation">
</el-form-item>
<el-form-item label="民族" class="flex_item_width1" prop="baseInfoDto.nation">
<el-select
v-model="form.baseInfoDto.nation"
placeholder="请选择"
@ -147,11 +135,8 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item label="文化程度" prop="eduInfoDto.cultureLevel">
<el-form-item label="文化程度" class="flex_item_width1" prop="eduInfoDto.cultureLevel">
<el-select
v-model="form.eduInfoDto.cultureLevel"
placeholder="请选择"
@ -167,9 +152,8 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="婚姻状况" prop="familyInfoDto.marriage">
<el-form-item label="婚姻状况" class="flex_item_width1" prop="familyInfoDto.marriage">
<el-select
v-model="form.familyInfoDto.marriage"
placeholder="请选择"
@ -186,19 +170,16 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="6"
v-if="
<el-form-item
class="flex_item_width1"
label="配偶情况"
prop="familyInfoDto.spouseSituation" v-if="
(form.familyInfoDto &&
form.familyInfoDto.marriage == 'chuhun') ||
form.familyInfoDto.marriage == 'zaihun' ||
form.familyInfoDto.marriage == 'fuhun'
"
>
<el-form-item
label="配偶情况"
prop="familyInfoDto.spouseSituation"
>
<el-select
v-model="form.familyInfoDto.spouseSituation"
@ -215,8 +196,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="籍贯" prop="baseInfoDto.nativePlace">
<el-input
v-model="form.baseInfoDto.nativePlace"
@ -239,9 +219,7 @@
>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" prop="baseInfoDto.remark">
<el-form-item label="备注" prop="baseInfoDto.remark" class="flex_item_width2">
<el-input
type="textarea"
class="item_width_1"
@ -254,16 +232,14 @@
</el-form-item>
</div>
<h5>居住信息登记</h5>
<div class="house">
<section
v-for="(rowItem, index) in this.form.resideInfoDtos"
:key="index"
class="flex_box"
>
<el-row type="flex" justify="start" style="margin-bottom: 24px">
<el-col :span="8">
<el-form-item
label="所属组织"
class="font-color-orange"
class="font-color-orange flex_item_width1"
style="margin: 0px"
:prop="`resideInfoDtos[${index}].gridId`"
:rules="[
@ -275,7 +251,7 @@
]"
>
<el-cascader
class="u-item-width-agency"
class="list_item_width_1"
ref="myCascader"
clearable
size="small"
@ -286,14 +262,13 @@
:disabled="rowItem.accessable === 0"
></el-cascader>
</el-form-item>
</el-col>
<el-col :span="16" style="display: flex">
<el-form-item
:prop="`resideInfoDtos[${index}].villageId`"
label="所属房屋"
style="margin: 0px"
label-width="100px"
class="font-color-orange"
class="font-color-orange flex_item_width4"
:rules="[
{ required: true, message: '请选择小区', trigger: 'blur' },
]"
@ -302,7 +277,7 @@
v-model.trim="form.resideInfoDtos[index].villageId"
placeholder="请选择小区"
size="small"
class="u-item-width-communitycascader f-bto0"
class=" f-bto0"
clearable
@change="handleChangeV(index)"
:disabled="rowItem.accessable === 0"
@ -330,7 +305,7 @@
size="small"
clearable
@change="handleChangeB(index)"
class="u-item-width-buildcascader f-bto0"
class="flex_item_width3 f-bto0"
:disabled="rowItem.accessable === 0"
>
<el-option
@ -355,7 +330,7 @@
placeholder="单元"
size="small"
clearable
class="u-item-width-buildcascader f-bto0"
class="flex_item_width3 f-bto0"
@change="handleChangeD(index)"
:disabled="rowItem.accessable === 0"
>
@ -382,7 +357,7 @@
placeholder="房号"
size="small"
clearable
class="u-item-width-buildcascader f-bto0"
class="flex_item_width3 f-bto0"
@change="handleChangeH(index)"
:disabled="rowItem.accessable === 0"
>
@ -395,28 +370,7 @@
</el-option>
</el-select>
</el-form-item>
<el-button
type="primary"
size="mini"
icon="el-icon-plus"
circle
@click="handelClickAddHouse"
style="margin-left: 16px; height: 30px"
></el-button>
<el-button
type="danger"
v-if="form.resideInfoDtos.length > 1 && rowItem.accessable !== 0"
size="small"
icon="el-icon-minus"
@click="handelClickDelHouse(index)"
style="height: 30px"
circle
>
</el-button>
</el-col>
</el-row>
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item label="人房关系" class="font-color-blue">
<el-select
v-model="form.resideInfoDtos[index].resiHouseRel"
@ -435,8 +389,6 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="人户状况" class="font-color-blue">
<el-select
v-model="form.resideInfoDtos[index].householdSituation"
@ -454,8 +406,6 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="与户主关系"
class="font-color-blue font-color-blue2"
@ -476,12 +426,8 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="6"
v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'"
>
<el-form-item label="户籍所在地">
<el-form-item label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'">
<el-input
class="list_item_width_1"
v-model="form.resideInfoDtos[index].placeOfDomicile"
@ -491,14 +437,10 @@
:disabled="rowItem.accessable === 0"
></el-input>
</el-form-item>
</el-col>
<el-col
:span="6"
v-else-if="
<el-form-item label="现居住地址" v-else-if="
form.resideInfoDtos[index].householdSituation == 'hzrbz'
"
>
<el-form-item label="现居住地址">
">
<el-input
class="list_item_width_1"
v-model="form.resideInfoDtos[index].currentResidence"
@ -508,14 +450,10 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col
:span="6"
v-else-if="
<el-form-item label="迁出时间" v-else-if="
form.resideInfoDtos[index].householdSituation == 'rhdbz'
"
>
<el-form-item label="迁出时间">
">
<el-date-picker
v-model.trim="form.resideInfoDtos[index].outOfTime"
class="list_item_width_1"
@ -529,16 +467,29 @@
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6" v-else> </el-col>
</el-row>
<el-button
type="primary"
size="mini"
icon="el-icon-plus"
circle
@click="handelClickAddHouse"
style="margin-left: 16px; height: 30px"
></el-button>
<el-button
type="danger"
v-if="form.resideInfoDtos.length > 1 && rowItem.accessable !== 0"
size="small"
icon="el-icon-minus"
@click="handelClickDelHouse(index)"
style="height: 30px"
circle
>
</el-button>
</section>
</div>
<h5>拓展信息登记</h5>
<div class="expand">
<el-row type="flex" justify="space-between">
<el-col :span="6">
<el-form-item label="宗教信仰" prop="religionDto.religion">
<div class="flex_box">
<el-form-item class="flex_item_width1" label="宗教信仰" prop="religionDto.religion">
<el-input
class="list_item_width_1"
v-model="form.religionDto.religion"
@ -547,11 +498,10 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
label="就业状态"
class="font-color-blue"
class="font-color-blue flex_item_width1"
prop="workInfoDto.careerStatus"
>
<el-select
@ -570,15 +520,11 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="6"
v-if="
<el-form-item label="工作单位" class="flex_item_width1" prop="workInfoDto.workUnit" v-if="
form.workInfoDto.careerStatus >= 1 &&
form.workInfoDto.careerStatus <= 5
"
>
<el-form-item label="工作单位" prop="workInfoDto.workUnit">
">
<el-input
class="list_item_width_1"
v-model="form.workInfoDto.workUnit"
@ -587,15 +533,11 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col
:span="6"
v-if="
<el-form-item v-if="
form.workInfoDto.careerStatus >= 1 &&
form.workInfoDto.careerStatus <= 5
"
>
<el-form-item label="职业" prop="workInfoDto.occupation">
" label="职业" class="flex_item_width1" prop="workInfoDto.occupation">
<el-input
class="list_item_width_1"
v-model="form.workInfoDto.occupation"
@ -604,16 +546,12 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col
:span="6"
v-if="
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
>
<el-form-item
class="flex_item_width1"
label="原工作单位"
prop="unemployedDto.originWorkUnit"
>
@ -625,17 +563,12 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col
:span="6"
v-if="
<el-form-item class="flex_item_width1" v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
>
<el-form-item
label="失业时间"
prop="unemployedDto.unemploymentTime"
>
@ -651,23 +584,12 @@
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" v-if="!form.workInfoDto.careerStatus"></el-col>
</el-row>
<el-row
v-if="
<el-form-item label="月收入" class="flex_item_width1" 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="月收入" prop="economyDto.monthIncome">
" prop="economyDto.monthIncome">
<el-input
class="list_item_width_1"
v-model="form.economyDto.monthIncome"
@ -676,22 +598,15 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="18"> </el-col>
</el-row>
<el-row
type="flex"
justify=""
v-if="
<el-form-item class="flex_item_width1"
label="失业证号"
prop="unemployedDto.unemploymentNum"
v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
>
<el-col :span="6">
<el-form-item
label="失业证号"
prop="unemployedDto.unemploymentNum"
>
<el-input
class="list_item_width_1"
@ -701,11 +616,15 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<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="form.unemployedDto.unemploymentReason"
@ -722,12 +641,16 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
<el-form-item class="flex_item_width1"
label="再就业优惠证号"
label-width="120px"
prop="unemployedDto.employmentNum"
v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
>
<el-input
class="list_item_width_1"
@ -737,9 +660,12 @@
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="技术特长" prop="unemployedDto.specialSkill">
<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="form.unemployedDto.specialSkill"
@ -748,18 +674,14 @@
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row
type="flex"
v-if="
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
>
<el-col :span="6">
<el-form-item
class="flex_item_width1"
label="是否领取失业金"
label-width="120px"
prop="unemployedDto.unempCompensationFlag"
@ -775,9 +697,13 @@
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
class="flex_item_width1"
label="是否就业困难对象"
label-width="150px"
prop="unemployedDto.employmentHardFlag"
@ -791,9 +717,13 @@
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item
<el-form-item v-if="
(form.workInfoDto.careerStatus == 0 ||
form.workInfoDto.careerStatus == 6) &&
form.workInfoDto.careerStatus
"
class="flex_item_width1"
label="劳动就业愿望"
label-width="105px"
prop="workInfoDto.employmentWish"
@ -813,11 +743,10 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" justify="">
<el-col :span="6">
<el-form-item label="有无赡养人" prop="familyInfoDto.elderlyFlag">
<el-form-item label="有无赡养人" class="flex_item_width1" prop="familyInfoDto.elderlyFlag">
<el-radio-group v-model="form.familyInfoDto.elderlyFlag">
<el-radio
:label="item.value"
@ -828,9 +757,9 @@
>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.familyInfoDto.elderlyFlag == 1">
<el-form-item
v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
label="与赡养人关系"
label-width="105px"
prop="familyInfoDto.elderlyRelation"
@ -850,9 +779,8 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="form.familyInfoDto.elderlyFlag == 1">
<el-form-item
v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
label="赡养人联系电话"
label-width="150px"
prop="familyInfoDto.dependantMobile"
@ -865,8 +793,6 @@
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<h5>人员标签</h5>
<div class="stafftag">
@ -1021,7 +947,7 @@ export default {
optionsB: [],
optionsH: [],
optionsD: [],
orgOptions:[]
orgOptions: [],
},
],
religionDto: {
@ -1050,7 +976,7 @@ export default {
monthIncome: null, //月收入
},
},
orgOption:[],
orgOption: [],
footerInputList: [
{
id: "healthDto",
@ -1174,12 +1100,12 @@ export default {
children: [
{
label: "老年人分类",
itemType: "select1",
multiple: true,
itemType: "checkbox",
formName: "oldPeopleCategories",
opctionUrl: "sys/dict/data/dictlist",
opctionParams: { dictType: "oldPeople_categories" },
pformName: "oldPeopleDto",
opction:[]
},
{
label: "居住情况",
@ -1600,7 +1526,7 @@ export default {
title: "志愿者",
},
},
formCopy:null
formCopy: null,
};
},
async created() {
@ -1610,7 +1536,7 @@ export default {
this.resiId = this.$route.query.id;
this.loading = true;
await this.getDicts();
await this.getOrgTreeListAll()
await this.getOrgTreeListAll();
await this.getResiDetail();
},
methods: {
@ -1628,8 +1554,8 @@ export default {
promises.push(this.getBuildList(i));
promises.push(this.getHouseList(i));
promises.push(this.getUniList(i));
this.form.resideInfoDtos[i].orgOptions = []
this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId,i);
this.form.resideInfoDtos[i].orgOptions = [];
this.getOrgTreeList(this.form.resideInfoDtos[i].agencyId, i);
}
this.form = { ...res.data.data };
this.form.baseInfoDto.idNum = this.$route.params.idNum;
@ -1668,7 +1594,7 @@ export default {
if (!res.data.data.subsistenceAllowanceDto) {
this.form.subsistenceAllowanceDto = {
reasons: [],
category:null ,
category: null,
};
}
if (!res.data.data.unemployedDto) {
@ -1705,12 +1631,17 @@ export default {
formData &&
Object.keys(formData).includes(formName)
) {
if(this.footerInputList[i].children[index].itemType == 'cascader1'){
if (
this.footerInputList[i].children[index].itemType ==
"cascader1"
) {
this.footerInputList[i].children[index].orgPath =
formData.partyOrgIdPath || null;
formData.partyOrgIdPath || null;
}
this.footerInputList[i].children[index].value =
formData[formName] != null?formData[formName]:null
formData[formName] != null
? formData[formName]
: null;
this.footerInputList[i].children[index].id =
formData.id;
}
@ -1791,9 +1722,9 @@ export default {
console.log("获取字典失败: ", error);
}
},
getOrgTreeList(id,i) {
getOrgTreeList(id, i) {
this.$http
.post("/gov/org/customeragency/rootagencygridtree", {agencyId:id})
.post("/gov/org/customeragency/rootagencygridtree", { agencyId: id })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
@ -1808,12 +1739,12 @@ export default {
},
getOrgTreeListAll() {
this.$http
.post("/gov/org/customeragency/agencygridtree", {})
.post("/gov/org/customeragency/agencygridtree", {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
this.orgOption.push(res.data)
this.orgOption.push(res.data);
}
})
.catch(() => {
@ -1890,7 +1821,7 @@ export default {
this.$http
.post("/actual/base/communityQuarters/listQuartersOptions", {
gridId: this.form.resideInfoDtos[index].gridId,
agencyId:this.form.resideInfoDtos[index].agencyId || user.agencyId,
agencyId: this.form.resideInfoDtos[index].agencyId || user.agencyId,
})
.then(({ data: res }) => {
if (res.code !== 0) {
@ -1973,7 +1904,7 @@ export default {
optionsB: [],
optionsH: [],
optionsD: [],
orgOptions:this.orgOption
orgOptions: this.orgOption,
});
},
handelClickDelHouse(i) {
@ -2068,22 +1999,22 @@ 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 item.orgOptions;
});
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 item.orgOptions;
});
delete this.form.integrityData;
this.submitForm(house);
}
});
},
async submitForm(house) {
this.btnLoading = true
this.btnLoading = true;
try {
let url = this.houseType
? "/actual/base/residentBaseInfo/update"

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

@ -358,16 +358,6 @@ export default {
value: "xiejiaorenyuan",
children: null
},
{
label: "信访人员",
value: "petitionOfficerFlag",
children: null
},
{
label: "统战人员",
value: "unitedFrontFlag",
children: null
}
],
careerStatusList: [],
form: {

4
src/views/modules/base/smartImport/cpts/createdTask.vue
View File

@ -165,7 +165,7 @@
<template slot-scope="scope">
<span
:class="[
scope.row.itemGroupId && scope.row.itemGroupId != ''
scope.row.itemId && scope.row.itemId != ''
? ''
: 'font_color_red',
]"
@ -179,7 +179,7 @@
label="对应到"
min-width="50"
>
<template slot-scope="scope"><span v-if="scope.row.itemGroupId"> =></span> </template>
<template slot-scope="scope"><span v-if="scope.row.itemId"> =></span> </template>
</el-table-column>
<el-table-column
prop="itemGroupId"

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

@ -46,10 +46,9 @@
>
</div>
<div class="title-small" id="base">基础信息</div>
<el-row type="flex" justify="" class="f-m-top23">
<el-col :span="6" class="f-flex">
<div class="flex_box">
<div class="f-flex">
<div class="f-label"><b>国籍：</b></div>
<div
class="f-left8 f-font-color"
v-if="this.resiDetailObj.baseInfoDto"
@ -57,8 +56,8 @@
{{ nationalityText() }}
</div>
<div class="f-left8 f-font-color" v-else>--</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label"><b>证件类型：</b></div>
<div
class="f-left8 f-font-color"
@ -67,8 +66,8 @@
{{ idTypeText() }}
</div>
<div class="f-left8 f-font-color" v-else>--</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label"><b>证件号：</b></div>
<div class="f-left8 f-font-color">
{{
@ -98,8 +97,8 @@
@click="handelCLickShowCheckPassword('idCard')"
>{{ showFlagIdCardBtn ? "显示" : "隐藏" }}</el-button
>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label"><b>联系电话：</b></div>
<div class="f-left8 f-font-color">
{{
@ -129,10 +128,9 @@
@click="handelCLickShowCheckPassword('mobile')"
>{{ showFlagMobileBtn ? "显示" : "隐藏" }}</el-button
>
</el-col>
</el-row>
<el-row type="flex" justify="" class="f-m-top23">
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label">性别：</div>
<div class="f-left8 f-font-color">
{{
@ -141,14 +139,14 @@
: "--"
}}
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label">出生日期：</div>
<div class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
{{ resiDetailObj.baseInfoDto.birthday || "--" }}
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label">民族：</div>
<div class="f-left8 f-font-color">
{{
@ -157,8 +155,8 @@
: "--"
}}
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label">文化程度：</div>
<span class="f-left8 f-font-color">
{{
@ -168,10 +166,8 @@
: "--"
}}</span
>
</el-col>
</el-row>
<el-row type="flex" justify="" class="f-m-top23">
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-flex">
<div class="f-label">婚姻状况：</div>
<span
@ -182,8 +178,8 @@
>
<span v-else> -- </span>
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-flex">
<div class="f-label">配偶情况：</div>
<span
@ -193,8 +189,8 @@
>
<span v-else> -- </span>
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label">备注：</div>
<div class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
{{
@ -203,9 +199,9 @@
: "--"
}}
</div>
</el-col>
<el-col :span="6" class="f-flex">
<div class="f-label">创建日期：</div>
</div>
<div class="f-flex">
<div class="f-label">创建时间：</div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
{{
resiDetailObj.baseInfoDto.createdTime
@ -213,10 +209,8 @@
: "--"
}}</span
>
</el-col>
</el-row>
<el-row type="flex" justify="" class="f-m-top23">
<el-col :span="24" class="f-flex">
</div>
<div class="f-flex">
<div class="f-flex">
<div class="f-label">更新时间：</div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
@ -227,33 +221,26 @@
}}</span
>
</div>
</el-col>
</el-row>
</div>
</div>
<div class="title-small">居住信息</div>
<section
v-for="(item, indexK) in resiDetailObj.resideInfoDtos"
:key="indexK"
class="flex_box"
>
<el-row type="flex" justify="" class="f-m-top23">
<el-col :span="12" class="f-flex">
<div class="f-flex">
<div class="f-label"><b>所属网格：</b></div>
<span class="f-left8 f-font-color">
{{ item.gridName || "--" }}
</span>
</div>
</el-col>
<el-col :span="12" class="f-flex">
<div class="f-flex">
<div class="f-label"><b>所属房屋：</b></div>
<span class="f-left8 f-font-color">
{{ item.gridName + "-" + item.homeName || "--" }}
</span>
</div>
</el-col>
</el-row>
<el-row type="flex" justify="" class="f-m-top23">
<el-col :span="6" class="f-flex">
<div class="f-flex">
<div class="f-label"><b>人房关系：</b></div>
<span class="f-left8 f-font-color">
@ -267,35 +254,30 @@
: "--"
}}
</span>
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label"><b>人户状况：</b></div>
<span class="f-left8 f-font-color">{{
householdSituationText(indexK)
}}</span>
</div>
</el-col>
<el-col :span="6" class="f-flex">
<div class="f-flex">
<div class="f-label"><b>户籍所在地：</b></div>
<div class="f-left8 f-font-color">
{{ item.placeOfDomicile || "--" }}
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label"><b>与户主关系：</b></div>
<span class="f-left8 f-font-color">{{
houseHolderRelText(indexK)
}}</span>
</el-col>
</el-row>
</div>
</section>
<div class="title-small" id="ext">拓展信息</div>
<el-row type="flex" justify="" class="f-m-top23">
<el-col :span="6" class="f-flex">
<div class="f-flex">
<section class="flex_box">
<div class="f-flex">
<div class="f-label">宗教信仰：</div>
<span class="f-left8 f-font-color">{{
resiDetailObj.religionDto && resiDetailObj.religionDto.religion
@ -303,8 +285,6 @@
: "--"
}}</span>
</div>
</el-col>
<el-col :span="6" class="f-flex">
<div class="f-flex">
<div class="f-label">籍贯：</div>
<span class="f-left8 f-font-color">{{
@ -314,17 +294,16 @@
: "--"
: "--"
}}</span>
</div>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex">
<div class="f-label"><b>就业状态：</b></div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
{{ careerStatusText() }}
</span>
<span v-else>--</span>
</el-col>
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -340,9 +319,9 @@
: "--"
: "--"
}}</span>
</el-col>
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -358,11 +337,9 @@
: "--"
: "--"
}}</span>
</el-col>
</el-row>
<el-row type="flex" class="f-m-top23">
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -370,7 +347,6 @@
resiDetailObj.workInfoDto.careerStatus <= 5
"
>
<div class="f-flex">
<div class="f-label">职业：</div>
<span class="f-left8 f-font-color">{{
resiDetailObj.workInfoDto
@ -379,10 +355,9 @@
: "--"
: "--"
}}</span>
</div>
</el-col>
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -398,9 +373,9 @@
: "--"
: "--"
}}</span>
</el-col>
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -408,7 +383,6 @@
resiDetailObj.workInfoDto.careerStatus <= 5
"
>
<div class="f-flex">
<div class="f-label">月收入：</div>
<span class="f-left8 f-font-color">{{
resiDetailObj.economyDto
@ -418,9 +392,7 @@
: "--"
}}</span>
</div>
</el-col>
<el-col
:span="6"
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -436,9 +408,8 @@
: "--"
: "--"
}}</span>
</el-col>
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -454,9 +425,8 @@
: "--"
: "--"
}}</span>
</el-col>
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -476,9 +446,8 @@
: "--"
}}
</div>
</el-col>
<el-col
:span="6"
</div>
<div
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
@ -494,18 +463,13 @@
: "--"
: "--"
}}</span>
</el-col>
</el-row>
<el-row
type="flex"
class="f-m-top23"
v-if="
</div>
<div class="f-flex" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
"
>
<el-col :span="6" class="f-flex">
">
<div class="f-label" style="width: 113px">再就业优惠证号：</div>
<span class="f-left8 f-font-color">{{
resiDetailObj.unemployedDto
@ -514,8 +478,12 @@
: "--"
: "--"
}}</span>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
">
<div class="f-label" style="width: 113px">是否领取失业金：</div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
{{
@ -529,8 +497,12 @@
}}
</span>
<span v-else>--</span>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
">
<div class="f-label" style="width: 113px">是否就业困难对象：</div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.unemployedDto">
{{
@ -544,8 +516,12 @@
}}
</span>
<span v-else>--</span>
</el-col>
<el-col :span="6" class="f-flex">
</div>
<div class="f-flex" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
resiDetailObj.workInfoDto.careerStatus == 6)
">
<div class="f-label" style="width: 113px">劳动就业愿望：</div>
<span class="f-left8 f-font-color">
{{
@ -556,17 +532,13 @@
: "--"
}}
</span>
</el-col>
</el-row>
<el-row
v-if="
</div>
<div class="f-flex" v-if="
resiDetailObj.workInfoDto &&
(resiDetailObj.workInfoDto.careerStatus == 0 ||
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">
{{
@ -579,8 +551,8 @@
: "--"
}}
</div>
</el-col>
</el-row>
</div>
</section>
<div class="title-small">关系图谱</div>
<graph
:userInfo="resiDetailObj.baseInfoDto"
@ -600,27 +572,20 @@
<div class="title-small" :id="sectionItem.scrollId">
{{ sectionItem.title }}
</div>
<el-row
type="flex"
justify=""
class="f-m-top23"
v-for="(row, rowIndex) in sectionItem.rows"
<section class="flex_box">
<div
class="f-flex"
v-for="(row, rowIndex) in sectionItem.children"
:key="rowIndex + sectionItem.id"
>
<el-col
:span="8"
class="f-flex"
v-for="(item, itemIndex) in row"
:key="itemIndex"
>
<div class="f-flex">
<div class="f-label">{{ item.label }}：</div>
<div class="f-label">{{ row.label }}：</div>
<span class="f-left8 f-font-color">{{
item.value ? item.value : "--"
row.value ? row.value : "--"
}}</span>
</div>
</el-col>
</el-row>
</div>
</section>
</section>
<div class="title-small" id="businessRecord">业务记录</div>
@ -798,7 +763,7 @@ export default {
children: [
{
label: "老年人分类",
itemType: "select1",
itemType: "checkbox",
multiple: true,
formName: "oldPeopleCategories",
opctionUrl: "sys/dict/data/dictlist",
@ -1199,14 +1164,15 @@ export default {
})
);
this.expandList.forEach((item) => {
const rows = [];
const chunkSize = 3;
for (let i = 0; i < item.children.length; i += chunkSize) {
rows.push(item.children.slice(i, i + chunkSize));
}
item.rows = rows;
});
// this.expandList.forEach((item) => {
// const rows = [];
// const chunkSize = 3;
// for (let i = 0; i < item.children.length; i += chunkSize) {
// rows.push(item.children.slice(i, i + chunkSize));
// }
// item.rows = rows;
// });
console.log(this.expandList);
this.menuList.push(
{
name: "业务记录",

Write Preview
Loading…
Cancel
Save