小区管理

4 years ago · 53c7ba31e2
6 changed files with 45 additions and 21 deletions
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@ -28,7 +28,7 @@
                      prop="type"
                      label-width="150px"
                      style="display: block">
-          <el-radio-group v-model="dataForm.type">
+          <el-radio-group v-model="buildType">

            <el-radio :label="'1'">商品房</el-radio>
            <el-radio :label="'2'">自建房</el-radio>
@ -120,6 +120,7 @@ export default {
      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情

      buildingId: '', //楼栋ID
+      buildType: "1",
      dataForm: {
        agencyId: '', // 所属组织ID
        agencyName: '',
@ -130,7 +131,7 @@ export default {
        totalUnitNum: 0,//单元数	
        totalFloorNum: 0,//层数	
        totalHouseNum: 0,//户数	
-        type: '1',//房屋类型
+        type: '',//房屋类型
        location: '', //坐标位置
        longitude: '', //经度
        latitude: '' //纬度
@ -160,7 +161,9 @@ export default {
      if (row) {
        this.buildingId = row.buildingId
        this.dataForm = row
+        this.buildType = row.buildingTypeKey
      }
+      console.log(row)

    },

@ -173,6 +176,7 @@ export default {

        this.dataForm.buildingId = this.buildingId
      }
+      this.dataForm.type = this.buildType

      const { data, code, msg } = await requestPost(url, this.dataForm)

--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@ -83,9 +83,7 @@
        <el-table-column prop="totalHouseNum"
                         label="户数">
        </el-table-column>
-        <el-table-column prop="remark"
-                         label="备注">
-        </el-table-column>
+
        <el-table-column label="操作"
                         fixed="right"
                         width="140"
@ -231,7 +229,9 @@ export default {
    handleEdit (row) {
      this.formTitle = '修改楼栋'
      this.formShow = true
+      this.$nextTick(() => {
        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+      })
    },

    addFormCancle () {
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@ -280,6 +280,7 @@ export default {
        this.neighborHoodId = row.neighborHoodId
        this.dataForm = row
      }
+      console.log(row)

      await this.loadAgency()
      await this.loadGrid()
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@ -232,7 +232,9 @@ export default {
    handleEdit (row) {
      this.formTitle = '修改小区'
      this.formShow = true
+      this.$nextTick(() => {
        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+      })
    },

    addFormCancle () {
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@ -43,7 +43,7 @@
                      prop="houseType"
                      label-width="150px"
                      style="display: block">
-          <el-radio-group v-model="dataForm.houseType">
+          <el-radio-group v-model="houseType">

            <el-radio :label="'1'">楼房</el-radio>
            <el-radio :label="'2'">平房</el-radio>
@ -55,11 +55,15 @@
                      prop="purpose"
                      label-width="150px"
                      style="display: block">
-          <el-radio-group v-model="dataForm.purpose">
-
-            <el-radio :label="'1'">商品房</el-radio>
-            <el-radio :label="'2'">自建房</el-radio>
-            <el-radio :label="'3'">别墅</el-radio>
+          <el-radio-group v-model="purpose">
+
+            <el-radio :label="'1'">住宅</el-radio>
+            <el-radio :label="'2'">商业</el-radio>
+            <el-radio :label="'3'">办公</el-radio>
+            <el-radio :label="'4'">工业</el-radio>
+            <el-radio :label="'5'">仓储</el-radio>
+            <el-radio :label="'6'">商住混用</el-radio>
+            <el-radio :label="'7'">其他</el-radio>
          </el-radio-group>
        </el-form-item>

@ -67,10 +71,10 @@
                      prop="rentFlag"
                      label-width="150px"
                      style="display: block">
-          <el-radio-group v-model="dataForm.rentFlag">
+          <el-radio-group v-model="rentFlag">

-            <el-radio :label="0">是</el-radio>
-            <el-radio :label="1">否</el-radio>
+            <el-radio :label="false">否</el-radio>
+            <el-radio :label="true">是</el-radio>

          </el-radio-group>
        </el-form-item>
@ -80,8 +84,6 @@
                      label-width="150px"
                      style="display: block">
          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
                    placeholder="请输入房主姓名"
                    v-model="dataForm.ownerName">
          </el-input>
@ -132,13 +134,16 @@ export default {
      unitList: [],

      houseId: '', //房屋ID
+      houseType: '1',
+      purpose: '1',
+      rentFlag: false,
      dataForm: {
        neighborHoodId: '', // 所属小区ID
        buildingId: '',//所属楼栋ID
        buildingUnitId: '',//所属单元ID	
        doorName: '',//门牌号	
-        houseType: '1',//房屋类型【楼房，平房，别墅】		
-        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
+        houseType: '',//房屋类型【楼房，平房，别墅】		
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】		
        rentFlag: 0,//是否出租【是：1，否：0】		
        ownerPhone: '', //房主电话	
        ownerName: '', //房主名字		
@ -166,7 +171,13 @@ export default {
      if (row) {
        this.houseId = row.houseId
        this.dataForm = row
+
+        this.dataForm.buildingUnitId = row.unitNumKey
+        this.houseType = row.houseTypeKey
+        this.purpose = row.purposeKey
+        this.rentFlag = row.rentFlagKey
      }
+      console.log(row)

      await this.loadUnitList()

@ -201,6 +212,10 @@ export default {
        this.dataForm.houseId = this.houseId
      }

+      this.dataForm.houseType = this.houseType
+      this.dataForm.purpose = this.purpose
+      this.dataForm.rentFlag = this.rentFlag
+
      const { data, code, msg } = await requestPost(url, this.dataForm)

      if (code === 0) {
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@ -244,7 +244,9 @@ export default {
    handleEdit (row) {
      this.formTitle = '修改房屋'
      this.formShow = true
+      this.$nextTick(() => {
        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+      })
    },

    addFormCancle () {