From c1bbd562f823f6a95a705b1ce013278c3ef11c6e Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 1 Jul 2022 10:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=EF=BC=8C=E6=A5=BC=E6=A0=8B?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/buildForm.vue | 61 ++++++++++++++++++- .../modules/base/community/buildTable.vue | 22 +++++-- .../modules/base/community/communityForm.vue | 45 +++++++++++++- .../modules/base/community/communityTable.vue | 21 +++++-- src/views/modules/base/community/roomForm.vue | 49 +++++++++++++-- 5 files changed, 182 insertions(+), 16 deletions(-) diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue index 5a9c703f2..ffaf80203 100644 --- a/src/views/modules/base/community/buildForm.vue +++ b/src/views/modules/base/community/buildForm.vue @@ -24,6 +24,21 @@ v-model="dataForm.buildingName"> + + + + + 生成 + + + + + + + + @@ -169,9 +204,13 @@ export default { totalUnitNum: 1,//单元数 totalFloorNum: 0,//层数 totalHouseNum: 0,//总户数 + realPerson: 0, buildingLeaderName: '',//楼长姓名 buildingLeaderMobile: '',//楼长电话 type: '',//房屋类型 + coordinatePosition: '', + sysCoding: '', + coding: '', location: '', //坐标位置 longitude: '', //经度 latitude: '' //纬度 @@ -199,7 +238,8 @@ export default { if (row) { this.dataForm = JSON.parse(JSON.stringify(row)) this.buildingId = this.dataForm.buildingId - this.buildType = this.dataForm.buildingTypeKey + // this.buildType = this.dataForm.buildingTypeKey + this.buildType = this.dataForm.type map.setCenter(new TMap.LatLng(this.dataForm.latitude, this.dataForm.longitude)) this.setMarker(this.dataForm.latitude, this.dataForm.longitude) @@ -226,6 +266,18 @@ export default { }) }, + async handleCode() { + const { data, code, msg } = await requestPost( + "/gov/org/houseInformation/getBuildingCoding/" + this.dataForm.neighborHoodId); + console.log('data----', data) + console.log('code----', code) + console.log('msg----', msg) + if (msg == "success" && code == 0) { + this.dataForm.coding = data.coding + this.dataForm.sysCoding = data.sysCoding + + } + }, async addBuild () { if (this.dataForm.buildingLeaderMobile) { const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 @@ -328,12 +380,14 @@ export default { let { data } = result if (Array.isArray(data) && data.length > 0) { const { - location: { lat, lng } + location: { lat, lng }, + address } = data[0] map.setCenter(new TMap.LatLng(lat, lng)) this.setMarker(lat, lng) this.dataForm.latitude = lat this.dataForm.longitude = lng + this.dataForm.coordinatePosition = address } else { this.$message.error('未检索到相关位置坐标') } @@ -405,6 +459,9 @@ export default { totalUnitNum: [ { required: true, message: '单元数不能为空', trigger: 'blur' } ], + coding: [ + { required: true, message: '楼栋编码不能为空', trigger: 'blur' } + ] // totalFloorNum: [ // { required: true, message: '层数不能为空', trigger: 'blur' } // ], diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 68466e237..486dc9ec7 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -360,11 +360,12 @@ export default { this.formShow = false }, - handleDetail (row) { + async handleDetail (row) { this.formTitle = '楼栋详情' this.formShow = true + const _data = await this.detail(row) this.$nextTick(() => { - this.$refs.ref_form.initForm('detail', row, this.agencyObj) + this.$refs.ref_form.initForm('detail', _data, this.agencyObj) }) }, @@ -376,11 +377,12 @@ export default { }) }, - handleEdit (row) { + async handleEdit (row) { this.formTitle = '修改楼栋' this.formShow = true + const _data = await this.detail(row) this.$nextTick(() => { - this.$refs.ref_form.initForm('edit', row, this.agencyObj) + this.$refs.ref_form.initForm('edit', _data, this.agencyObj) }) }, @@ -508,6 +510,18 @@ export default { this.$message.error(msg) } }, + async detail (row) { + const url = "/gov/org/houseInformation/getBuildingDetail/" + row.buildingId + + + const { data, code, msg } = await requestPost(url) + + if (code === 0) { + return data + } else { + this.$message.error(msg) + } + }, //导出表格 async handleExport () { diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue index 9dd8aef98..bf588d58c 100644 --- a/src/views/modules/base/community/communityForm.vue +++ b/src/views/modules/base/community/communityForm.vue @@ -41,6 +41,21 @@ v-model="dataForm.neighborHoodName"> + + + + + 生成 + 添加物业 + + + { - this.$refs.ref_form.initForm('detail', row, this.agencyObj) + this.$refs.ref_form.initForm('detail', _data, this.agencyObj) }) }, @@ -371,7 +372,18 @@ export default { this.$refs.ref_form.initForm('add', null, this.agencyObj) }) }, + async detail (row) { + const url = "/gov/org/houseInformation/neighborhoodDetail/" + row.neighborHoodId + + const { data, code, msg } = await requestPost(url) + + if (code === 0) { + return data + } else { + this.$message.error(msg) + } + }, // 补全一房一码点击事件 async handleYhymInfo () { this.yhymLoading = true @@ -400,11 +412,12 @@ export default { } }, - handleEdit (row) { + async handleEdit (row) { this.formTitle = '修改小区' this.formShow = true + const _data = await this.detail(row) this.$nextTick(() => { - this.$refs.ref_form.initForm('edit', row, this.agencyObj) + this.$refs.ref_form.initForm('edit', _data, this.agencyObj) }) }, diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 8f564f371..3733735cf 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -11,7 +11,7 @@ - {{ dataForm.neighborHoodName }}{{dataForm.buildingName}} + {{ agencyObj.neighborHoodName }}-{{agencyObj.label}} - + + + + + 生成 +
下载
+