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

Merge branch 'fix_bug' into dev

feature
mk 2 years ago
parent
4452047838 c3cb81f9ac
commit
3a3dd74fdf
5 changed files with 75 additions and 83 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. 34
      src/views/components/addResi.vue
  2. 69
      src/views/components/editResi.vue
  3. 2
      src/views/modules/base/smartImport/cpts/createdTask.vue
  4. 4
      src/views/modules/portrayal/house/index.vue
  5. 49
      src/views/modules/portrayal/jumin/index.vue

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

@ -94,7 +94,8 @@
</el-form-item> </el-form-item>
</div> </div>
<h5>居住信息登记</h5> <h5>居住信息登记</h5>
<section v-for="(item, index) in this.form.resideInfoDtos" :key="index" class="flex_box"> <section v-for="(item, index) in this.form.resideInfoDtos" :key="index" >
<div class="flex_box">
<el-form-item label="所属组织" class="font-color-orange flex_item_width1" <el-form-item label="所属组织" class="font-color-orange flex_item_width1"
:prop="`resideInfoDtos[${index}].gridId`" :rules="[ :prop="`resideInfoDtos[${index}].gridId`" :rules="[
{ required: true, message: '请选择所属组织', trigger: 'blur' }, { required: true, message: '请选择所属组织', trigger: 'blur' },
@ -119,8 +120,8 @@
<el-form-item :prop="`resideInfoDtos[${index}].buildId`" label-width="0" <el-form-item :prop="`resideInfoDtos[${index}].buildId`" label-width="0"
style="margin:0px" :rules="[ style="margin:0px" :rules="[
{ required: true, message: '请选择楼栋', trigger: 'blur' }, { required: true, message: '请选择楼栋', trigger: 'blur' },
]" class="flex_item_width3"> ]" class="flex_item_width3">
<el-select v-model.trim="form.resideInfoDtos[index].buildId" placeholder="楼号" <el-select v-model.trim="form.resideInfoDtos[index].buildId" placeholder="楼号"
size="small" clearable @change="handleChangeB(index)" size="small" clearable @change="handleChangeB(index)"
class=" f-bto0"> class=" f-bto0">
@ -131,8 +132,8 @@
</el-form-item> </el-form-item>
<el-form-item :prop="`resideInfoDtos[${index}].unitId`" label-width="0" <el-form-item :prop="`resideInfoDtos[${index}].unitId`" label-width="0"
style="margin:0px" :rules="[ style="margin:0px" :rules="[
{ required: true, message: '请选择单元', trigger: 'blur' }, { required: true, message: '请选择单元', trigger: 'blur' },
]" class="flex_item_width3"> ]" class="flex_item_width3">
<el-select v-model.trim="form.resideInfoDtos[index].unitId" placeholder="单元" <el-select v-model.trim="form.resideInfoDtos[index].unitId" placeholder="单元"
size="small" clearable class=" f-bto0" size="small" clearable class=" f-bto0"
@change="handleChangeD(index)"> @change="handleChangeD(index)">
@ -143,8 +144,8 @@
</el-form-item> </el-form-item>
<el-form-item :prop="`resideInfoDtos[${index}].homeId`" label-width="0" <el-form-item :prop="`resideInfoDtos[${index}].homeId`" label-width="0"
style="margin:0px " :rules="[ style="margin:0px " :rules="[
{ required: true, message: '请选择房屋', trigger: 'blur' }, { required: true, message: '请选择房屋', trigger: 'blur' },
]" class="flex_item_width3"> ]" class="flex_item_width3">
<el-select v-model.trim="form.resideInfoDtos[index].homeId" placeholder="房号" <el-select v-model.trim="form.resideInfoDtos[index].homeId" placeholder="房号"
size="small" clearable class=" f-bto0" size="small" clearable class=" f-bto0"
@change="handleChangeH(index)"> @change="handleChangeH(index)">
@ -153,7 +154,15 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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" size="small"
icon="el-icon-minus" @click="handelClickDelHouse(index)" style="height: 30px;"
circle>
</el-button>
</div>
<div class="flex_box">
<el-form-item label="人房关系" class="font-color-blue flex_item_width1"> <el-form-item label="人房关系" class="font-color-blue flex_item_width1">
<el-select v-model="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择" <el-select v-model="form.resideInfoDtos[index].resiHouseRel" placeholder="请选择"
size="small" class="list_item_width_1" size="small" class="list_item_width_1"
@ -193,12 +202,9 @@
: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-button type="primary" size="mini" icon="el-icon-plus" circle </div>
@click="handelClickAddHouse" style="margin-left: 16px; height: 30px;"></el-button>
<el-button type="danger" v-if="form.resideInfoDtos.length > 1" size="small"
icon="el-icon-minus" @click="handelClickDelHouse(index)" style="height: 30px;"
circle>
</el-button>
</section> </section>
<h5>拓展信息登记</h5> <h5>拓展信息登记</h5>
<div class="flex_box"> <div class="flex_box">

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

@ -1,7 +1,7 @@
<template> <template>
<div class="div_form" v-loading="loading"> <div class="div_form" v-loading="loading">
<div class="form"> <div class="form">
<el-form :model="form" :rules="rules" label-width="100px" ref="editForm"> <el-form :model="form" :rules="rules" label-width="105px" ref="editForm">
<h5 style="margin-top: 6px">基础信息登记</h5> <h5 style="margin-top: 6px">基础信息登记</h5>
<div class="flex_box"> <div class="flex_box">
<el-form-item <el-form-item
@ -197,7 +197,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="籍贯" prop="baseInfoDto.nativePlace"> <el-form-item label="籍贯" class="flex_item_width1" prop="baseInfoDto.nativePlace">
<el-input <el-input
v-model="form.baseInfoDto.nativePlace" v-model="form.baseInfoDto.nativePlace"
placeholder="请输入内容" placeholder="请输入内容"
@ -235,12 +235,11 @@
<section <section
v-for="(rowItem, index) in this.form.resideInfoDtos" v-for="(rowItem, index) in this.form.resideInfoDtos"
:key="index" :key="index"
class="flex_box"
> >
<el-form-item <div class="flex_box">
<el-form-item
label="所属组织" label="所属组织"
class="font-color-orange flex_item_width1" class="font-color-orange flex_item_width1"
style="margin: 0px"
:prop="`resideInfoDtos[${index}].gridId`" :prop="`resideInfoDtos[${index}].gridId`"
:rules="[ :rules="[
{ {
@ -266,7 +265,6 @@
<el-form-item <el-form-item
:prop="`resideInfoDtos[${index}].villageId`" :prop="`resideInfoDtos[${index}].villageId`"
label="所属房屋" label="所属房屋"
style="margin: 0px"
label-width="100px" label-width="100px"
class="font-color-orange flex_item_width4" class="font-color-orange flex_item_width4"
:rules="[ :rules="[
@ -370,8 +368,27 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-button
<el-form-item label="人房关系" class="font-color-blue"> 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>
</div>
<div class="flex_box">
<el-form-item label="人房关系" class="font-color-blue flex_item_width1">
<el-select <el-select
v-model="form.resideInfoDtos[index].resiHouseRel" v-model="form.resideInfoDtos[index].resiHouseRel"
placeholder="请选择" placeholder="请选择"
@ -389,7 +406,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="人户状况" class="font-color-blue"> <el-form-item label="人户状况" class="font-color-blue flex_item_width1">
<el-select <el-select
v-model="form.resideInfoDtos[index].householdSituation" v-model="form.resideInfoDtos[index].householdSituation"
placeholder="请选择" placeholder="请选择"
@ -408,7 +425,7 @@
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="与户主关系" label="与户主关系"
class="font-color-blue font-color-blue2" class="font-color-blue font-color-blue2 flex_item_width1"
> >
<el-select <el-select
v-model="form.resideInfoDtos[index].houseHolderRel" v-model="form.resideInfoDtos[index].houseHolderRel"
@ -427,7 +444,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'"> <el-form-item label="户籍所在地" v-if="form.resideInfoDtos[index].householdSituation == 'rzhbz'" class="flex_item_width1">
<el-input <el-input
class="list_item_width_1" class="list_item_width_1"
v-model="form.resideInfoDtos[index].placeOfDomicile" v-model="form.resideInfoDtos[index].placeOfDomicile"
@ -440,7 +457,7 @@
<el-form-item label="现居住地址" v-else-if=" <el-form-item label="现居住地址" v-else-if="
form.resideInfoDtos[index].householdSituation == 'hzrbz' form.resideInfoDtos[index].householdSituation == 'hzrbz'
"> " class="flex_item_width1">
<el-input <el-input
class="list_item_width_1" class="list_item_width_1"
v-model="form.resideInfoDtos[index].currentResidence" v-model="form.resideInfoDtos[index].currentResidence"
@ -451,7 +468,8 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="迁出时间" v-else-if=" <el-form-item label="迁出时间"
class="flex_item_width1" v-else-if="
form.resideInfoDtos[index].householdSituation == 'rhdbz' form.resideInfoDtos[index].householdSituation == 'rhdbz'
"> ">
<el-date-picker <el-date-picker
@ -467,24 +485,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button </div>
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> </section>
<h5>拓展信息登记</h5> <h5>拓展信息登记</h5>
<div class="flex_box"> <div class="flex_box">
@ -644,7 +645,6 @@
<el-form-item class="flex_item_width1" <el-form-item class="flex_item_width1"
label="再就业优惠证号" label="再就业优惠证号"
label-width="120px"
prop="unemployedDto.employmentNum" prop="unemployedDto.employmentNum"
v-if=" v-if="
(form.workInfoDto.careerStatus == 0 || (form.workInfoDto.careerStatus == 0 ||
@ -683,7 +683,6 @@
" "
class="flex_item_width1" class="flex_item_width1"
label="是否领取失业金" label="是否领取失业金"
label-width="120px"
prop="unemployedDto.unempCompensationFlag" prop="unemployedDto.unempCompensationFlag"
> >
<el-radio-group <el-radio-group
@ -705,7 +704,6 @@
" "
class="flex_item_width1" class="flex_item_width1"
label="是否就业困难对象" label="是否就业困难对象"
label-width="150px"
prop="unemployedDto.employmentHardFlag" prop="unemployedDto.employmentHardFlag"
> >
<el-radio-group v-model="form.unemployedDto.employmentHardFlag"> <el-radio-group v-model="form.unemployedDto.employmentHardFlag">
@ -725,7 +723,6 @@
" "
class="flex_item_width1" class="flex_item_width1"
label="劳动就业愿望" label="劳动就业愿望"
label-width="105px"
prop="workInfoDto.employmentWish" prop="workInfoDto.employmentWish"
> >
<el-select <el-select
@ -761,7 +758,6 @@
<el-form-item <el-form-item
v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1" v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
label="与赡养人关系" label="与赡养人关系"
label-width="105px"
prop="familyInfoDto.elderlyRelation" prop="familyInfoDto.elderlyRelation"
> >
<el-select <el-select
@ -782,7 +778,6 @@
<el-form-item <el-form-item
v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1" v-if="form.familyInfoDto.elderlyFlag == 1" class="flex_item_width1"
label="赡养人联系电话" label="赡养人联系电话"
label-width="150px"
prop="familyInfoDto.dependantMobile" prop="familyInfoDto.dependantMobile"
> >
<el-input <el-input

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

@ -434,7 +434,7 @@ export default {
}, },
// 下载单个模板 // 下载单个模板
async handelClickDownModule() { async handelClickDownModule() {
let url = "/actual/base/intelligentImportData/downloadImportModule"; let url = "/actual/base/intelligentImportData/autoGenerateExcelModule";
let params = { let params = {
importCategory: this.form.importCategory, importCategory: this.form.importCategory,
}; };

4
src/views/modules/portrayal/house/index.vue
View File

@ -55,7 +55,7 @@
</el-col> </el-col>
<el-col :span="6" class="f-flex"> <el-col :span="6" class="f-flex">
<div class="f-label"><b>证件号：</b></div> <div class="f-label">证件号：</div>
<div class="f-left8 f-font-color"> <div class="f-left8 f-font-color">
{{ {{
houseDetailObj.ownerIdCard houseDetailObj.ownerIdCard
@ -86,7 +86,7 @@
> >
</el-col> </el-col>
<el-col :span="6" class="f-flex"> <el-col :span="6" class="f-flex">
<div class="f-label"><b>联系电话：</b></div> <div class="f-label">联系电话：</div>
<div class="f-left8 f-font-color"> <div class="f-left8 f-font-color">
{{ {{
houseDetailObj.ownerPhone houseDetailObj.ownerPhone

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

@ -168,7 +168,6 @@
> >
</div> </div>
<div class="f-flex"> <div class="f-flex">
<div class="f-flex">
<div class="f-label">婚姻状况：</div> <div class="f-label">婚姻状况：</div>
<span <span
class="f-left8 f-font-color" class="f-left8 f-font-color"
@ -177,10 +176,8 @@
{{ categoryDictText() }}</span {{ categoryDictText() }}</span
> >
<span v-else> -- </span> <span v-else> -- </span>
</div>
</div> </div>
<div class="f-flex"> <div class="f-flex">
<div class="f-flex">
<div class="f-label">配偶情况：</div> <div class="f-label">配偶情况：</div>
<span <span
class="f-left8 f-font-color" class="f-left8 f-font-color"
@ -188,7 +185,16 @@
>{{ spouseText() }}</span >{{ spouseText() }}</span
> >
<span v-else> -- </span> <span v-else> -- </span>
</div> </div>
<div class="f-flex">
<div class="f-label">籍贯：</div>
<span class="f-left8 f-font-color">{{
resiDetailObj.baseInfoDto
? resiDetailObj.baseInfoDto.nativePlace
? resiDetailObj.baseInfoDto.nativePlace
: "--"
: "--"
}}</span>
</div> </div>
<div class="f-flex"> <div class="f-flex">
<div class="f-label">备注：</div> <div class="f-label">备注：</div>
@ -211,7 +217,6 @@
> >
</div> </div>
<div class="f-flex"> <div class="f-flex">
<div class="f-flex">
<div class="f-label">更新时间：</div> <div class="f-label">更新时间：</div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto"> <span class="f-left8 f-font-color" v-if="resiDetailObj.baseInfoDto">
{{ {{
@ -221,27 +226,28 @@
}}</span }}</span
> >
</div> </div>
</div>
</div> </div>
<div class="title-small">居住信息</div> <div class="title-small">居住信息</div>
<section <section
v-for="(item, indexK) in resiDetailObj.resideInfoDtos" v-for="(item, indexK) in resiDetailObj.resideInfoDtos"
:key="indexK" :key="indexK"
class="flex_box"
> >
<div class="f-flex"> <div class="flex_box">
<div class="f-flex">
<div class="f-label"><b>所属网格：</b></div> <div class="f-label"><b>所属网格：</b></div>
<span class="f-left8 f-font-color"> <span class="f-left8 f-font-color">
{{ item.gridName || "--" }} {{ item.gridName || "--" }}
</span> </span>
</div> </div>
<div class="f-flex"> <div class="f-flex" style="width: 600px">
<div class="f-label"><b>所属房屋：</b></div> <div class="f-label"><b>所属房屋：</b></div>
<span class="f-left8 f-font-color"> <span class="f-left8 f-font-color">
{{ item.gridName + "-" + item.homeName || "--" }} {{ item.gridName + "-" + item.homeName || "--" }}
</span> </span>
</div> </div>
<div class="f-flex"> </div>
<div class="flex_box">
<div class="f-flex">
<div class="f-label"><b>人房关系：</b></div> <div class="f-label"><b>人房关系：</b></div>
<span class="f-left8 f-font-color"> <span class="f-left8 f-font-color">
{{ {{
@ -273,7 +279,8 @@
houseHolderRelText(indexK) houseHolderRelText(indexK)
}}</span> }}</span>
</div> </div>
</section> </div>
</section>
<div class="title-small" id="ext">拓展信息</div> <div class="title-small" id="ext">拓展信息</div>
<section class="flex_box"> <section class="flex_box">
@ -285,16 +292,7 @@
: "--" : "--"
}}</span> }}</span>
</div> </div>
<div class="f-flex">
<div class="f-label">籍贯：</div>
<span class="f-left8 f-font-color">{{
resiDetailObj.baseInfoDto
? resiDetailObj.baseInfoDto.nativePlace
? resiDetailObj.baseInfoDto.nativePlace
: "--"
: "--"
}}</span>
</div>
<div class="f-flex"> <div class="f-flex">
<div class="f-label"><b>就业状态：</b></div> <div class="f-label"><b>就业状态：</b></div>
<span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto"> <span class="f-left8 f-font-color" v-if="resiDetailObj.workInfoDto">
@ -426,14 +424,7 @@
: "--" : "--"
}}</span> }}</span>
</div> </div>
<div <div class="f-flex">
class="f-flex"
v-if="
resiDetailObj.workInfoDto &&
resiDetailObj.workInfoDto.careerStatus >= 1 &&
resiDetailObj.workInfoDto.careerStatus <= 5
"
>
<div class="f-label">有无赡养人：</div> <div class="f-label">有无赡养人：</div>
<div class="f-left8 f-font-color"> <div class="f-left8 f-font-color">
{{ {{

Write Preview
Loading…
Cancel
Save