合并分支

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

@@ -79,8 +79,13 @@
           <div class="resi-cell-label">房屋用途</div>
           <div class="resi-cell-value">
 
-            <el-select v-model="purpose" placeholder="房屋用途" clearable>
-              <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            <el-select v-model="purpose"
+                       placeholder="房屋用途"
+                       clearable>
+              <el-option v-for="item in purposeArr"
+                         :key="item.dictValue"
+                         :label="item.dictName"
+                         :value="item.dictValue">
               </el-option>
             </el-select>
 
@@ -99,7 +104,6 @@
 
           </div>
         </div>
-
         <el-button style="margin-left:10px"
                    class="diy-button--search"
                    size="small"
@@ -147,16 +151,16 @@
 </template>
 
 <script>
-    import CDialog from '@c/CDialog'
-    import communityTable from './communityTable'
-    import buildTable from './buildTable'
-    import roomTable from './roomTable'
-    import { requestPost } from "@/js/dai/request";
-    import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
-
-    let loading // 加载动画
-    export default {
+import CDialog from '@c/CDialog'
+import communityTable from './communityTable'
+import buildTable from './buildTable'
+import roomTable from './roomTable'
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
   data () {
     return {
       filterText: '',
@@ -475,63 +479,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

@@ -115,6 +115,7 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
+                    maxlength="30"
                     placeholder="请输入备注"
                     v-model="dataForm.remark">
           </el-input>
@@ -135,13 +136,13 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
-    import { requestPost, requestGet } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
 
 
-    let loading // 加载动画
-    export default {
+let loading // 加载动画
+export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
@@ -387,8 +388,8 @@
 
   },
   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

@@ -188,14 +188,14 @@
 
 <script>
 
-import roomForm from './roomForm'
+    import roomForm from './roomForm'
 
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost } from "@/js/dai/request";
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
 
-let loading // 加载动画
-export default {
+    let loading // 加载动画
+    export default {
         data () {
             return {
                 source: 'tree',//来源
@@ -209,11 +209,7 @@ export default {
                 // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
                 agencyObj: {},//树所选的小区对象
-      ownerName: '',
-      ownerPhone: '',
-      rentFlag: '',
-        purpose: '',
-        remark: '',
+
 
                 validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
                 selection: [],
@@ -264,13 +260,13 @@ export default {
                 return index + 1;
             },
             handleSortOrderChange (value) {
-      console.log(value.column, value.prop, value.order)
+
                 this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
                 this.loadTable()
 
             },
             handleSortChange (value) {
-      console.log(value.column, value.prop, value.order)
+
                 this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
                 this.loadTable()
 
@@ -285,7 +281,7 @@ export default {
 
             async handleChangeSort (row, index) {
                 // row.isChange = false
-      console.log(row.sort)
+
                 let params = {
                     id: row.houseId,
                     sort: row.sort,
@@ -325,7 +321,7 @@ export default {
 
             },
 
-    async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag, purpose, remark) {
+            async loadTable (source, treeObj) {
 
                 this.source = source
                 this.tableLoading = true
@@ -333,18 +329,10 @@ export default {
                 if (source === 'tree') {//来源于tree，查询数据清空
                     this.sortType = 'asc'
                     this.agencyObj = treeObj
-        this.ownerName = null
-        this.ownerPhone = null
-        this.rentFlag = null
-          this.purpose = null
-          this.remark = null
+
                 } else if (source === 'search') {//来源于查询
                     this.agencyObj = treeObj
-        this.ownerName = ownerName
-        this.ownerPhone = ownerPhone
-        this.rentFlag = rentFlag
-          this.purpose = purpose
-          this.remark = remark
+
                 }
 
                 // if (fromTree) {
@@ -359,9 +347,9 @@ export default {
                     ownerName: this.ownerName,
                     ownerPhone: this.ownerPhone,
                     rentFlag: this.rentFlag,
-        sortType: this.sortType,
                     purpose: this.purpose,
-        remark: this.remark
+                    remark: this.remark,
+                    sortType: this.sortType,
                 }
 
                 const url = "/gov/org/house/houselist"
@@ -411,7 +399,7 @@ export default {
                 this.formTitle = '新增房屋'
                 this.formShow = true
                 this.$nextTick(() => {
-        console.log(this.agencyObj)
+
                     this.$refs.ref_form.initForm('add', null, this.agencyObj)
                 })
             },
@@ -628,15 +616,40 @@ export default {
                 let url = "/gov/org/house/exportHouseUser"
 
 
+
                 let params = {
                     agencyId: '',
                     gridId: '',
                     ownerName: this.ownerName,
                     ownerPhone: this.ownerPhone,
-        rentFlag: this.rentFlag,
                     purpose: this.purpose,
                     remark: this.remark,
-        buildingId: this.agencyObj.id
+                    rentFlag: this.rentFlag,
+                    buildingId: '',
+                    neighborHoodId: ''
+                }
+
+                if (this.agencyObj.level === 'grid') {
+                    params.gridId = this.agencyObj.id
+                    params.agencyId = ''
+                    params.buildingId = ''
+                    params.neighborHoodId = ''
+                } else if (this.agencyObj.level === 'neighborHood') {
+                    params.neighborHoodId = this.agencyObj.id
+                    params.agencyId = ''
+                    params.buildingId = ''
+                    params.gridId = ''
+                } else if (this.agencyObj.level === 'building') {
+                    params.buildingId = this.agencyObj.id
+                    params.agencyId = ''
+                    params.neighborHoodId = ''
+                    params.gridId = ''
+                } else {
+
+                    params.agencyId = this.agencyObj.id
+                    params.buildingId = ''
+                    params.neighborHoodId = ''
+                    params.gridId = ''
                 }
 
                 app.ajax.exportFilePost(
@@ -799,23 +812,23 @@ export default {
             remark: {
                 type: String,
                 default: '',
+            },
         }
     }
-}
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
+  @import "@/assets/scss/modules/visual/communityManage.scss";
 
-.item_width_4 {
+  .item_width_4 {
     width: 120px;
-}
+  }
 
-/deep/.el-input-number--medium .el-input-number__decrease,
-/deep/.el-input-number--medium .el-input-number__increase {
+  /deep/.el-input-number--medium .el-input-number__decrease,
+  /deep/.el-input-number--medium .el-input-number__increase {
     width: 26px;
-}
-/deep/.el-input-number--medium .el-input__inner {
+  }
+  /deep/.el-input-number--medium .el-input__inner {
     padding-left: 0px;
     padding-right: 0px;
-}
+  }
 </style>