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>
 
@@ -475,63 +485,63 @@
   components: {
     communityTable, buildTable, roomTable
   }
-    }
+}
 </script>
 <style lang="scss" scoped >
-  .div_main {
+.div_main {
   display: flex;
-  }
+}
-  .scrollar {
+.scrollar {
   margin-top: 10px;
-  }
+}
 
-  .div_tree {
+.div_tree {
   flex: 0 0 280px;
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;
   overflow-y: hidden;
-  }
+}
-  .filter_tree {
+.filter_tree {
   overflow-x: auto;
-  }
+}
 
-  .div_table {
+.div_table {
   margin-left: 15px;
   // flex: 1;
   width: calc(100% - 300px);
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;
-  }
+}
 
-  .div_btn {
+.div_btn {
   margin-top: 20px;
-  }
+}
 
-  .row {
+.row {
   padding: 10px;
-  }
+}
 </style>
 
 <style>
-  /* .aui-content > .el-tabs > .el-tabs__content {
+/* .aui-content > .el-tabs > .el-tabs__content {
     padding: 0px;
   } */
 
-  .el-tree-node:focus > .el-tree-node__content {
+.el-tree-node:focus > .el-tree-node__content {
   /* background-color: #ccc !important; */
   color: #2195fe;
-  }
+}
 </style>
 <style lang="scss" scoped>
-  .div_tree {
+.div_tree {
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden !important;
   }
-  }
+}
 </style>
 
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/visual/communityManage.scss";
 </style>

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

@@ -136,13 +136,13 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
+import { Loading } from 'element-ui' // 引入Loading服务
-    import { requestPost, requestGet } from '@/js/dai/request'
+import { requestPost, requestGet } from '@/js/dai/request'
 
 
-    let loading // 加载动画
+let loading // 加载动画
-    export default {
+export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
@@ -164,7 +164,7 @@
         ownerPhone: '', //房主电话
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
-                    remark: ''
+        remark: '' // 备注
       },
 
                 keyWords: '',
@@ -382,14 +382,14 @@
         ],
         remark: [
           { required: false }
-                    ],
+        ]
       }
     },
 
   },
   props: {}
-    }
+}
 </script>
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>

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: ''
                 }