Merge branch 'dev-hurry' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-hurry

src/views/modules/base/community/community.vue

@@ -98,12 +98,16 @@ export default {
   },
   computed: {
     rowHeight () {
-      return (this.clientHeight - 120) + 'px'
+
+      return this.$store.state.inIframe ? this.clientHeight - 120 + this.iframeHeight + 'px' : this.clientHeight - 120 + 'px'
+
     },
     treeHeight () {
-      return (this.clientHeight - 200) + 'px'
+      return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
+
     },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     async loadTree (isRefresh) {

src/views/modules/base/community/roomForm.vue

@@ -11,7 +11,7 @@
         <el-form-item label="所属楼栋"
                       label-width="150px"
                       style="display: block">
-          <span>{{ agencyObj.communityName }}—{{agencyObj.label}}</span>
+          <span>{{ agencyObj.neighborHoodName }}—{{agencyObj.label}}</span>
         </el-form-item>
 
         <el-form-item label="单元号"
@@ -231,7 +231,7 @@ export default {
 
     async addRoom () {
       const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
-      if (regCard.test(this.dataForm.ownerIdCard) === false) {
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
@@ -240,7 +240,7 @@ export default {
         return false;
       }
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.dataForm.ownerPhone) === false) {
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
@@ -335,13 +335,13 @@ export default {
           { required: true, message: '是否出租不能为空', trigger: 'blur' }
         ],
         ownerPhone: [
-          { required: true, message: '房主电话不能为空', trigger: 'blur' }
+          { required: false }
         ],
         ownerName: [
-          { required: true, message: '房主姓名不能为空', trigger: 'blur' }
+          { required: false }
         ],
         ownerIdCard: [
-          { required: true, message: '房主身份证号不能为空', trigger: 'blur' }
+          { required: false }
         ],
       }
     },

src/views/modules/base/community/roomTable.vue

@@ -80,34 +80,41 @@
                          :selectable="checkSelect"
                          width="55">
         </el-table-column>
-        <el-table-column prop="houseName"
+        <el-table-column prop="houseNameShow"
                          label="房屋名称"
-                         width="120">
+                         min-width="160">
         </el-table-column>
         <el-table-column prop="neighborHoodName"
                          label="所属小区"
-                         width="160">
+                         min-width="150">
         </el-table-column>
         <el-table-column prop="buildingName"
-                         label="所属楼栋">
+                         label="所属楼栋"
+                         width="80">
         </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号">
+        <el-table-column prop="unitNumShow"
+                         label="单元号"
+                         width="70">
         </el-table-column>
         <el-table-column prop="doorName"
-                         label="门牌号">
+                         label="门牌号"
+                         width="70">
         </el-table-column>
         <el-table-column prop="houseType"
-                         label="类型">
+                         label="类型"
+                         width="50">
         </el-table-column>
         <el-table-column prop="purpose"
-                         label="用途">
+                         label="用途"
+                         width="50">
         </el-table-column>
         <el-table-column prop="rentFlag"
-                         label="是否出租">
+                         label="是否出租"
+                         width="80">
         </el-table-column>
         <el-table-column prop="ownerName"
-                         label="房主姓名">
+                         label="房主姓名"
+                         width="90">
         </el-table-column>
         <el-table-column prop="ownerPhone"
                          label="房主电话"
@@ -214,6 +221,8 @@ export default {
       selection: [],
       showDeletBtn: false,
 
+      tableData: [],
+
       //form相关
       formShow: false,
       formTitle: '新增房屋',
@@ -229,7 +238,6 @@ export default {
   },
   computed: {
     tableHeight () {
-
       return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
@@ -298,6 +306,8 @@ export default {
         this.total = data.total
         this.validTableDataNum = 0
         data.list.forEach(item => {
+          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
+          item.unitNumShow = item.unitNum + '单元'
           if (item.agencyId === this.staffAgencyId) {
             item.showBtn = true
             this.validTableDataNum++
@@ -327,6 +337,7 @@ export default {
     },
 
     handleAdd () {
+
       this.formTitle = '新增房屋'
       this.formShow = true
       this.$nextTick(() => {

src/views/modules/communityParty/regionalParty/activitys.vue

@@ -634,13 +634,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 430)
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 

src/views/modules/communityParty/regionalParty/units.vue

@@ -675,13 +675,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 430)
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 

src/views/modules/visual/basicinfo/people.vue

@@ -126,7 +126,7 @@
                    src="@/assets/img/shuju/people/huzhu.png" />
               <img class="huzhu-ico"
                    src="@/assets/img/shuju/people/huzhu-home.png" />
-              <div class="huzhu-name">{{ houseInfo.ownerName }}</div>
+              <div class="huzhu-name">{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}</div>
               <p>（户主）</p>
             </div>