From 32825910272f023a65431580c54b429e606b880f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 10 May 2022 15:42:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../houseChange/houseChangeList.vue | 211 ++++++------------ 1 file changed, 63 insertions(+), 148 deletions(-) rename src/views/modules/base/{ => huji}/houseChange/houseChangeList.vue (66%) diff --git a/src/views/modules/base/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue similarity index 66% rename from src/views/modules/base/houseChange/houseChangeList.vue rename to src/views/modules/base/huji/houseChange/houseChangeList.vue index b37d403a..32ac7815 100644 --- a/src/views/modules/base/houseChange/houseChangeList.vue +++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue @@ -27,8 +27,8 @@
- - + - - + - - + @@ -72,10 +72,10 @@ - - + @@ -95,11 +95,11 @@
+ prop="startDate"> - - - - - + show-overflow-tooltip + label="所属网格" + min-width="150"> - - - + min-width="150"> - + label="变更前" + min-width="250"> - + label="变更后" + min-width="250"> - - - + label="变更时间" + width="130"> +
- +import util from '@js/util.js'; import { requestPost } from "@/js/dai/request"; import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 @@ -259,15 +205,6 @@ export default { pageNo: 1, tableLoading: false, - // formData: { - // attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1 - // name: '', - // mobile: '', - // idCard: '', - // remark: '', - // reason: '', - - // }, optionsV: [], optionsB: [], optionsH: [], @@ -281,12 +218,12 @@ export default { timeRange: [], formData: { gridId: '',//所属网格【网格Id】 - villageId: '', - buildId: '', - unitId: '', - homeId: '', - startTime: '', - endTime: '', + neighborHoodId: '',//小区ID + buildingId: '',//楼栋ID + buildingUnitId: '',//楼栋单元ID + houseId: '',//房屋ID + startDate: '',//开始日期，eg：20220510 + endDate: '',//结束日期，eg：20220510 } @@ -339,7 +276,7 @@ export default { async loadTable () { this.tableLoading = true - const url = "/epmetuser/icEpidemicSpecialAttention/list" + const url = "/gov/org/icHouseChangeRecord/list" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list" let params = { pageSize: this.pageSize, @@ -353,31 +290,7 @@ export default { this.total = data.total this.tableData = data.list - this.analysisTableSelection() - this.tableData.forEach(item => { - if (!item.allName) { - item.allName = '--' - } - item.roomShow = '' - if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) { - item.roomShow = '--' - } else { - if (item.villageName) { - item.roomShow = item.roomShow + item.villageName - } - if (item.buildName) { - item.roomShow = item.roomShow + item.buildName - } - if (item.unitName) { - item.roomShow = item.roomShow + item.unitName - } - if (item.villageName) { - item.roomShow = item.roomShow + item.homeName - } - } - - }); } else { this.$message.error(msg) } @@ -387,10 +300,10 @@ export default { handleChangeG (val) { console.log('val', val) - this.formData.villageId = '' - this.formData.buildId = '' - this.formData.unitId = '' - this.formData.homeId = '' + this.formData.neighborHoodId = '' + this.formData.buildingId = '' + this.formData.buildingUnitId = '' + this.formData.houseId = '' this.getValiheList() this.getBuildList() this.getUniList() @@ -398,29 +311,29 @@ export default { }, handleChangeV (val) { console.log('val', val) - this.formData.buildId = '' - this.formData.unitId = '' - this.formData.homeId = '' + this.formData.buildingId = '' + this.formData.buildingUnitId = '' + this.formData.houseId = '' this.getBuildList() this.getUniList() this.getHouseList() }, handleChangeB (val) { console.log('val', val) - this.formData.unitId = '' - this.formData.homeId = '' + this.formData.buildingUnitId = '' + this.formData.houseId = '' this.getUniList() this.getHouseList() }, handleChangeD () { - this.formData.homeId = '' + this.formData.houseId = '' this.getHouseList() }, getValiheList () { const { user } = this.$store.state this.$http - .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId, agencyId: user.agencyId }) + .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -436,7 +349,7 @@ export default { getBuildList () { this.$http - .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId }) + .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.neighborHoodId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -451,7 +364,7 @@ export default { }, getUniList () { this.$http - .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId }) + .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildingId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -466,7 +379,7 @@ export default { }, getHouseList () { this.$http - .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId }) + .post('/gov/org/ichouse/houseoption', { buildingUnitId: this.formData.buildingUnitId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -485,14 +398,14 @@ export default { const startTimeArray = util.dateFormatter(time[0], 'date').split('-') const endTimeArray = util.dateFormatter(time[1], 'date').split('-') - this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00' - this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59' + this.formData.startDate = startTimeArray[0] + startTimeArray[1] + startTimeArray[2] + this.formData.endDate = endTimeArray[0] + endTimeArray[1] + endTimeArray[2] // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日' // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日' } else { - this.formData.startTime = '' - this.formData.endTime = '' + this.formData.startDate = '' + this.formData.endDate = '' // this.startTimeShow = '' // this.endTimeShow = '' } @@ -506,11 +419,13 @@ export default { resetSearch () { this.timeRange = [] this.formData = { - attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1 - name: '', - mobile: '', - idCard: '', - vaccinationCount: '', + gridId: '',//所属网格【网格Id】 + neighborHoodId: '',//小区ID + buildingId: '',//楼栋ID + buildingUnitId: '',//楼栋单元ID + houseId: '',//房屋ID + startDate: '',//开始日期，eg：20220510 + endDate: '',//结束日期，eg：20220510 } this.pageNo = 1