合并分支

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

@@ -48,6 +48,7 @@
           <div class="resi-cell-label">房主手机</div>
           <div class="resi-cell-value">
             <el-input v-model="ownerPhone"
+                      class="resi-cell-input"
                       size="small"
                       clearable
                       placeholder="请输入内容">
@@ -99,7 +100,6 @@
 
           </div>
         </div>
-
         <el-button style="margin-left:10px"
                    class="diy-button--search"
                    size="small"

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

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

@@ -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,7 +812,7 @@ export default {
             remark: {
                 type: String,
                 default: '',
-      }
+            },
         }
     }
 </script>