From 144da0bf574f127618b967f4e9f3f7c0a11c0658 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 16 Feb 2023 18:03:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E7=AC=A6=E5=90=88=E6=9D=A1=E4=BB=B6=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E4=B8=8B=E6=96=B9=E9=80=89=E9=A1=B9/=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96/=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=B1=BB=E5=88=AB=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/buttonstyle.scss | 13 +++++-- src/views/components/resiForm.vue | 18 ++++++--- src/views/components/resiInfo.vue | 59 ++++++++++++++--------------- src/views/components/resiSearch.vue | 4 +- src/views/modules/base/resi.vue | 36 ++++++++++-------- 5 files changed, 74 insertions(+), 56 deletions(-) diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index dbf80ad00..51b592f90 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -39,7 +39,9 @@ border: none !important; } - +.diy-button--blue:hover{ + background: #0042a3 !important; +} //黄色 .diy-button--yellow { background: linear-gradient(0deg, #FAA700 0%, #FFBF28 100%) !important; @@ -95,15 +97,18 @@ font-size: 14px !important; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; - color: #0056D6 !important; + color: #0056d6 !important; // line-height: 22px !important; min-width: 60px !important; height: 32px !important; - // padding:0 8px !important; background: #FFFFFF !important; border-radius: 2px !important; - border: 1px solid #0056D6 !important; + border: 1px solid #0056d6 !important; +} +.diy-button--white:hover{ + border: 1px solid #0042a3 !important; + color: #0042a3 !important; } // 普通按钮 .diy-button--common { diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 9f40b73b9..2a2cb1eee 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -195,6 +195,7 @@ :multiple="itemk.formName=='specialCategoryCode'" :collapse-tags="itemk.formName=='specialCategoryCode'" clearable + :style="{'width':itemk.formName=='specialCategoryCode'?'183px':''}" class="u-item-width-normal"> { + this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); } else { @@ -2039,6 +2045,7 @@ export default { this.newForm.healthDto = this.form.healthDto } }) + }, // 工作信息详情 residentWorkInfo(id) { @@ -2457,4 +2464,5 @@ export default { .f-bto0{ margin-bottom: 0px !important; } + diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index 30d13cac2..6a2dd0280 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -444,36 +444,6 @@ - - - -
-
死亡时间 :
- {{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}} -
- - -
-
加入原因 :
- {{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}} -
- - -
-
移除时间 :
- {{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}} -
- - - - -
-
移除原因 :
- {{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}} -
- - - @@ -856,6 +826,35 @@ -- + + + +
+
死亡时间 :
+ {{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}} +
+ + +
+
加入原因 :
+ {{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}} +
+ + +
+
移除时间 :
+ {{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}} +
+ + + + +
+
移除原因 :
+ {{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}} +
+ + diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index a47077356..9c8c1bbcd 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -39,10 +39,10 @@ - + 至 - + diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index c6d73f8c9..28bf62b13 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -16,7 +16,7 @@ style="margin-left: 10px" size="small" plain - class=" f-right5" + class=" f-right5 diy-button--white" @click="resetSearchForm" >重置 导出核对批量删除 { - // if (res.code !== 0) { - // return this.$message.error(res.msg); - // } else { - // this.$refs.baseForm.old_from(res.data); - // } - // }).catch((err) => { - // return this.$message.error("网络错误"); - // }); - // }, + residentBaseInfo () { + this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.$refs.baseForm.old_from(res.data); + } + }).catch((err) => { + return this.$message.error("网络错误"); + }); + }, handlerReset() { this.$refs.baseForm.resetForm(); }, From 920daf95292c83e6e1c2f315defa6bffe5a74544 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Feb 2023 11:09:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/community/communityExportInfo.vue | 2 +- src/views/modules/base/diyInfo.vue | 6 +++--- src/views/modules/base/resi.vue | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue index bc75c4cc1..0123805c7 100644 --- a/src/views/modules/base/community/communityExportInfo.vue +++ b/src/views/modules/base/community/communityExportInfo.vue @@ -328,7 +328,7 @@ export default { this.exportTemplate(id) }, async exportTemplate (id) { - let url = "/epmetuser/icresiuser/exportExcelCustom" + let url = "/actual/base/communityHouse/exportExcelCustom" let params = { templateId: id || '', diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue index 62cbe0574..ae5a035a7 100644 --- a/src/views/modules/base/diyInfo.vue +++ b/src/views/modules/base/diyInfo.vue @@ -310,14 +310,14 @@ export default { this.exportTemplate(id) }, async exportTemplate(id) { - let url = "/epmetuser/icresiuser/exportExcelCustom" + let url = "/actual/base/residentBaseInfo/exportExcelCustom" let params = { templateId: id || '', searchForm: {...this.search}, exportConfig: { ...this.form, - formCode: 'resi_base_info', + formCode: 'resident_base_info', itemList: this.rightList.map(item => { return { itemId: item.id, @@ -355,7 +355,7 @@ export default { }, async getTemplateList () { let params = { - formCode: 'resi_base_info' + formCode: 'resident_base_info' } await this.$http .post('/oper/customize/icExportTemplate/templateList', params) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 28bf62b13..85d31f9ef 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -309,7 +309,7 @@ :resi-id="editUserId" @changegroup="handleChangeGroup" /> - +
@@ -401,7 +401,7 @@ ref="ref_diy" :list="exportList" :search="{ - formCode: 'resi_base_info', + formCode: 'resident_base_info', pageNo: currentPage, pageSize: pageSize, conditions: conditions, @@ -642,7 +642,7 @@ export default { categoryKey: "resi_info", paramMap: { searchForm: { - formCode: "resi_base_info", + formCode: "resident_base_info", pageNo: this.currentPage, pageSize: this.pageSize, conditions: this.conditions, @@ -898,7 +898,7 @@ export default { this.exportBtn = true; this.exportBtnTitle = "正在导出..."; let params = { - formCode: "resi_base_info", + formCode: "resident_base_info", conditions: this.conditions, }; @@ -1330,7 +1330,7 @@ export default { getrowInfo(id) { let params = { - formCode: "resi_base_info", + formCode: "resident_base_info", icResiUserId: id, }; this.$http @@ -1408,7 +1408,7 @@ export default { let options = []; // console.log('getOptionsList----', url) await this.$http - .post(url, { formCode: "resi_base_info" }) + .post(url, { formCode: "resident_base_info" }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1441,7 +1441,7 @@ export default { async getFormList(type) { await this.$http .post("/oper/customize/icform/getcustomerform", { - formCode: "resi_base_info", + formCode: "resident_base_info", dynamic: true, }) .then(({ data: res }) => { @@ -1485,7 +1485,7 @@ export default { async getExportList(type) { const url = "/oper/customize/icformitemgroup/list"; let params = { - formCode: "resi_base_info", + formCode: "resident_base_info", }; const { data, code, msg } = await requestPost(url, params); @@ -1552,7 +1552,7 @@ export default { immediate: true } }, - + }; From 6217d1f333894a919ebc09380431d1d672fafa19 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Feb 2023 12:46:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/commonDemand/commonDemand.vue | 289 ++++++++++++++++++ .../modules/commonDemand/commonDemandForm.vue | 176 +++++++++++ 2 files changed, 465 insertions(+) create mode 100644 src/views/modules/commonDemand/commonDemand.vue create mode 100644 src/views/modules/commonDemand/commonDemandForm.vue diff --git a/src/views/modules/commonDemand/commonDemand.vue b/src/views/modules/commonDemand/commonDemand.vue new file mode 100644 index 000000000..9972662e9 --- /dev/null +++ b/src/views/modules/commonDemand/commonDemand.vue @@ -0,0 +1,289 @@ + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/commonDemand/commonDemandForm.vue b/src/views/modules/commonDemand/commonDemandForm.vue new file mode 100644 index 000000000..fbf39ac40 --- /dev/null +++ b/src/views/modules/commonDemand/commonDemandForm.vue @@ -0,0 +1,176 @@ + + + + + + + + \ No newline at end of file From 2b9dda7e97792e8aaabd959129e6b1313a0769c6 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 Feb 2023 13:16:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80=E7=AC=AC=E4=B8=80=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/community.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 17c6603fd..571533aa2 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -19,6 +19,7 @@ :filter-node-method="filterNode" @node-click="handleNodeClick" lazy + :default-expanded-keys="autoOpenArr" :load="lazyLoadTree"> nowData } return { + autoOpenArr:[], boxHeight: true, searchHeight: 190, filterText: '', @@ -538,15 +539,17 @@ export default { this.startLoading() this.$refs.ref_tree.$data.store.lazy = !this.filterText if(this.filterText.length > 0 && this.filterText!=''){ - const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}` + const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}` const {data,code,msg} = await requestGet(url) if(data[0].children.length>0){ this.treeData = data + this.autoOpenArr.push(this.treeData[0].id); }else{ this.treeData = [] setTimeout(() => { this.loadTree() }, 5) + this.$message.error('暂未找到!') } }else {