+
+
+
-
-
+
-
-
-
+ ">
-
- = 1 &&
form.workInfoDto.careerStatus <= 5
- "
- >
-
+ " label="职业" class="flex_item_width1" prop="workInfoDto.occupation">
-
-
-
@@ -619,17 +557,12 @@
clearable
>
-
-
-
-
@@ -645,23 +578,12 @@
>
-
-
-
-
-
-
+ " prop="economyDto.monthIncome">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
-
-
-
-
人员标签
@@ -1015,7 +941,7 @@ export default {
optionsB: [],
optionsH: [],
optionsD: [],
- orgOptions:[]
+ orgOptions: [],
},
],
religionDto: {
@@ -1044,7 +970,7 @@ export default {
monthIncome: null, //月收入
},
},
- orgOption:[],
+ orgOption: [],
footerInputList: [
{
id: "healthDto",
@@ -1168,12 +1094,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: "居住情况",
@@ -1594,7 +1520,7 @@ export default {
title: "志愿者",
},
},
- formCopy:null
+ formCopy: null,
};
},
async created() {
@@ -1604,7 +1530,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: {
@@ -1622,8 +1548,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;
@@ -1662,7 +1588,7 @@ export default {
if (!res.data.data.subsistenceAllowanceDto) {
this.form.subsistenceAllowanceDto = {
reasons: [],
- category:null ,
+ category: null,
};
}
if (!res.data.data.unemployedDto) {
@@ -1699,12 +1625,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;
}
@@ -1785,9 +1716,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);
@@ -1802,12 +1733,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(() => {
@@ -1884,7 +1815,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) {
@@ -1967,7 +1898,7 @@ export default {
optionsB: [],
optionsH: [],
optionsD: [],
- orgOptions:this.orgOption
+ orgOptions: this.orgOption,
});
},
handelClickDelHouse(i) {
@@ -2063,22 +1994,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"
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 0667b7215..8b4829ccf 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -358,16 +358,6 @@ export default {
value: "xiejiaorenyuan",
children: null
},
- {
- label: "信访人员",
- value: "petitionOfficerFlag",
- children: null
- },
- {
- label: "统战人员",
- value: "unitedFrontFlag",
- children: null
- }
],
careerStatusList: [],
form: {
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index e8e04b888..fa67e4cf7 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -46,10 +46,9 @@
>
基础信息
-
-
+
+
国籍：
-
+
证件类型：
+
证件号：
{{
@@ -98,8 +97,8 @@
@click="handelCLickShowCheckPassword('idCard')"
>{{ showFlagIdCardBtn ? "显示" : "隐藏" }}
-
-
+
+
联系电话：
{{
@@ -129,10 +128,9 @@
@click="handelCLickShowCheckPassword('mobile')"
>{{ showFlagMobileBtn ? "显示" : "隐藏" }}
-
-
-
-
+
+
+
性别：
{{
@@ -141,14 +139,14 @@
: "--"
}}
-
-
+
+
出生日期：
{{ resiDetailObj.baseInfoDto.birthday || "--" }}
-
-
+
+
民族：
{{
@@ -157,8 +155,8 @@
: "--"
}}
-
-
+
+
文化程度：
{{
@@ -168,10 +166,8 @@
: "--"
}}
-
-
-
-
+
+
+
+
备注：
{{
@@ -203,9 +199,9 @@
: "--"
}}
-
-
- 创建日期：
+
+
+
创建时间：
{{
resiDetailObj.baseInfoDto.createdTime
@@ -213,10 +209,8 @@
: "--"
}}
-
-
-
-
+
+
更新时间：
@@ -227,33 +221,26 @@
}}
-
-
+
+
居住信息
-
-
所属网格：
{{ item.gridName || "--" }}
-
-
所属房屋：
{{ item.gridName + "-" + item.homeName || "--" }}
-
-
-
-
人房关系：
@@ -267,35 +254,30 @@
: "--"
}}
-
-
-
+
人户状况：
{{
householdSituationText(indexK)
}}
-
-
+
户籍所在地：
{{ item.placeOfDomicile || "--" }}
-
-
+
+
与户主关系：
{{
houseHolderRelText(indexK)
}}
-
-
+
拓展信息
-
-
-
+
+
宗教信仰：
{{
resiDetailObj.religionDto && resiDetailObj.religionDto.religion
@@ -303,8 +285,6 @@
: "--"
}}
-
-
籍贯：
{{
@@ -314,17 +294,16 @@
: "--"
: "--"
}}
-
-
-
+
就业状态：
{{ careerStatusText() }}
--
-
-
+
-
-
+
-
-
-
-
+
-
职业：
{{
resiDetailObj.workInfoDto
@@ -379,10 +355,9 @@
: "--"
: "--"
}}
-
-
-
+
-
-
+
-
月收入：
{{
resiDetailObj.economyDto
@@ -418,9 +392,7 @@
: "--"
}}
-
-
-
-
+
-
-
+
-
-
+
-
-
-
-
+ ">
再就业优惠证号：
{{
resiDetailObj.unemployedDto
@@ -514,8 +478,12 @@
: "--"
: "--"
}}
-
-
+
是否领取失业金：
{{
@@ -529,8 +497,12 @@
}}
--
-
-
+
+
是否就业困难对象：
{{
@@ -544,8 +516,12 @@
}}
--
-
-
+
+
劳动就业愿望：
{{
@@ -556,17 +532,13 @@
: "--"
}}
-
-
-
-
+ ">
有无赡养人：
{{
@@ -579,8 +551,8 @@
: "--"
}}
-
-
+
+
关系图谱
{{ sectionItem.title }}
-
-
-
{{ item.label }}：
+
+
{{ row.label }}：
{{
- item.value ? item.value : "--"
+ row.value ? row.value : "--"
}}
-
-
+
业务记录
@@ -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: "业务记录",