Merge remote-tracking branch 'origin/master-bugfix'

src/assets/scss/modules/management/list-main.scss

@@ -2,6 +2,9 @@
 
 .div_main {
   width: 100%;
+  .marginl-20{
+    margin-left: 16px;
+  }
 
   .div_search {
     background: #ffffff;

src/assets/scss/modules/visual/communityManage.scss

@@ -49,7 +49,7 @@
 
 .div_btn {
   display: flex;
-  margin-top: 20px;
+  margin-top: 10px;
 
   .btn_upload {
     margin-left: 10px;

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

@@ -241,7 +241,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
+      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
 
     },
 
@@ -603,6 +603,10 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
         neighborHoodId: this.agencyObj.id
 
       }
@@ -778,6 +782,22 @@ export default {
       type: String,
       default: '',
     },
+    purpose: {
+      type: String,
+      default: '',
+    },
+    remark: {
+      type: String,
+      default: '',
+    },
+    updateStartDate: {
+      type: String,
+      default: '',
+    },
+    updateEndDate: {
+      type: String,
+      default: '',
+    },
   }
 }
 </script>

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

@@ -236,7 +236,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
+      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
 
     },
 
@@ -583,6 +583,10 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
       }
 
       if (this.agencyObj.level === 'grid') {
@@ -777,6 +781,22 @@ export default {
       type: String,
       default: '',
     },
+    purpose: {
+      type: String,
+      default: '',
+    },
+    remark: {
+      type: String,
+      default: '',
+    },
+    updateStartDate: {
+      type: String,
+      default: '',
+    },
+    updateEndDate: {
+      type: String,
+      default: '',
+    },
 
   }
 }