From 88487c54998523a9d4574e2d57cf4f1b9a193255 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 17 May 2022 17:07:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/huji/immigration/edit.vue | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue index 8cf1a260..2999880c 100644 --- a/src/views/modules/base/huji/immigration/edit.vue +++ b/src/views/modules/base/huji/immigration/edit.vue @@ -142,14 +142,23 @@ > - 享受福利 + 享受福利 + + 补充居民信息 @@ -421,7 +430,8 @@ export default { lazy: true, lazyLoad: this.lzayLoadArea }, - userInfo: {} + userInfo: {}, + initCheck: null } }, components: {}, @@ -777,6 +787,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { this.fmData = { ...data } + this.initCheck = data.isCheck this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',') } else this.$message.error(msg) }, From 5c80a92076335268f75ad3771d0972ec49b16423 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 18 May 2022 09:53:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E6=88=B7=E4=B8=80=E6=A1=A3?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 2 +- .../modules/base/community/roomTable.vue | 47 +++++++++++++------ 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 01f94046..7ba9c649 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -210,7 +210,7 @@ export default { this.showRoomTable = true this.$nextTick(() => { - this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag) + this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj) }) } else { this.$message.warning('请输入查询条件') diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index a3b8a17a..a866b6f3 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -209,9 +209,7 @@ export default { // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的小区对象 - ownerName: '', - ownerPhone: '', - rentFlag: '', + validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 selection: [], @@ -262,13 +260,13 @@ export default { return index + 1; }, handleSortOrderChange (value) { - console.log(value.column, value.prop, value.order) + this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.loadTable() }, handleSortChange (value) { - console.log(value.column, value.prop, value.order) + this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.loadTable() @@ -283,7 +281,7 @@ export default { async handleChangeSort (row, index) { // row.isChange = false - console.log(row.sort) + let params = { id: row.houseId, sort: row.sort, @@ -323,7 +321,7 @@ export default { }, - async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) { + async loadTable (source, treeObj) { this.source = source this.tableLoading = true @@ -331,14 +329,10 @@ export default { if (source === 'tree') {//来源于tree，查询数据清空 this.sortType = 'asc' this.agencyObj = treeObj - this.ownerName = null - this.ownerPhone = null - this.rentFlag = null + } else if (source === 'search') {//来源于查询 this.agencyObj = treeObj - this.ownerName = ownerName - this.ownerPhone = ownerPhone - this.rentFlag = rentFlag + } // if (fromTree) { @@ -403,7 +397,7 @@ export default { this.formTitle = '新增房屋' this.formShow = true this.$nextTick(() => { - console.log(this.agencyObj) + this.$refs.ref_form.initForm('add', null, this.agencyObj) }) }, @@ -618,16 +612,39 @@ export default { let url = "/gov/org/house/exportHouseUser" + let params = { agencyId: '', gridId: '', ownerName: this.ownerName, ownerPhone: this.ownerPhone, rentFlag: this.rentFlag, - buildingId: this.agencyObj.id + buildingId: '', + neighborHoodId: '' } + if (this.agencyObj.level === 'grid') { + params.gridId = this.agencyObj.id + params.agencyId = '' + params.buildingId = '' + params.neighborHoodId = '' + } else if (this.agencyObj.level === 'neighborHood') { + params.neighborHoodId = this.agencyObj.id + params.agencyId = '' + params.buildingId = '' + params.gridId = '' + } else if (this.agencyObj.level === 'building') { + params.buildingId = this.agencyObj.id + params.agencyId = '' + params.neighborHoodId = '' + params.gridId = '' + } else { + params.agencyId = this.agencyObj.id + params.buildingId = '' + params.neighborHoodId = '' + params.gridId = '' + } app.ajax.exportFilePost( url,