diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index 679eae0aa..10b616db9 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -25,6 +25,42 @@
       height:350px;
       // line-height: 40px;
     }
+
+    .div_map{
+      margin-top:10px;
+    }
+  }
+  .item-image{
+    /deep/ .el-form-item{
+      height:185px;
+      // line-height: 40px;
+    }
+
+    .item-imagebtn {
+      
+      display: flex;
+      justify-content: space-between;
+      padding: 11px 23px;
+      align-items: center;
+    }
+
+    .d-img{
+      height:140px;
+      // width:117px;
+    }
+
+    .pic-btn {
+      width: 75px;
+      height: 25px;
+      background: linear-gradient(0deg, #32adab 0%, #2ad0cc 100%);
+      border-radius: 3px;
+      font-size: 14px;
+      font-family: Source Han Serif CN;
+      font-weight: 500;
+      color: #ffffff;
+      line-height: 23px;
+      text-align: center;
+    }
   }
 
   .item-textarea{
@@ -65,9 +101,6 @@
     line-height: 26px;
     padding:0px;
   }
-  /deep/ .el-input__icon{
-    // line-height: 5px
-  }
 
   /deep/ .el-input .el-input__count .el-input__count-inner {
     background:none;
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 271d1b91a..b5c3ade3f 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -1,24 +1,23 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h">
+    <div class="dialog-h-content scroll-h m-edit">
 
       <el-form ref="ref_form"
                :inline="true"
                :model="dataForm"
                :rules="dataRule"
+               label-width="90px"
                :disabled="formType === 'detail'"
-               class="form">
+               class="m-form">
         <el-form-item label="所属小区"
-                      label-width="150px"
                       style="display: block">
           <span>{{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}</span>
         </el-form-item>
 
         <el-form-item label="楼栋名称"
                       prop="buildingName"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     maxlength="10"
                     placeholder="请输入楼栋名称"
                     v-model="dataForm.buildingName">
@@ -26,22 +25,20 @@
         </el-form-item>
         <el-form-item label="楼栋编码"
                       prop="coding"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="edit_item_btn_width_1"
                     maxlength="50"
                     placeholder="请输入楼栋编码"
                     v-model="dataForm.coding">
 
           </el-input>
-          <el-button style="margin-left: 10px"
-                     type="primary"
+          <el-button type="text"
                      size="small"
+                     class="div-table-button--blue  edit-btn-1"
                      @click="handleCode">生成</el-button>
         </el-form-item>
         <el-form-item label="楼栋类型"
                       prop="type"
-                      label-width="150px"
                       style="display: block">
           <el-radio-group v-model="buildType">
 
@@ -53,15 +50,14 @@
         <!-- <el-form-item label="排序"
                       prop="sort"
                       style="display: block"
-                      label-width="150px">
-          <el-input-number class="item_width_1"
+                      >
+          <el-input-number class="edit_item_width_1"
                            v-model="dataForm.sort"
                            label="排序"></el-input-number>
         </el-form-item> -->
         <el-form-item label="单元数"
                       style="display: block"
-                      prop="totalUnitNum"
-                      label-width="150px">
+                      prop="totalUnitNum">
           <el-input-number class="item_width_4"
                            v-model="dataForm.totalUnitNum"
                            :min="1"
@@ -70,8 +66,7 @@
         </el-form-item>
         <el-form-item label="层数"
                       style="display: block"
-                      prop="totalFloorNum"
-                      label-width="150px">
+                      prop="totalFloorNum">
           <el-input-number class="item_width_4"
                            v-model="dataForm.totalFloorNum"
                            :min="0"
@@ -80,8 +75,7 @@
         </el-form-item>
         <el-form-item label="总户数"
                       style="display: block"
-                      prop="totalHouseNum"
-                      label-width="150px">
+                      prop="totalHouseNum">
           <el-input-number class="item_width_4"
                            v-model="dataForm.totalHouseNum"
                            :min="0"
@@ -90,8 +84,7 @@
         </el-form-item>
         <el-form-item label="人口数"
                       style="display: block"
-                      prop="realPerson"
-                      label-width="150px">
+                      prop="realPerson">
           <el-input-number class="item_width_4"
                            v-model="dataForm.realPerson"
                            :min="0"
@@ -100,9 +93,8 @@
         </el-form-item>
         <el-form-item label="楼长姓名"
                       prop="buildingLeaderName"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     placeholder="请输入楼长姓名"
                     v-model="dataForm.buildingLeaderName">
           </el-input>
@@ -110,18 +102,43 @@
 
         <el-form-item label="楼长电话"
                       prop="buildingLeaderMobile"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     type='number'
                     placeholder="请输入楼长电话"
                     v-model="dataForm.buildingLeaderMobile">
           </el-input>
         </el-form-item>
 
-        <el-form-item label="地图位置"
+        <div class="item-map">
+          <el-form-item label="地图位置"
+                        prop="longitude"
+                        style="display: block">
+            <div style="width: 500px">
+              <el-select v-model="searchValue"
+                         filterable
+                         style="width: 500px"
+                         remote
+                         :reserve-keyword="true"
+                         placeholder="请输入关键词"
+                         :remote-method="remoteMethod"
+                         :loading="loading">
+                <el-option v-for="(item,index) in searchOptions"
+                           @click.native="handleClickKey(index)"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+              <div id="app_build"
+                   class="div_map"></div>
+            </div>
+          </el-form-item>
+
+        </div>
+
+        <!-- <el-form-item label="地图位置"
                       prop="longitude"
-                      label-width="150px"
                       style="display: block">
           <div style="width: 500px">
             <el-select v-model="searchValue"
@@ -142,13 +159,12 @@
             <div id="app_build"
                  class="div_map"></div>
           </div>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="楼栋地址"
                       prop="coordinatePosition"
-                      label-width="150px"
                       style="display: block">
           <!-- <span>{{ dataForm.coordinatePosition }}</span> -->
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     placeholder="请选择楼栋地址"
                     v-model="dataForm.coordinatePosition" />
         </el-form-item>
@@ -157,10 +173,11 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
+                 class="diy-button--other"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  v-if="formType != 'detail'"
-                 type="primary"
+                 class="diy-button--blue"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
@@ -489,4 +506,5 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/management/edit-main.scss";
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 0b9501dd6..845c25459 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -253,7 +253,7 @@
                :close-on-press-escape="false"
                :title="formTitle"
                top="5vh"
-               width="900px"
+               width="850px"
                class="dialog-h"
                @closed="diaClose">
       <build-form ref="ref_form"
@@ -266,7 +266,7 @@
                :close-on-press-escape="false"
                :title="'楼栋详情'"
                top="5vh"
-               width="900px"
+               width="850px"
                class="dialog-h"
                @closed="detailFormCancle">
       <build-detail ref="ref_form_detail"
diff --git a/src/views/modules/base/community/communityDetail.vue b/src/views/modules/base/community/communityDetail.vue
index 2e96e9aef..0cb4cd1a4 100644
--- a/src/views/modules/base/community/communityDetail.vue
+++ b/src/views/modules/base/community/communityDetail.vue
@@ -33,7 +33,7 @@
             </div>
           </div>
           <div class="d-info-prop d-info-prop-pic">
-            <div class="d-title">小区二维码：</div>
+            <div class="d-title">二维码：</div>
             <div class="d-content">
               <div v-if="dataForm.qrcodeUrl"
                    class="content-pic">
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 042a85705..ee98538fe 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h m-edit">
-      <div v-show="!propertyFormShow">
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="dataForm"
-                 :rules="dataRule"
-                 label-width="90px"
-                 class="m-form">
 
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="dataForm"
+               :rules="dataRule"
+               label-width="90px"
+               class="m-form">
+        <div v-show="!propertyFormShow">
           <el-form-item label="所属组织"
                         style="display: block">
             <span>{{ dataForm.agencyName }}</span>
@@ -38,6 +38,7 @@
                       v-model="dataForm.neighborHoodName">
             </el-input>
           </el-form-item>
+
           <el-form-item label="小区编码"
                         prop="coding"
                         style="display: block">
@@ -52,15 +53,22 @@
                        class="div-table-button--blue edit-btn-1"
                        @click="handleCode">生成</el-button>
           </el-form-item>
-
           <div v-if="dataForm.qrcodeUrl"
-               style="display: flex;flex-direction: column;">
-            <img style="margin-left: 70px;width: 200px;"
-                 :src="dataForm.qrcodeUrl">
-            <a style="margin-left: 80px"
-               :href="dataForm.qrcodeUrl"
-               target="_blank">下载</a>
+               class="item-image">
+
+            <el-form-item label="二维码"
+                          prop="coding"
+                          style="display: block">
+              <div class="item-imagebtn">
+                <img class="d-img"
+                     :src="dataForm.qrcodeUrl">
+                <a class="pic-btn"
+                   :href="dataForm.qrcodeUrl"
+                   target="_blank">下载</a>
+              </div>
+            </el-form-item>
           </div>
+
           <el-form-item label="关联物业"
                         prop="propertyId"
                         style="display: block">
@@ -142,25 +150,30 @@
                         v-model="dataForm.remark"></el-input>
             </el-form-item>
           </div>
-        </el-form>
-      </div>
-
-      <div v-show="propertyFormShow">
-        <el-form :inline="false"
-                 :model="propertyForm"
-                 :rules="propertyRule"
-                 class="m-form">
-          <el-form-item label="物业名称"
-                        prop="name"
-                        style="display: block">
-            <el-input class="edit_item_width_1"
-                      maxlength="10"
-                      placeholder="请输入小区名称"
-                      v-model="propertyForm.name">
-            </el-input>
-          </el-form-item>
-        </el-form>
-      </div>
+        </div>
+        <el-form-item v-show="propertyFormShow"
+                      label="物业名称"
+                      prop="name"
+                      style="display: block">
+          <el-input class="edit_item_width_1"
+                    maxlength="10"
+                    placeholder="请输入物业名称"
+                    v-model="propertyName">
+          </el-input>
+        </el-form-item>
+      </el-form>
+
+      <!-- <el-form v-show="propertyFormShow"
+               :inline="false"
+               :model="propertyForm"
+               :rules="propertyRule"
+               class="m-form">
+
+      </el-form> -->
+
+      <!-- <div >
+       
+      </div> -->
     </div>
     <div class="div_btn">
       <el-button size="small"
@@ -216,9 +229,8 @@ export default {
       },
 
       propertyFormShow: false,
-      propertyForm: {
-        name: ''
-      },
+      propertyName: '',
+
 
       keyWords: '',
       agencyObj: {}
@@ -392,7 +404,7 @@ export default {
     },
 
     handleAddProperty () {
-      this.propertyForm.name = ''
+      this.propertyName = ''
       this.propertyFormShow = true
     },
 
@@ -448,7 +460,7 @@ export default {
 
     },
     async addProperty () {
-      if (!this.propertyForm.name || this.propertyForm.name === '') {
+      if (!this.propertyName || this.propertyName === '') {
         this.$message({
           type: 'error',
           message: '物业名称不能为空'
@@ -458,7 +470,7 @@ export default {
       const url = '/gov/org/propertymanagement/add'
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
       let params = {
-        name: this.propertyForm.name
+        name: this.propertyName
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -469,7 +481,7 @@ export default {
           message: '操作成功'
         })
         this.dataForm.propertyId = data.propertyId
-        this.propertyForm.name = ''
+        this.propertyName = ''
         this.propertyFormShow = false
         this.loadProperty()
       } else {
@@ -478,7 +490,7 @@ export default {
     },
     handleCancle () {
       if (this.propertyFormShow) {
-        this.propertyForm.name = ''
+        this.propertyName = ''
         this.propertyFormShow = false
       } else {
         this.resetData()
diff --git a/src/views/modules/base/community/roomForm copy.vue b/src/views/modules/base/community/roomForm copy.vue
new file mode 100644
index 000000000..496095faa
--- /dev/null
+++ b/src/views/modules/base/community/roomForm copy.vue	
@@ -0,0 +1,473 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="false"
+               :model="dataForm"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+
+        <el-form-item label="所属楼栋"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
+        </el-form-item>
+
+        <el-form-item label="单元号"
+                      prop="buildingUnitId"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="dataForm.buildingUnitId"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in unitList"
+                       :key="item.id"
+                       :label="item.unitName"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="门牌号"
+                      prop="doorName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入门牌号"
+                    v-model="dataForm.doorName">
+          </el-input>
+        </el-form-item>
+        <el-form-item v-if="formType != 'detail'"
+                      label="房屋编码"
+                      prop="coding"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    maxlength="50"
+                    placeholder="请输入楼栋编码"
+                    v-model="dataForm.coding">
+
+          </el-input>
+          <el-button style="margin-left: 10px"
+                     type="primary"
+                     size="small"
+                     @click="handleCode">生成</el-button>
+        </el-form-item>
+        <div v-if="formType === 'detail'">
+          <el-form-item label="房屋编码"
+                        prop="houseCode"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      maxlength="30"
+                      v-model="dataForm.houseCode">
+            </el-input>
+          </el-form-item>
+          <div v-if="dataForm.houseQrcodeUrl"
+               style="display: flex;flex-direction: column;">
+            <img style="margin-left: 70px;width: 200px;"
+                 :src="dataForm.houseQrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.houseQrcodeUrl"
+               target="_blank">下载</a>
+          </div>
+        </div>
+        <!-- <el-form-item label="居住人数"
+                      style="display: block"
+                      prop="realPerson"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="dataForm.realPerson"
+                           :min="0"
+                           :max="9999"
+                           label="居住人数"></el-input-number>
+        </el-form-item> -->
+        <el-form-item label="房屋类型"
+                      prop="houseType"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="houseType">
+
+            <el-radio :label="'1'">楼房</el-radio>
+            <el-radio :label="'2'">平房</el-radio>
+            <el-radio :label="'3'">别墅</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="房屋用途"
+                      prop="purpose"
+                      label-width="150px"
+                      style="display: block">
+          <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>
+
+        <el-form-item label="房屋状态"
+                      prop="rentFlag"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="rentFlag">
+
+            <el-radio :label="1">出租</el-radio>
+            <el-radio :label="2">闲置</el-radio>
+            <el-radio :label="0">自住</el-radio>
+            <el-radio :label="3">未出售</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="房主姓名"
+                      prop="ownerName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="30"
+                    placeholder="请输入房主姓名"
+                    v-model="dataForm.ownerName">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系方式"
+                      prop="ownerPhone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type='number'
+                    placeholder="请输入联系方式"
+                    v-model="dataForm.ownerPhone">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="房主身份证"
+                      prop="ownerIdCard"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入房主身份证"
+                    v-model="dataForm.ownerIdCard">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="30"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </el-input>
+        </el-form-item>
+      </el-form>
+
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 v-if="formType != 'detail'"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      unitList: [],
+
+      houseId: '', //房屋ID
+      houseType: '1',
+      purpose: '1',
+      rentFlag: 0,
+      dataForm: {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '',
+        // realPerson: 0,
+        coding: '',
+        sysCoding: ''
+      },
+
+      keyWords: '',
+      agencyObj: {},
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (type, row, agencyObj) {
+
+      this.$refs.ref_form.resetFields();
+      this.agencyObj = agencyObj
+      this.formType = type
+      console.log('agencyObj-----', agencyObj)
+      if (row) {
+
+        this.houseId = row.houseId
+        await this.loadHouseInfo()
+        // this.dataForm = JSON.parse(JSON.stringify(row))
+        // this.houseId = this.dataForm.houseId
+
+        // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        // this.dataForm = { ...  this.dataForm }
+        // this.houseType = this.dataForm.houseTypeKey
+        // this.purpose = this.dataForm.purposeKey
+        // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+
+      } else {
+
+        this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+        this.dataForm.buildingId = this.agencyObj.id
+      }
+
+
+      await this.loadUnitList()
+
+    },
+
+
+    async loadHouseInfo () {
+
+      const url = "/gov/org/ichouse/" + this.houseId
+
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        // debugger
+        this.dataForm = { ...data }
+
+        this.houseType = this.dataForm.houseType
+        this.purpose = this.dataForm.purpose
+        this.rentFlag = parseInt(this.dataForm.rentFlag)
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载单元
+    async loadUnitList () {
+      const url = '/gov/org/building/buildingunitlist'
+
+      let params = {
+        buildingId: this.dataForm.buildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async handleCode () {
+      if (!this.dataForm.buildingUnitId) return this.$message.error('请选择单元')
+      const { data, code, msg } = await requestPost(
+        "/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
+      if (msg == "success" && code == 0) {
+        this.dataForm.coding = data.coding
+        this.dataForm.sysCoding = data.sysCoding
+
+      }
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
+      this.dataForm.houseType = this.houseType
+      this.dataForm.purpose = this.purpose
+      this.dataForm.rentFlag = this.rentFlag
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          this.btnDisable = false
+          app.util.validateRule(messageObj)
+        } else {
+          this.addRoom()
+        }
+
+      })
+    },
+
+    async addRoom () {
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的身份证号码'
+        })
+        return false;
+      }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+      let url = ''
+
+      if (this.formType === 'add') {
+        url = '/gov/org/house/houseadd'
+      } else {
+        url = '/gov/org/house/houseupdate'
+        this.dataForm.houseId = this.houseId
+      }
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+      this.btnDisable = false
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.houseId = '' //房屋ID
+      this.houseType = '1'
+      this.purpose = '1'
+      this.rentFlag = 0
+      this.dataForm = {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '1',//房屋类型【楼房，平房，别墅】
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//是否出租【是：1，否：0】
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '', // 备注
+        coding: '',
+        sysCoding: ''
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingUnitId: [
+          { required: true, message: '所属单元不能为空', trigger: 'blur' },
+        ],
+        doorName: [
+          { required: true, message: '门牌号不能为空', trigger: 'blur' }
+        ],
+        coding: [
+          { required: true, message: '房屋编码不能为空', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+        ],
+        purpose: [
+          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+        ],
+        rentFlag: [
+          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ],
+      }
+    },
+
+  },
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+}
+</style>
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 496095faa..e02e084d7 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -1,25 +1,23 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h">
+    <div class="dialog-h-content scroll-h m-edit">
 
       <el-form ref="ref_form"
-               :inline="false"
+               :inline="true"
                :model="dataForm"
                :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
+               label-width="90px"
+               class="m-form">
 
         <el-form-item label="所属楼栋"
-                      label-width="150px"
                       style="display: block">
           <span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
         </el-form-item>
 
         <el-form-item label="单元号"
                       prop="buildingUnitId"
-                      label-width="150px"
                       style="display: block">
-          <el-select class="item_width_1"
+          <el-select class="edit_item_width_1"
                      v-model="dataForm.buildingUnitId"
                      placeholder="请选择"
                      clearable>
@@ -33,52 +31,65 @@
 
         <el-form-item label="门牌号"
                       prop="doorName"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     placeholder="请输入门牌号"
                     v-model="dataForm.doorName">
           </el-input>
         </el-form-item>
-        <el-form-item v-if="formType != 'detail'"
-                      label="房屋编码"
+        <el-form-item label="房屋编码"
                       prop="coding"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_2"
+          <el-input class="edit_item_btn_width_1"
                     maxlength="50"
                     placeholder="请输入楼栋编码"
                     v-model="dataForm.coding">
 
           </el-input>
-          <el-button style="margin-left: 10px"
-                     type="primary"
+          <el-button type="text"
                      size="small"
+                     class="div-table-button--blue edit-btn-1"
                      @click="handleCode">生成</el-button>
         </el-form-item>
-        <div v-if="formType === 'detail'">
-          <el-form-item label="房屋编码"
-                        prop="houseCode"
-                        label-width="150px"
+
+        <el-form-item label="房屋编码"
+                      prop="houseCode"
+                      style="display: block">
+          <el-input class="edit_item_width_1"
+                    maxlength="30"
+                    v-model="dataForm.houseCode">
+          </el-input>
+        </el-form-item>
+
+        <div v-if="dataForm.houseQrcodeUrl"
+             class="item-image">
+
+          <el-form-item label="二维码"
+                        prop="coding"
                         style="display: block">
-            <el-input class="item_width_1"
-                      maxlength="30"
-                      v-model="dataForm.houseCode">
-            </el-input>
+            <div class="item-imagebtn">
+              <img class="d-img"
+                   :src="dataForm.houseQrcodeUrl">
+              <a class="pic-btn"
+                 :href="dataForm.houseQrcodeUrl"
+                 target="_blank">下载</a>
+            </div>
           </el-form-item>
-          <div v-if="dataForm.houseQrcodeUrl"
-               style="display: flex;flex-direction: column;">
-            <img style="margin-left: 70px;width: 200px;"
-                 :src="dataForm.houseQrcodeUrl">
-            <a style="margin-left: 80px"
-               :href="dataForm.houseQrcodeUrl"
-               target="_blank">下载</a>
-          </div>
         </div>
+
+        <!-- <div v-if="dataForm.houseQrcodeUrl"
+             style="display: flex;flex-direction: column;">
+          <img style="margin-left: 70px;width: 200px;"
+               :src="dataForm.houseQrcodeUrl">
+          <a style="margin-left: 80px"
+             :href="dataForm.houseQrcodeUrl"
+             target="_blank">下载</a>
+        </div> -->
+
         <!-- <el-form-item label="居住人数"
                       style="display: block"
                       prop="realPerson"
-                      label-width="150px">
+                      >
           <el-input-number class="item_width_4"
                            v-model="dataForm.realPerson"
                            :min="0"
@@ -87,7 +98,6 @@
         </el-form-item> -->
         <el-form-item label="房屋类型"
                       prop="houseType"
-                      label-width="150px"
                       style="display: block">
           <el-radio-group v-model="houseType">
 
@@ -99,7 +109,6 @@
 
         <el-form-item label="房屋用途"
                       prop="purpose"
-                      label-width="150px"
                       style="display: block">
           <el-radio-group v-model="purpose">
 
@@ -115,7 +124,6 @@
 
         <el-form-item label="房屋状态"
                       prop="rentFlag"
-                      label-width="150px"
                       style="display: block">
           <el-radio-group v-model="rentFlag">
 
@@ -129,9 +137,8 @@
 
         <el-form-item label="房主姓名"
                       prop="ownerName"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     maxlength="30"
                     placeholder="请输入房主姓名"
                     v-model="dataForm.ownerName">
@@ -139,9 +146,8 @@
         </el-form-item>
         <el-form-item label="联系方式"
                       prop="ownerPhone"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     type='number'
                     placeholder="请输入联系方式"
                     v-model="dataForm.ownerPhone">
@@ -149,18 +155,16 @@
         </el-form-item>
         <el-form-item label="房主身份证"
                       prop="ownerIdCard"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     placeholder="请输入房主身份证"
                     v-model="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
         <el-form-item label="备注"
                       prop="remark"
-                      label-width="150px"
                       style="display: block">
-          <el-input class="item_width_1"
+          <el-input class="edit_item_width_1"
                     maxlength="30"
                     placeholder="请输入备注"
                     v-model="dataForm.remark">
@@ -171,10 +175,10 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
+                 class="diy-button--other"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
+                 class="diy-button--blue"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
@@ -191,7 +195,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      formType: 'add', //表单操作类型 add新增，edit编辑
       btnDisable: false,
       unitList: [],
 
@@ -464,10 +468,5 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManageForm.scss";
-
-.div_tuomin {
-  position: absolute;
-  top: 0;
-  right: 40px;
-}
+@import "@/assets/scss/modules/management/edit-main.scss";
 </style>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 2985e8ad8..f447d3128 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -245,7 +245,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="900px"
+               width="850px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
@@ -260,7 +260,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'查看房屋'"
-               width="900px"
+               width="850px"
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">