Merge remote-tracking branch 'origin/master' into dev-z0525

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

@@ -210,7 +210,7 @@ export default {
         this.showRoomTable = true
 
         this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag)
+          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
         })
       } else {
         this.$message.warning('请输入查询条件')

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

@@ -209,9 +209,7 @@ export default {
       // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的小区对象
-      ownerName: '',
-      ownerPhone: '',
-      rentFlag: '',
+
 
       validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
       selection: [],
@@ -262,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()
 
@@ -283,7 +281,7 @@ export default {
 
     async handleChangeSort (row, index) {
       // row.isChange = false
-      console.log(row.sort)
+
       let params = {
         id: row.houseId,
         sort: row.sort,
@@ -323,7 +321,7 @@ export default {
 
     },
 
-    async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) {
+    async loadTable (source, treeObj) {
 
       this.source = source
       this.tableLoading = true
@@ -331,14 +329,10 @@ export default {
       if (source === 'tree') {//来源于tree，查询数据清空
         this.sortType = 'asc'
         this.agencyObj = treeObj
-        this.ownerName = null
-        this.ownerPhone = null
-        this.rentFlag = null
+
       } else if (source === 'search') {//来源于查询
         this.agencyObj = treeObj
-        this.ownerName = ownerName
-        this.ownerPhone = ownerPhone
-        this.rentFlag = rentFlag
+
       }
 
       // if (fromTree) {
@@ -403,7 +397,7 @@ export default {
       this.formTitle = '新增房屋'
       this.formShow = true
       this.$nextTick(() => {
-        console.log(this.agencyObj)
+
         this.$refs.ref_form.initForm('add', null, this.agencyObj)
       })
     },
@@ -618,16 +612,39 @@ export default {
       let url = "/gov/org/house/exportHouseUser"
 
 
+
       let params = {
         agencyId: '',
         gridId: '',
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,
         rentFlag: this.rentFlag,
-        buildingId: this.agencyObj.id
+        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(
         url,

src/views/modules/base/huji/immigration/edit.vue

@@ -142,14 +142,23 @@
           >
           </el-input>
 
-          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0" :disabled="formType === 'edit'"
-            >享受福利</el-checkbox
-          >
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0">享受福利</el-checkbox>
+          <template v-if="formType === 'edit'">
+            <el-checkbox
+              v-model="fmData.isCheck"
+              true-label="1"
+              false-label="0"
+              :disabled="initCheck == 1"
+              @change="checkResiAvailable"
+              >补充居民信息</el-checkbox
+            >
+          </template>
+          
           <el-checkbox
+            v-else
             v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
-            :disabled="formType === 'edit'"
             @change="checkResiAvailable"
             >补充居民信息</el-checkbox
           >
@@ -421,7 +430,8 @@ export default {
         lazy: true,
         lazyLoad: this.lzayLoadArea
       },
-      userInfo: {}
+      userInfo: {},
+      initCheck: null
     }
   },
   components: {},
@@ -777,6 +787,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.fmData = { ...data }
+        this.initCheck = data.isCheck
         this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
       } else this.$message.error(msg)
     },