From 6940bfe6c76687ab08a0fa52429b511a342bf92b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 21 Mar 2024 19:10:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91=E5=B8=83=E5=B1=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E8=80=81=E5=B9=B4=E4=BA=BA=E5=9B=9E=E5=A1=AB=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/resiAdd.scss | 20 +- src/assets/scss/pages/resiInfo.scss | 48 ++- src/views/components/addResi.vue | 285 +++++--------- src/views/components/editResi.vue | 407 ++++++++------------ src/views/components/resiSearch.vue | 10 - src/views/modules/portrayal/jumin/index.vue | 254 ++++++------ 6 files changed, 429 insertions(+), 595 deletions(-) diff --git a/src/assets/scss/pages/resiAdd.scss b/src/assets/scss/pages/resiAdd.scss index 8858ececd..5b97e2246 100644 --- a/src/assets/scss/pages/resiAdd.scss +++ b/src/assets/scss/pages/resiAdd.scss @@ -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 { diff --git a/src/assets/scss/pages/resiInfo.scss b/src/assets/scss/pages/resiInfo.scss index e1fcf212e..63abec1b7 100644 --- a/src/assets/scss/pages/resiInfo.scss +++ b/src/assets/scss/pages/resiInfo.scss @@ -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; -} + diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 9e9e819a9..814288282 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -3,85 +3,70 @@
基础信息登记
-
- - - +
+ - - - + + - - - + + - - - + + - - - - - + + - - - + + - - - + + - - - + + - - - - - + + - - - + + - - - + - - - + 本地 - - - +
居住信息登记
-
-
- - - + - + - - + + label-width="100px" class="font-color-orange flex_item_width4" :rules="[ + { required: true, message: '请选择小区', trigger: 'blur' }, + ]"> + size="small" class="f-bto0" clearable> + + + ]" class="flex_item_width3"> + class=" f-bto0"> @@ -156,9 +132,9 @@ + ]" class="flex_item_width3"> @@ -168,27 +144,17 @@ + ]" class="flex_item_width3"> - - - - - - - - - + + @@ -196,64 +162,53 @@ :label="item.label" :value="item.value"> - - - + - - - - - - - - - - - + - - - - + - - - + + - - - - - + + + + + + + +
-
拓展信息登记
-
- - - +
+ + - - - + + - - - + + - - - + + - - - + + - - - - + + - - - - - - + + + - - - - - - - - + + - - - + + - - - + + - - - + + - - - - - + + + {{ item.label }} - - - + + {{ item.label }} - - - + + - - - - - + + {{ item.label }} - - - + + - - - + + - -
人员标签
@@ -650,11 +570,12 @@ export default { children: [ { label: "老年人分类", - itemType: "select1", - multiple: true, + itemType: "checkbox", formName: "oldPeopleCategories", opctionUrl: 'sys/dict/data/dictlist', opctionParams: { dictType: 'oldPeople_categories' }, + opction:[] + }, { label: "居住情况", diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 9859a180e..2b333c934 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -3,13 +3,11 @@
基础信息登记
-
- - +
- - + - - + - - + - - - - + - - - + + - - - + + - - - - + + - - - - - + + - - - + + - - - - - + 本地 - - - +
居住信息登记
-
- - - - + @@ -376,7 +351,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" > @@ -389,28 +364,7 @@ - - - - - - - + - - - - - - - + + - - - + "> - - - + "> - - - + + +
-
拓展信息登记
-
- - - +
+ + - - + - - - + "> - - = 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: "业务记录", From 493d0e93f6ec8eee5540140d9f56eb0b945b976e Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 21 Mar 2024 19:57:13 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=BB=84=E7=BB=87=E6=A0=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?,=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E5=BE=97=E5=88=86=E9=A1=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/resi.vue | 21 +++------------------ src/views/modules/portrayal/jumin/index.vue | 18 +++++------------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 2c7b31816..f33746b63 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -1208,12 +1208,7 @@ export default { this.autoOpenArr.push(data.id); if (!isRefresh && data) { this.selTreeObj = data; - if (!this.selTreeObj.latitude) { - this.selTreeObj.latitude = this.centerPoint[0]; - } - if (!this.selTreeObj.longitude) { - this.selTreeObj.longitude = this.centerPoint[1]; - } + } } else { this.$message.error(msg); @@ -1225,7 +1220,7 @@ export default { }, async handleNodeClick(obj) { this.selObj = JSON.parse(JSON.stringify(obj)); - this.getTreeObj(obj); + this.selTreeObj = obj; await nextTick(1000); this.searchAgencyObj = {}; if (obj.level === "building") { @@ -1242,17 +1237,7 @@ export default { this.handleSearchFrom("type"); } }, - //解析树数据 - getTreeObj(obj) { - if (!obj.latitude) { - obj.latitude = this.centerPoint[0]; - } - - if (!obj.longitude) { - obj.longitude = this.centerPoint[1]; - } - this.selTreeObj = obj; - }, + }, watch: { $route: { diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index fa67e4cf7..5fcba222e 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -21,7 +21,7 @@ :class="{ item: true, active: index == active }" v-for="(item, index) in menuList" @click="handelCLickMenu(item.id, index)" - v-show="item.filledQty != 0" + v-show="item.filledQty != 0 || item.id == 'ext'" > {{ item.name }} - item.filledQty > 0 && - item.name !== "基本信息" && - item.name !== "拓展信息" + item.filledQty > 0 ||( + item.name == "拓展信息" || + item.name == "基本信息") ); this.expandList = this.originalExpandList.filter((itemA) => { return arr.some((itemB) => itemB.name === itemA.title); @@ -1164,15 +1164,7 @@ 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; - // }); - console.log(this.expandList); + this.menuList.push( { name: "业务记录", From 9ada02e1fe604c769b11b7d6ee86a1d33a937f71 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 21 Mar 2024 20:08:41 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/pages/smartImport.scss | 2 +- src/views/modules/base/smartImport/cpts/completeTask.vue | 7 +++---- src/views/modules/base/smartImport/cpts/createdTask.vue | 4 ++-- src/views/modules/base/smartImport/cpts/executeTask.vue | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/assets/scss/pages/smartImport.scss b/src/assets/scss/pages/smartImport.scss index ab75a4236..6f616d8d7 100644 --- a/src/assets/scss/pages/smartImport.scss +++ b/src/assets/scss/pages/smartImport.scss @@ -94,7 +94,7 @@ } /deep/ .el-step__description{ width: 300px; - color: #cbcbcb; + color: #666666; } } diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index 4a4fc18a6..6c50e0a90 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -21,7 +21,7 @@ 操作说明

1、可以到居民信息中查看本次导入的数据。

-

2、导入失效的数据,您可以下载失败文件修改后,重新创建任务导入。

+

2、您可以下载导入失败的数据，按错误提示更正后新建任务再次导入。

数据导入明细

@@ -41,19 +41,18 @@ @click="handelClickLook('fail')" >查看 - 下载结果说明下载导入失败数据 -
+
{{ file.name }} - + 删除
diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue index a2373209e..52551d636 100644 --- a/src/views/modules/base/smartImport/cpts/executeTask.vue +++ b/src/views/modules/base/smartImport/cpts/executeTask.vue @@ -57,7 +57,7 @@ Date: Fri, 22 Mar 2024 10:23:33 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/addResi.vue | 34 +++++---- src/views/components/editResi.vue | 69 +++++++++---------- .../base/smartImport/cpts/createdTask.vue | 2 +- src/views/modules/portrayal/house/index.vue | 4 +- src/views/modules/portrayal/jumin/index.vue | 49 ++++++------- 5 files changed, 75 insertions(+), 83 deletions(-) diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index 814288282..1c481069e 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -94,7 +94,8 @@
居住信息登记
-
+
+
+ { required: true, message: '请选择楼栋', trigger: 'blur' }, + ]" class="flex_item_width3"> @@ -131,8 +132,8 @@ + { required: true, message: '请选择单元', trigger: 'blur' }, + ]" class="flex_item_width3"> @@ -143,8 +144,8 @@ + { required: true, message: '请选择房屋', trigger: 'blur' }, + ]" class="flex_item_width3"> @@ -153,7 +154,15 @@ - + + + +
+
+ - - - +
+ +
拓展信息登记
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 2b333c934..4e964e28f 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -1,7 +1,7 @@