Merge branch 'dev' into test

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

@@ -198,7 +198,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      source: 'tree',//来源  
+      source: 'tree',//来源
       importRoomLoading: false,
       total: 0,
       pageSize: 20,
@@ -347,6 +347,8 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
         sortType: this.sortType,
       }
 
@@ -541,6 +543,8 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
         buildingId: this.agencyObj.id
       }
 
@@ -619,6 +623,8 @@ export default {
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
         buildingId: '',
         neighborHoodId: ''
       }
@@ -799,6 +805,14 @@ export default {
       type: String,
       default: '',
     },
+    purpose: {
+        type: String,
+        default: '',
+    },
+    remark: {
+        type: String,
+        default: '',
+    }
   }
 }
 </script>