From 7d2496c2e4b6458524cd2ee5ec4ee5bd68acc430 Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Mon, 25 Sep 2023 17:22:25 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E7=94=A8=E4=BA=86=E8=80=81=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=8E=86=E5=8F=B2=E9=81=97?= =?UTF-8?q?=E7=95=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 8 ++++---- .../base/residentManagement/louzhang/louzhangList.vue | 6 +++--- .../modules/base/residentManagement/tefu/tefuList.vue | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 774f1d65b..71f20f306 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -853,8 +853,8 @@ export default { }, getBuildList () { this.$http - .post('/gov/org/icbuilding/buildingoption', { - neighborHoodId: this.form.villageId + .post('/actual/base/communityBuilding/buildingoption', { + quartersId: this.form.villageId }) .then(({ data: res }) => { if (res.code !== 0) { @@ -870,7 +870,7 @@ export default { }, getUniList () { this.$http - .post('/gov/org/icbuildingunit/unitoption', { + .post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.form.buildId }) .then(({ data: res }) => { @@ -887,7 +887,7 @@ export default { }, getHouseList () { this.$http - .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId }) + .post('/actual/base/communityHouse/houseoption', { buildingId: this.form.buildId,unitId: this.form.unitId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue index 1e16c7c89..74b7925ac 100644 --- a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue +++ b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue @@ -392,8 +392,8 @@ export default { }, getBuildList () { this.$http - .post('/gov/org/icbuilding/buildingoption', { - neighborHoodId: this.formData.villageId + .post('/actual/base/communityBuilding/buildingoption', { + quartersId: this.formData.villageId }) .then(({ data: res }) => { if (res.code !== 0) { @@ -409,7 +409,7 @@ export default { }, getUniList () { this.$http - .post('/gov/org/icbuildingunit/unitoption', { + .post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.formData.buildId }) .then(({ data: res }) => { diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue index f7ebabe53..d9358c989 100644 --- a/src/views/modules/base/residentManagement/tefu/tefuList.vue +++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue @@ -683,8 +683,8 @@ export default { }, getBuildList () { this.$http - .post('/gov/org/icbuilding/buildingoption', { - neighborHoodId: this.formData.villageId + .post('/actual/base/communityBuilding/buildingoption', { + quartersId: this.formData.villageId }) .then(({ data: res }) => { if (res.code !== 0) { @@ -700,7 +700,7 @@ export default { }, getUniList () { this.$http - .post('/gov/org/icbuildingunit/unitoption', { + .post('/actual/base/communityBuildingUnit/unitoption', { buildingId: this.formData.buildId }) .then(({ data: res }) => { @@ -717,7 +717,7 @@ export default { }, getHouseList () { this.$http - .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId }) + .post('/actual/base/communityHouse/houseoption', { buildingId: this.formData.buildId,unitId: this.formData.unitId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) From 3b7a0a6886d5a68a4ae6154a6f05ede0cea5fe67 Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Mon, 25 Sep 2023 17:39:08 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E7=B1=8D?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/resi.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index c776c8c2e..a1b11329f 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -387,7 +387,7 @@ export default { { columnName: "name", label: "姓名", width: 80 }, { columnName: "birthday", label: "生日", width: 100 }, { columnName: "gender", label: "性别", width: 50 }, - { columnName: "nationalityName", label: "国籍", width: 50 }, + { columnName: "nationality", label: "国籍", width: 50 }, { columnName: "agencyName", label: "所属组织", width: 150 }, { columnName: "gridName", label: "所属网格", width: 150 }, { columnName: "homeName", label: "所属房屋", width: 150 }, From 21f1e66d611b96206c43c524f26d2a2f7a288bb0 Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Tue, 26 Sep 2023 09:41:38 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=97=E9=81=93?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E7=9A=84=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BD=91=E6=A0=BC=E6=9F=A5=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=88=BF=E5=B1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 71f20f306..4208c951a 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -833,10 +833,13 @@ export default { } else { agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1] } + const lastIndex = this.form.agencyId.length - 1; + const gridIdQuery = this.form.agencyId[lastIndex - 1]; + const agencyIdQuery = this.form.agencyId[lastIndex]; this.$http .post('/actual/base/communityQuarters/listQuartersOptions', { - gridId: this.form.agencyId[1], - agencyId: this.form.agencyId[0], + gridId: gridIdQuery, + agencyId: agencyIdQuery, // agencyId: user.agencyId }) .then(({ data: res }) => { From 8bf1269a4c11eebfd6ba76368b677914cb10ec9b Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Tue, 26 Sep 2023 09:46:02 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=97=E9=81=93?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E7=9A=84=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BD=91=E6=A0=BC=E6=9F=A5=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=88=BF=E5=B1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 4208c951a..c8b6b9a07 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -833,9 +833,14 @@ export default { } else { agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1] } - const lastIndex = this.form.agencyId.length - 1; - const gridIdQuery = this.form.agencyId[lastIndex - 1]; - const agencyIdQuery = this.form.agencyId[lastIndex]; + const gridIdQuery = ''; + const agencyIdQuery = this.form.agencyId[0]; + if (this.form.agencyId.length >= 2) { + lastIndex = this.form.agencyId.length - 1; + agencyIdQuery= this.form.agencyId[lastIndex - 1]; + gridIdQuery = this.form.agencyId[lastIndex]; + } + this.$http .post('/actual/base/communityQuarters/listQuartersOptions', { gridId: gridIdQuery, From 960c6524e19e194ef2010189b42334074ea0c912 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 26 Sep 2023 10:29:12 +0800 Subject: [PATCH 05/13] =?UTF-8?q?fix:=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82-?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BA=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E8=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/measure/index.vue | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 2e11ec813..45a4ed990 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -440,11 +440,13 @@ placeholder="请选择" clearable @change="handleDemandChange" + remote + :remote-method="getDemandUserList" > @@ -1310,17 +1312,13 @@ export default { return this.$message.error("网络错误"); }); }, - async getDemandUserList() { + + async getDemandUserList(demanderName) { const { user } = await this.$store.state; - console.log("user---ppp", user); - const params = { - agencyId: user.agencyId, - gridId: this.form.gridId, - name: "", - }; + console.log("demanderName:", demanderName); // addorupdate await this.$http - .post("/epmetuser/icresiuser/demandusers", params) + .get(`/actual/base/resiDemand/listDemander2Serve?gridId=${this.form.gridId}&demanderName=${demanderName ? demanderName : ''}`) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); From ee18945cadce3cef0668bd07ff1a4c86119f7af9 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 26 Sep 2023 13:27:31 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/measure/index.vue | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 45a4ed990..a5873952f 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -433,7 +433,7 @@ > @@ -992,11 +992,11 @@ export default { } }, handleDemandChange(val) { - console.log("val", val, this.selectDemandUser); - this.selectDemandUser = val.label; - this.form.demandUserName = val.demandUserName; - this.form.demandUserMobile = val.demandUserMobile; - this.form.demandUserId = val.demandUserId; + // console.log("val", val, this.selectDemandUser); + // this.selectDemandUser = val.label; + this.form.demandUserName = val.demanderName; + this.form.demandUserMobile = val.demanderMobile; + // this.form.demandUserId = val.demanderId; }, handleSearch(val) { console.log("searchhh--", val); @@ -1324,6 +1324,9 @@ export default { return this.$message.error(res.msg); } else { console.log("获取查询详情成功", res.data); + res.data.map(e=>{ + e.label = e.demanderName + "(" + e.demanderMobile + ")"; + }) this.demandUserList = res.data; } }) From fe3d376aac104a28e7c4d7f340c5701a9c84e926 Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Tue, 26 Sep 2023 13:39:06 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=97=E9=81=93?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E7=9A=84=E7=94=A8=E6=88=B7=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BD=91=E6=A0=BC=E6=9F=A5=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=88=BF=E5=B1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index c8b6b9a07..6fdf20724 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -833,12 +833,11 @@ export default { } else { agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1] } - const gridIdQuery = ''; - const agencyIdQuery = this.form.agencyId[0]; + var gridIdQuery = ''; + var agencyIdQuery = this.form.agencyId[0]; if (this.form.agencyId.length >= 2) { - lastIndex = this.form.agencyId.length - 1; - agencyIdQuery= this.form.agencyId[lastIndex - 1]; - gridIdQuery = this.form.agencyId[lastIndex]; + agencyIdQuery= this.form.agencyId[this.form.agencyId.length - 2]; + gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1]; } this.$http From 879e196387c2caa82827a66c0293dab2a5c4fe30 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 26 Sep 2023 13:44:22 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=9B=BD=E7=B1=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index c090e11df..d7578fac8 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -479,7 +479,7 @@ export default { { label: '国籍', itemType: "select", - requiredFlag: true, + rules: [{ required: true, message: '国籍不能为空' }], formName: 'nationality', opction: [], }, From 3a190bf56b65e23ac16e222cf14d367ab16ec8ed Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Tue, 26 Sep 2023 15:45:09 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=81=E6=BB=A1?= =?UTF-8?q?=E6=84=8F=E5=BA=A6=E5=88=86=E9=A1=B5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/satisfaction/detail/eventInfo.vue | 2 +- .../modules/satisfaction/satisfactionProvince/formList.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/satisfaction/detail/eventInfo.vue b/src/views/modules/satisfaction/detail/eventInfo.vue index e968a2094..b8f1d8f63 100644 --- a/src/views/modules/satisfaction/detail/eventInfo.vue +++ b/src/views/modules/satisfaction/detail/eventInfo.vue @@ -243,7 +243,7 @@ export default { const data = res.data.data; if (res.status === 200) { this.total = data.total || 0; - this.provinceList = data.childData; + this.provinceList = data.list; } })).catch((err => { this.$message.error(err); diff --git a/src/views/modules/satisfaction/satisfactionProvince/formList.vue b/src/views/modules/satisfaction/satisfactionProvince/formList.vue index fdc5adb80..a6d375413 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/formList.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/formList.vue @@ -136,7 +136,7 @@ export default { let url = '/governance/provinceEvaluationRecord/pageInfo' const { data, code, msg } = await requestPost(url, params) if (code == 0) { - this.tableData = data.childData; + this.tableData = data.list; this.total = data.total; } else { console.log(err); From c187e35fca41eb495141874fef79191d06c83709 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 26 Sep 2023 15:53:06 +0800 Subject: [PATCH 10/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=B8=8D=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main-navbar-update-password-work.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/main-navbar-update-password-work.vue b/src/views/main-navbar-update-password-work.vue index e90d92ab7..e5022045b 100644 --- a/src/views/main-navbar-update-password-work.vue +++ b/src/views/main-navbar-update-password-work.vue @@ -153,7 +153,7 @@ export default { const { pubKey } = this; this.$http - .post("/gov/mine/mine/resetpassword", { + .post("/epmetuser/customerstaff/changePassword", { oldPassword: encryptedData(pubKey, this.dataForm.password), newPassword: encryptedData(pubKey, this.dataForm.newPassword), confirmNewPassword: encryptedData( From 1113e0ae19afc8bf60dc7426d4cae332e171fa5a Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 26 Sep 2023 19:15:13 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/residentManagement/louzhang/louzhangList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue index 74b7925ac..3847ee49b 100644 --- a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue +++ b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue @@ -195,9 +195,9 @@ label="身份证号" :show-overflow-tooltip="true"> - @@ -84,7 +84,7 @@ - + + 至 + + @@ -458,10 +459,9 @@ this.$http.post("sys/dict/data/education", { formCode: "resi_base_info", }), - this.$http.post("sys/dict/data/education", { - formCode: "public_welfare_post_type", + this.$http.post("sys/dict/data/dictlist", { + dictType: "public_welfare_post_type", }), - ]; const dictKeys = ["nationList", "educationList",'public_welfare_post_type']; // 对应的键名 From 7104ed9968b20d05d0b73baae13665feb7d80b16 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 27 Sep 2023 17:22:16 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A6=82=E8=A7=88=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index e17779b66..d198103fe 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -172,7 +172,7 @@ export const dataBoardRoutes = { component: () => import("@/views/dataBoardMain/main"), name: "dataBoard", redirect: { - path: "/dataBoard/renfang/index", + path: "/dataBoard/overview/index", }, meta: { title: "主入口布局",