From cb0d589e667c96464d66219d364beb373493e035 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 17 Jun 2024 14:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8A=A5=E9=94=99,=E8=99=9A=E6=8B=9F=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E6=96=B0=E5=A2=9E=E8=B7=B3=E8=BD=AC=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue    |  2 +-
 src/views/modules/base/resi.vue        | 10 +++++-----
 src/views/modules/base/virtualResi.vue |  9 +++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index c5508e8c0..ca3e58948 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -601,7 +601,7 @@ export default {
       form: {
         name: '',
         mobile: '',
-        updateCategory:'',
+        updateCategory:null,
         satisfactionNum:null,
         idNum: '',
         birthdayStart: '',
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index a4e97e3c2..ec2e33f36 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -447,10 +447,8 @@ export default {
         categoryKey: "resi_info",
       },
     });
-    // this.handleSearchFrom();
   },
   activated() {
-    // this.handleSearchFrom();
   },
   methods: {
     mouseOverNode(event) {
@@ -1229,14 +1227,16 @@ export default {
       handler: function (newVal, oldVal) {
         if((newVal.name == "base-resi" || oldVal.name === 'home') && newVal.query.type){
           this.$nextTick(()=>{
-            this.$refs.myResiSearch.form.updateCategory = newVal.query.category;
+            this.$refs.myResiSearch.form.updateCategor = newVal.query.category;
             this.handleSearchFrom();
           })
           return
         }else{
-          this.$refs.myResiSearch.form.updateCategory ='';
+          this.$nextTick(()=>{
+            this.$refs.myResiSearch.form.updateCategory ='';
+          })
         }
-        if (newVal.name == "base-resi" && (oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) {
+        if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) {
           this.$nextTick(() => {
               this.$refs.myResiSearch.form.attentionCrowds = [];
               this.$refs.myResiSearch.form.healthStatus = [];
diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue
index 089a579f5..a0b45b201 100644
--- a/src/views/modules/base/virtualResi.vue
+++ b/src/views/modules/base/virtualResi.vue
@@ -898,10 +898,11 @@ export default {
         },
 
         async handleAdd() {
-            this.formType = 'add'
-            this.formName = "新增居民";
-            this.editUserId = "";
-            this.dialogVisible = true;
+            // this.formType = 'add'
+            // this.formName = "新增居民";
+            // this.editUserId = "";
+            // this.dialogVisible = true;
+            this.$router.push({ name: "add-resi" });
         },
 
         async handleChangeGroup(val) {