diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 6a4169376..d3b243f5f 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -235,7 +235,7 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
-                      :props="{ checkStrictly: false }"
+                      :props="{ checkStrictly: true }"
                       :disabled="disabled"
                       clearable
                       size="small"
diff --git a/src/views/components/editResi.vue.rej b/src/views/components/editResi.vue.rej
new file mode 100644
index 000000000..290661dcf
--- /dev/null
+++ b/src/views/components/editResi.vue.rej
@@ -0,0 +1,10 @@
+diff a/src/views/components/editResi.vue b/src/views/components/editResi.vue	(rejected hunks)
+@@ -235,7 +235,7 @@
+                       v-else-if="n.itemType === 'cascader'"
+                       v-model.trim="form[n.columnName]"
+                       :options="n.options"
+-                      :props="{ checkStrictly: true }"
++                      :props="{ checkStrictly: false }"
+                       :disabled="disabled"
+                       clearable
+                       size="small"
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index 33bafc8f2..3af132781 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -169,7 +169,7 @@
 <script>
 import util from '@js/util.js';
 import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
+import { requestPost, requestGet } from '@/js/dai/request'
 
 let loading // 加载动画
 export default {
@@ -283,7 +283,7 @@ export default {
         this.dataForm.idCard = row.ID_CARD
         this.dataForm.mobile = row.MOBILE
 
-        await this.loadHouseInfo(row.HOME_ID)
+        await this.loadHouseInfo(row.HOME_ID_VALUE)
 
         this.dataForm.name = row.NAME
         this.dataForm.gender = row.GENDER
@@ -294,13 +294,13 @@ export default {
       await this.getAgencylist()
 
     },
-      async loadHouseInfo (homeId) {
-          const url = "/gov/org/ichouse/" + homeId
+      async loadHouseInfo (homeIdValue) {
+          const url = "/gov/org/ichouse/" + homeIdValue
           const { data, code, msg } = await requestGet(url)
           if (code === 0) {
               this.dataForm.oldDept = ''
-              this.dataForm.oldAddress = row.houseName
-              this.dataForm.ownerName = row.ownerName
+              this.dataForm.oldAddress = data.houseName
+              this.dataForm.ownerName = data.ownerName
           } else {
               this.$message.error(msg)
           }
diff --git a/src/views/modules/plugins/rent/renthouse-add-or-update.vue b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
index 417c5a0ed..1833b7d15 100644
--- a/src/views/modules/plugins/rent/renthouse-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
@@ -1,109 +1,62 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="客户id" prop="customerId">
-          <el-input v-model="dataForm.customerId" placeholder="客户id"></el-input>
-      </el-form-item>
-          <el-form-item label="小区id" prop="neighborHoodId">
-          <el-input v-model="dataForm.neighborHoodId" placeholder="小区id"></el-input>
-      </el-form-item>
-          <el-form-item label="片区id，neighbor_hood_part.id,可为空。" prop="partId">
-          <el-input v-model="dataForm.partId" placeholder="片区id，neighbor_hood_part.id,可为空。"></el-input>
-      </el-form-item>
-          <el-form-item label="所属楼栋id" prop="buildingId">
-          <el-input v-model="dataForm.buildingId" placeholder="所属楼栋id"></el-input>
-      </el-form-item>
-          <el-form-item label="所属单元id" prop="buildingUnitId">
-          <el-input v-model="dataForm.buildingUnitId" placeholder="所属单元id"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋名字后台插入时生成" prop="houseName">
-          <el-input v-model="dataForm.houseName" placeholder="房屋名字后台插入时生成"></el-input>
-      </el-form-item>
-          <el-form-item label="门牌号" prop="doorName">
-          <el-input v-model="dataForm.doorName" placeholder="门牌号"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋类型，1楼房，2平房，3别墅" prop="houseType">
-          <el-input v-model="dataForm.houseType" placeholder="房屋类型，1楼房，2平房，3别墅"></el-input>
-      </el-form-item>
-          <el-form-item label="存储字典value" prop="purpose">
-          <el-input v-model="dataForm.purpose" placeholder="存储字典value"></el-input>
-      </el-form-item>
-          <el-form-item label="1：出租 0：自住  2：闲置" prop="rentFlag">
-          <el-input v-model="dataForm.rentFlag" placeholder="1：出租 0：自住  2：闲置"></el-input>
-      </el-form-item>
-          <el-form-item label="房主姓名" prop="ownerName">
-          <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
-      </el-form-item>
-          <el-form-item label="房主电话" prop="ownerPhone">
-          <el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
-      </el-form-item>
-          <el-form-item label="房主身份证号" prop="ownerIdCard">
-          <el-input v-model="dataForm.ownerIdCard" placeholder="房主身份证号"></el-input>
-      </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0未删除、1已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0未删除、1已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="社区ID" prop="communityId">
-          <el-input v-model="dataForm.communityId" placeholder="社区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="社区" prop="communityName">
-          <el-input v-model="dataForm.communityName" placeholder="社区"></el-input>
-      </el-form-item>
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="网格" prop="gridName">
-          <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋小区ID" prop="villageId">
-          <el-input v-model="dataForm.villageId" placeholder="房屋小区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋小区" prop="villageName">
-          <el-input v-model="dataForm.villageName" placeholder="房屋小区"></el-input>
-      </el-form-item>
-          <el-form-item label="楼号ID" prop="buildId">
-          <el-input v-model="dataForm.buildId" placeholder="楼号ID"></el-input>
-      </el-form-item>
-          <el-form-item label="楼号" prop="buildName">
-          <el-input v-model="dataForm.buildName" placeholder="楼号"></el-input>
-      </el-form-item>
-          <el-form-item label="单元ID" prop="unitId">
-          <el-input v-model="dataForm.unitId" placeholder="单元ID"></el-input>
-      </el-form-item>
-          <el-form-item label="单元" prop="unitName">
-          <el-input v-model="dataForm.unitName" placeholder="单元"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋ID" prop="homeId">
-          <el-input v-model="dataForm.homeId" placeholder="房屋ID"></el-input>
-      </el-form-item>
-          <el-form-item label="房屋" prop="homeName">
-          <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
-      </el-form-item>
-          <el-form-item label="购房日期" prop="purchaseDate">
-          <el-input v-model="dataForm.purchaseDate" placeholder="购房日期"></el-input>
-      </el-form-item>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : '查看'" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px" disabled>
+        <el-form-item label="房屋类型" prop="houseType">
+            <el-select v-model="dataForm.houseType" placeholder="房屋类型" clearable>
+                <el-option v-for="item in houseTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="用途" prop="purpose">
+            <el-select v-model="dataForm.purpose" placeholder="用途" clearable>
+                <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="房屋状态" prop="rentFlag">
+            <el-select v-model="dataForm.rentFlag" placeholder="房屋状态" clearable>
+                <el-option v-for="item in rentFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="房主姓名" prop="ownerName">
+            <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="房主电话" prop="ownerPhone">
+            <el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
+        </el-form-item>
+        <el-form-item label="房主身份证号" prop="ownerIdCard">
+            <el-input v-model="dataForm.ownerIdCard" placeholder="房主身份证号"></el-input>
+        </el-form-item>
+        <el-form-item label="网格" prop="gridName">
+            <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
+        </el-form-item>
+        <el-form-item label="房屋小区" prop="villageName">
+            <el-input v-model="dataForm.villageName" placeholder="房屋小区"></el-input>
+        </el-form-item>
+        <el-form-item label="楼号" prop="buildName">
+            <el-input v-model="dataForm.buildName" placeholder="楼号"></el-input>
+        </el-form-item>
+        <el-form-item label="单元" prop="unitName">
+            <el-input v-model="dataForm.unitName" placeholder="单元"></el-input>
+        </el-form-item>
+        <el-form-item label="房屋" prop="homeName">
+            <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
+        </el-form-item>
+        <el-form-item label="购房日期" prop="purchaseDate">
+            <el-date-picker v-model="dataForm.purchaseDate"
+                            type="date"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                            style="width:200px"
+                            :clearable="false">
+            </el-date-picker>
+        </el-form-item>
       </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary" size="small" @click="visible = false">{{ '返回' }}</el-button>
+      <!--<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>-->
     </template>
   </el-dialog>
 </template>
@@ -130,12 +83,6 @@ export default {
         ownerPhone: '',
         ownerIdCard: '',
         sort: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
         communityId: '',
         communityName: '',
         gridId: '',
@@ -149,7 +96,26 @@ export default {
         homeId: '',
         homeName: '',
         purchaseDate: ''
-      }
+      },
+        houseTypeArr: [
+            { dictValue: '1', dictName: '楼房' },
+            { dictValue: '2', dictName: '平房' },
+            { dictValue: '3', dictName: '别墅' }
+        ],
+        rentFlagArr: [
+            { dictValue: 0, dictName: '自住' },
+            { dictValue: 1, dictName: '出租' },
+            { dictValue: 2, dictName: '闲置' }
+        ],
+        purposeArr: [
+            { dictValue: '1', dictName: '住宅' },
+            { dictValue: '2', dictName: '商业' },
+            { dictValue: '3', dictName: '办公' },
+            { dictValue: '4', dictName: '工业' },
+            { dictValue: '5', dictName: '仓储' },
+            { dictValue: '6', dictName: '商住混用' },
+            { dictValue: '7', dictName: '其他' }
+        ],
     }
   },
   computed: {
@@ -269,7 +235,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/rent/rentHouse/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/pli/power/rentHouse/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -285,7 +251,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/rent/rentHouse/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentHouse/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index e117888da..cca04ff18 100644
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentHouse}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="100px">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
         <el-form-item label="所属网格"
                       prop="gridId">
           <el-select
@@ -100,8 +100,8 @@
 
         <br/>
         <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model="dataForm.name"
+                      prop="ownerName">
+          <el-input v-model="dataForm.ownerName"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -109,8 +109,8 @@
           </el-input>
         </el-form-item>
         <el-form-item label="身份证"
-                      prop="idCard">
-          <el-input v-model="dataForm.idCard"
+                      prop="ownerIdCard">
+          <el-input v-model="dataForm.ownerIdCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -118,8 +118,8 @@
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
-                      prop="mobile">
-          <el-input v-model="dataForm.mobile"
+                      prop="ownerPhone">
+          <el-input v-model="dataForm.ownerPhone"
                     size="small"
                     class="list_item_width_1"
                     clearable
@@ -169,11 +169,11 @@
                          align="center"
                          width="50">
         </el-table-column>
-        <el-table-column prop="villageName" label="所属小区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="buildName" label="所属楼栋" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unitName" label="单元号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="homeName" label="门牌号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseType" label="房屋类型" header-align="center" align="center">
+        <el-table-column prop="villageName" label="所属小区" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="buildName" label="所属楼栋" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="unitName" label="单元号" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="homeName" label="门牌号" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="houseType" label="房屋类型" header-align="center" align="center" min-width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             {{
             scope.row.houseType == '1'
@@ -186,7 +186,7 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="purpose" label="用途" header-align="center" align="center">
+        <el-table-column prop="purpose" label="用途" header-align="center" align="center" min-width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             {{
             scope.row.purpose == '1'
@@ -207,7 +207,7 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="rentFlag" label="房屋状态" header-align="center" align="center">
+        <el-table-column prop="rentFlag" label="房屋状态" header-align="center" align="center" min-width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             {{
             scope.row.rentFlag == 1
@@ -220,13 +220,13 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
         <el-table-column prop="ownerPhone" label="房主电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ownerIdCard" label="房主身份证号" header-align="center" align="center"></el-table-column>
-        <!--<el-table-column prop="purchaseDate" label="购房日期" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="ownerIdCard" label="房主身份证号" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="purchaseDate" label="购房日期" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ '查看' }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -270,21 +270,21 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/pli/power/rentHouse/page',
         getDataListIsPage: true,
-        deleteURL: '/pli/power/rentHouse',
+        deleteURL: '/pli/power/rentHouse/delete',
         deleteIsBatch: true,
         exportURL: '/pli/power/rentHouse/export'
       },
       dataForm: {
         id: '',
-          name: '',
-          mobile: '',
-          idCard: '',
-          gridId: '',
-          villageId: '',
-          buildId: '',
-          unitId: '',
-          homeId: '',
-          rentFlag: ''
+        name: '',
+        mobile: '',
+        idCard: '',
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        rentFlag: ''
       },
         timeRange: '',
         optionsV: [],
@@ -293,9 +293,9 @@ export default {
         optionsD: [],
         optionsG: [],
         rentFlagArr: [
-            { dictValue: 0, dictName: '自住' },
-            { dictValue: 1, dictName: '出租' },
-            { dictValue: 2, dictName: '闲置' }
+          { dictValue: 0, dictName: '自住' },
+          { dictValue: 1, dictName: '出租' },
+          { dictValue: 2, dictName: '闲置' }
         ],
         //form相关
         formShow: false,
@@ -333,6 +333,37 @@ export default {
         }
     },
     methods: {
+        diaClose(){
+
+        },
+        exportHandle () {
+            const url = this.mixinViewModuleOptions.exportURL
+            this.$http({
+                method: 'GET',
+                url,
+                responseType: 'blob',
+                params: this.dataForm
+            }).then(res => {
+                // this.download(res.data, title + '.xls')
+                if (res.headers["content-disposition"]) {
+                    let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+                    console.log('filename', fileName)
+                    let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+                    var url = window.URL.createObjectURL(blob)
+                    var aLink = document.createElement('a')
+                    aLink.style.display = 'none'
+                    aLink.href = url
+                    aLink.setAttribute('download', fileName)
+                    document.body.appendChild(aLink)
+                    aLink.click()
+                    document.body.removeChild(aLink) //下载完成移除元素
+                    window.URL.revokeObjectURL(url) //释放掉blob对象
+                } else this.$message.error('下载失败')
+            }).catch(err => {
+                console.log('err', err)
+                return this.$message.error('网络错误')
+            })
+        },
         addFormCancle () {
             this.formShow = false
         },
diff --git a/src/views/modules/plugins/rent/renthouseForm.vue b/src/views/modules/plugins/rent/renthouseForm.vue
index c9c30ac8f..802960604 100644
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@@ -49,7 +49,6 @@
                 <el-select
                         v-model.trim="buildId"
                         placeholder="楼号"
-                        clearable
                         style="width: 120px;"
                         :disabled="changeVDisabled"
                         @clear="handleClearBuild"
@@ -69,7 +68,6 @@
                         v-model.trim="unitId"
                         :disabled="changeBDisabled"
                         placeholder="单元"
-                        clearable
                         style="width: 120px;"
                         @click="handleClearDan"
                         @change="handleChangeD"
@@ -88,7 +86,6 @@
                         v-model.trim="homeId"
                         :disabled="changeDDisabled"
                         placeholder="房号"
-                        clearable
                         style="width: 120px;"
                         @change="homeIdHandleChange"
                 >
@@ -105,35 +102,16 @@
           </div>
         </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="purchaseDate" label-width="150px">
+          <el-date-picker v-model="dataForm.purchaseDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期"
+                          style="width:200px"
+                          :clearable="false">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="房屋状态"
                       prop="rentFlag"
                       label-width="150px"
@@ -176,7 +154,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label=" " prop="needUpdate" label-width="150px">
-          <el-checkbox v-model="dataForm.needUpdate">更新房屋信息</el-checkbox>
+          <el-checkbox v-model="needUpdate">更新房屋信息</el-checkbox>
         </el-form-item>
       </el-form>
 
@@ -205,7 +183,6 @@ export default {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
       btnDisable: false,
-      unitList: [],
 
       houseId: '', //房屋ID
       houseType: '1',
@@ -222,31 +199,86 @@ export default {
         ownerPhone: '', //房主电话
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
-        needUpdate: false
+        needUpdate: false,
+        purchaseDate: '',
+          villageId: '',
+          buildId: '',
+          unitId: ''
 
       },
 
       keyWords: '',
       agencyObj: {},
 
-        optionsV: [],
-        optionsB: [],
-        optionsH: [],
-        optionsD: [],
-        optionsG: [],
-
-        gridId: '',
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: '',
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      gridId: '',
+      gridName: '',
+      villageId: '',
+      villageName: '',
+      buildId: '',
+      buildName: '',
+      unitId: '',
+      unitName: '',
+      homeId: '',
+      homeName: '',
+      needUpdate: false
 
     }
   },
-  components: {},
-  mounted () {
+    computed: {
+        dataRule () {
+            return {
+                buildingUnitId: [
+                    { required: true, message: '所属单元不能为空', trigger: 'blur' },
+                ],
+                doorName: [
+                    { 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 }
+                ],
+                villageId: [
+                    { required: true, message: '所属房屋不能为空', trigger: 'blur' }
+                ],
+                gridId: [
+                    { required: true, message: '所属网格不能为空', trigger: 'blur' }
+                ],
+                purchaseDate: [
+                    { required: true, message: '购房时间不能为空', trigger: 'blur' }
+                ]
+            }
+        },
+        changeVDisabled() {
+            return !this.villageId
+        },
+        changeBDisabled() {
+            return !this.buildId
+        },
+        changeDDisabled() {
+            return !this.unitId
+        }
 
-  },
+    },
     created () {
         this.getGridList()
         this.getValiheList()
@@ -261,25 +293,16 @@ export default {
     async initForm (type, row, agencyObj) {
 
       this.$refs.ref_form.resetFields();
-      // this.agencyObj = agencyObj
+      this.resetData()
       this.formType = type
-      // if (row) {
-      //
-      //   this.houseId = row.houseId
-      //   await this.loadHouseInfo()
-      //
-      // } else {
-      //
-      //   this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-      //   this.dataForm.buildingId = this.agencyObj.id
-      // }
-
-
-      // await this.loadUnitList()
 
     },
 
     async loadHouseInfo () {
+      if(this.houseId === '' || this.houseId === null){
+          this.$message.error('请选择房号')
+          return false
+      }
 
       const url = "/gov/org/ichouse/" + this.houseId
 
@@ -292,7 +315,6 @@ export default {
         this.houseType = this.dataForm.houseType
         this.purpose = this.dataForm.purpose
         this.rentFlag = parseInt(this.dataForm.rentFlag)
-          this.dataForm.needUpdate = false
 
 
       } else {
@@ -301,23 +323,6 @@ export default {
 
     },
 
-    //加载单元
-    // 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)
-    //   }
-    // },
-
       handleClearVillage() {
           this.buildId = ''
           this.homeId = ''
@@ -332,6 +337,13 @@ export default {
           this.homeId = ''
       },
       handleChangeGrid(val) {
+          // 网格
+          this.optionsG.find((item) => {
+              if (item.value === val) {
+                  this.gridName = item.label
+              }
+          })
+
           console.log('val', val)
           this.villageId = ''
           this.buildId = ''
@@ -425,6 +437,12 @@ export default {
               })
       },
       handleChangeV(val) {
+          // 小区
+          this.optionsV.find((item) => {
+              if (item.value === val) {
+                  this.villageName = item.label
+              }
+          })
           console.log('val', val)
           this.buildId = ''
           this.unitId = ''
@@ -432,17 +450,35 @@ export default {
           this.getBuildList()
       },
       handleChangeB(val) {
+          // 楼号
+          this.optionsB.find((item) => {
+              if (item.value === val) {
+                  this.buildName = item.label
+              }
+          })
           console.log('val', val)
           this.unitId = ''
           this.homeId = ''
           this.getUniList()
       },
       handleChangeD(val) {
+          // 单元号
+          this.optionsD.find((item) => {
+              if (item.value === val) {
+                  this.unitName = item.label
+              }
+          })
           console.log('val', val)
           this.homeId = ''
           this.getHouseList()
       },
       homeIdHandleChange(val){
+          // 房间号
+          this.optionsH.find((item) => {
+              if (item.value === val) {
+                  this.homeName = item.label
+              }
+          })
           this.houseId = val
           this.loadHouseInfo()
       },
@@ -457,18 +493,25 @@ export default {
       this.dataForm.purpose = this.purpose
       this.dataForm.rentFlag = this.rentFlag
 
-        // 小区到房号赋值
-        this.dataForm.gridId = this.gridId
-        this.dataForm.villageId = this.villageId
-        this.dataForm.buildId = this.buildId
-        this.dataForm.unitId = this.unitId
-        this.dataForm.homeId = this.homeId
+      // 小区到房号赋值
+      this.dataForm.gridId = this.gridId
+      this.dataForm.villageId = this.villageId
+      this.dataForm.buildId = this.buildId
+      this.dataForm.unitId = this.unitId
+      this.dataForm.homeId = this.homeId
+      this.dataForm.gridName = this.gridName
+      this.dataForm.villageName = this.villageName
+      this.dataForm.buildName = this.buildName
+      this.dataForm.unitName = this.unitName
+      this.dataForm.homeName = this.homeName
+      this.dataForm.needUpdate = this.needUpdate
 
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
           this.btnDisable = false
           app.util.validateRule(messageObj)
         } else {
+          this.dataForm.id = ''
           this.addRoom()
         }
 
@@ -521,12 +564,6 @@ export default {
 
     },
 
-    handleCancle () {
-      this.resetData()
-      this.$emit('dialogCancle')
-
-    },
-
     resetData () {
       this.houseId = '' //房屋ID
       this.houseType = '1'
@@ -542,63 +579,26 @@ export default {
         rentFlag: 0,//是否出租【是：1，否：0】
         ownerPhone: '', //房主电话
         ownerName: '', //房主名字
-        ownerIdCard: '' //房主身份证
+        ownerIdCard: '', //房主身份证
+        needUpdate: false,
+        purchaseDate: '',
+        id: ''
       }
+      this.gridId = ''
+      this.villageId = ''
+      this.buildId = ''
+      this.unitId = ''
+      this.homeId = ''
+      this.gridName = ''
+      this.villageName = ''
+      this.buildName = ''
+      this.unitName = ''
+      this.homeName = ''
+      this.needUpdate = false
 
     },
-    // 开启加载动画
-    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' }
-        ],
-        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 }
-        ],
-          villageId: [
-              { required: true, message: '所属房屋不能为空', trigger: 'blur' }
-          ],
-          gridId: [
-              { required: true, message: '所属网格不能为空', trigger: 'blur' }
-          ],
-      }
-    },
 
-  },
   props: {}
 }
 </script>