BUG

operationSupport/src/views/assetManagement/shopManagement/details.vue

@@ -130,6 +130,7 @@ export default {
       id: null,
       detailsData: {},
       memberData: [],
+      houseDataType: '',
       houseData: [],
       tabs: [
         {
@@ -354,6 +355,8 @@ export default {
                 return '亲属';
               case 3:
                 return '租客';
+              case 4:
+                return '承租人';
             }
           }
         },
@@ -466,8 +469,21 @@ export default {
         .get('/czc-community/assets/house/find/house?houseId=' + this.id)
         .then((res) => {
           if (!!res) {
+            this.houseDataType = res.householdType;
 
             this.detailsData = res;
+            if (this.houseDataType == 1) {
+              document.querySelectorAll('.text')[16].innerHTML = '业主'
+            } else if (this.houseDataType == 2) {
+              document.querySelectorAll('.text')[16].innerHTML = '亲属'
+            } else if (this.houseDataType == 3) {
+              document.querySelectorAll('.text')[16].innerHTML = '租客'
+            } else if (this.houseDataType == 4) {
+              document.querySelectorAll('.text')[16].innerHTML = '承租人'
+            }
+            else {
+              document.querySelectorAll('.text')[16].innerHTML = '--'
+            }
             if (!!res.residentId) {
               this.getHouse(res.residentId);
             }
@@ -508,7 +524,8 @@ export default {
         width: '1044px',
         height: '600px',
         props: {
-          data: row
+          data: row,
+          tyep: 'shop'
         },
         notip: true,
         showCancelButton: true,

operationSupport/src/views/assetManagement/stepPage/houseDataPop.vue

@@ -77,7 +77,7 @@ export default {
             prop: 'householdType',
             const: true,
             format (val) {
-              debugger
+
               return type;
             }
           },
@@ -112,6 +112,7 @@ export default {
   },
   created () {
     if (!!this.params.data) {
+
       type = typeArr[Number(this.params.data.householdType) - 1];
       this.getHouse(this.params.data.residentId);
 
@@ -126,11 +127,34 @@ export default {
             if (data !== null) {
               this.houseDataType = data.houseList[0].householdType;
               this.houseData = data;
-              if (this.houseDataType == 1) {
-                document.querySelectorAll('.text')[30].innerHTML = '业主'
+              if (this.params.tyep == 'shop') {
+                if (this.houseDataType == 1) {
+                  document.querySelectorAll('.text')[26].innerHTML = '业主'
+                } else if (this.houseDataType == 2) {
+                  document.querySelectorAll('.text')[26].innerHTML = '亲属'
+                } else if (this.houseDataType == 3) {
+                  document.querySelectorAll('.text')[26].innerHTML = '租客'
+                } else if (this.houseDataType == 4) {
+                  document.querySelectorAll('.text')[26].innerHTML = '承租人'
+                }
+                else {
+                  document.querySelectorAll('.text')[26].innerHTML = '--'
+                }
               } else {
-                document.querySelectorAll('.text')[30].innerHTML = '--'
+                if (this.houseDataType == 1) {
+                  document.querySelectorAll('.text')[30].innerHTML = '业主'
+                } else if (this.houseDataType == 2) {
+                  document.querySelectorAll('.text')[30].innerHTML = '亲属'
+                } else if (this.houseDataType == 3) {
+                  document.querySelectorAll('.text')[30].innerHTML = '租客'
+                } else if (this.houseDataType == 4) {
+                  document.querySelectorAll('.text')[30].innerHTML = '承租人'
+                }
+                else {
+                  document.querySelectorAll('.text')[30].innerHTML = '--'
+                }
               }
+
             }
           } else {
             this.$message.error(msg);

operationSupport/src/views/ownerManagement/ownerReview/index.vue

@@ -193,7 +193,7 @@ export default {
     },
     Review (row) {
       this.activeData = row;
-      this.activeData.checkInDate = (this.activeData.checkInDate).substr(0, 10);
+      this.activeData.checkInDate = this.activeData.checkInDate == null ? '--' : (this.activeData.checkInDate).substr(0, 10);
       this.ownerStatus = true;
     }
   },