From c34a8eb69e50f5caf4e78ea07f874fc948af67bc Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 26 Oct 2022 09:42:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=AC=E8=BE=96?=
 =?UTF-8?q?=E5=8C=BA=E5=B1=85=E6=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/epidemic/natInfo/natList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 947399282..609c6d914 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -412,7 +412,7 @@ export default {
 
         this.tableData.forEach(item => {
 
-          item.isResiUserShow = item.isResiUser === '0' ? '否' : '是'
+          item.isResiUserShow = item.isLocalResiUser === '0' ? '否' : '是'
           if (item.natResult === '1') {
             item.natResultShow = '阳性'
           } else if (item.natResult === '0') {

From 54544f9931fd6af7a1ca9d2fd38e532dbbf62801 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 26 Oct 2022 14:07:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/community.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 074edc48e..4507abb30 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -127,6 +127,7 @@
                 <div class="resi-cell-col">
                   <el-form-item prop="neighborHoodId">
                     <el-select v-model.trim="neighborHoodId"
+                               :disabled="vDisabled"
                                placeholder="小区"
                                size="small"
                                clearable
@@ -142,7 +143,7 @@
                   <el-form-item prop="buildingId">
                     <el-select v-model.trim="buildingId"
                                placeholder="楼号"
-                               :disabled="!neighborHoodId"
+                               :disabled="!neighborHoodId || bDisabled"
                                size="small"
                                clearable
                                class="resi-cell-select resi-cell-select-middle list_item_width_1"
@@ -343,7 +344,10 @@ export default {
       buildingUnitId: "",
       houseId: "",
       selGridId: '',
-      selAgencyId: ''
+      selAgencyId: '',
+
+      vDisabled: false,
+      bDisabled: false,
     }
   },
   components: {
@@ -598,7 +602,8 @@ export default {
       this.selObj = JSON.parse(JSON.stringify(obj))
       this.getTreeObj(obj)
       await nextTick(1000)
-
+      this.vDisabled = false
+      this.bDisabled = false
       if (obj.level === 'building') {//点击楼栋
         this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
         this.selAgencyId = ''
@@ -608,7 +613,8 @@ export default {
         await this.getBuildList()
         this.buildingId = this.selTreeObj.id
         await this.getUniList()
-
+        this.vDisabled = true
+        this.bDisabled = true
 
       } else if (obj.level === 'neighborHood') {//点击小区
         this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
@@ -617,7 +623,7 @@ export default {
         await this.getValiheList()
         this.neighborHoodId = this.selTreeObj.id
         await this.getBuildList()
-
+        this.vDisabled = true
       } else {
         this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)