Merge branch 'dev' into test

# Conflicts:
#	src/views/modules/base/community/community.vue
#	src/views/modules/base/community/roomForm.vue

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

@@ -48,7 +48,6 @@
           <div class="resi-cell-label">房主手机</div>
           <div class="resi-cell-value">
             <el-input v-model="ownerPhone"
-                      class="resi-cell-input"
                       size="small"
                       clearable
                       placeholder="请输入内容">
@@ -80,8 +79,13 @@
           <div class="resi-cell-label">房屋用途</div>
           <div class="resi-cell-value">
 
-            <el-select v-model="purpose" placeholder="房屋用途" clearable>
+            <el-select v-model="purpose"
-              <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                       placeholder="房屋用途"
+                       clearable>
+              <el-option v-for="item in purposeArr"
+                         :key="item.dictValue"
+                         :label="item.dictName"
+                         :value="item.dictValue">
               </el-option>
             </el-select>
 
@@ -120,6 +124,8 @@
                    :ownerName="ownerName"
                    :ownerPhone="ownerPhone"
                    :rentFlag="rentFlag"
+                   :purpose="purpose"
+                   :remark="remark"
                    @toNextLevel="toNextLevel"
                    @refreshTree="refreshTree"></build-table>
 
@@ -129,6 +135,8 @@
                   :ownerName="ownerName"
                   :ownerPhone="ownerPhone"
                   :rentFlag="rentFlag"
+                  :purpose="purpose"
+                  :remark="remark"
                   ref="ref_buildingTable"
                   @refreshTree="refreshTree"></room-table>
 
@@ -138,6 +146,8 @@
                        :ownerName="ownerName"
                        :ownerPhone="ownerPhone"
                        :rentFlag="rentFlag"
+                       :purpose="purpose"
+                       :remark="remark"
                        ref="ref_communityTable"
                        @refreshTree="refreshTree"></community-table>
 

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

@@ -164,7 +164,7 @@
         ownerPhone: '', //房主电话
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
-                    remark: ''
+        remark: '' // 备注
       },
 
                 keyWords: '',
@@ -382,7 +382,7 @@
         ],
         remark: [
           { required: false }
-                    ],
+        ]
       }
     },
 

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

@@ -622,9 +622,9 @@
                     gridId: '',
                     ownerName: this.ownerName,
                     ownerPhone: this.ownerPhone,
+                    rentFlag: this.rentFlag,
                     purpose: this.purpose,
                     remark: this.remark,
-                    rentFlag: this.rentFlag,
                     buildingId: '',
                     neighborHoodId: ''
                 }