diff --git a/src/router/index.js b/src/router/index.js index a7370e796..591a1d3a1 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/overView/index", + path: "/dataBoard/overview/index", }, meta: { title: "主入口布局", diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index c090e11df..404e82f90 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -308,8 +308,8 @@ @@ -479,7 +479,7 @@ export default { { label: '国籍', itemType: "select", - requiredFlag: true, + rules: [{ required: true, message: '国籍不能为空' }], formName: 'nationality', opction: [], }, @@ -1222,6 +1222,8 @@ export default { label: '人群类别', itemType: "select1", formName: "specialCategoryCode", + multiple:true, + collapseTags:true, opction: [] },] }, @@ -1263,6 +1265,8 @@ export default { label: '岗位类型', itemType: "select1", formName: "jobPost", + multiple:true, + collapseTags:true, opction: [] }, ] @@ -1529,7 +1533,7 @@ export default { }, postDto: { hiredate: '',//入职时间 - jobPost: '',//岗位类型 + jobPost: [],//岗位类型 userId: '' }, birthRecordDTO: { @@ -1770,7 +1774,7 @@ export default { await this.getDictData('chronic_disease_code', 'chronicDiseaseCode') }, async getWelfareDict () { - await this.getDictData('welfare_post', 'jobPost') + await this.getDictData('public_welfare_post_type', 'jobPost') }, async getUnemployment () { await this.getDictData('unemployment_cause', 'unemploymentReason') @@ -2669,7 +2673,7 @@ export default { } else { this.form.postDto = res.data ? res.data : { hiredate: '',//入职时间 - jobPost: '', //岗位类型 + jobPost: [], //岗位类型 userId: id } diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 774f1d65b..6fdf20724 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -833,10 +833,17 @@ export default { } else { agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1] } + var gridIdQuery = ''; + var agencyIdQuery = this.form.agencyId[0]; + if (this.form.agencyId.length >= 2) { + agencyIdQuery= this.form.agencyId[this.form.agencyId.length - 2]; + gridIdQuery = this.form.agencyId[this.form.agencyId.length - 1]; + } + 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 }) => { @@ -853,8 +860,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 +877,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 +894,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/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( 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 }, diff --git a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue index 1e16c7c89..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']; // 对应的键名 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) diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 2e11ec813..a5873952f 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -433,19 +433,21 @@ > @@ -990,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); @@ -1310,22 +1312,21 @@ 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); } else { console.log("获取查询详情成功", res.data); + res.data.map(e=>{ + e.label = e.demanderName + "(" + e.demanderMobile + ")"; + }) this.demandUserList = res.data; } }) 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);