From b2b0b6d5ffcc557f2d0ee87fe71afa91aa110ed5 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 22 Apr 2024 19:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E5=88=97=E8=A1=A8=E4=B8=8D=E7=94=9F=E6=95=88,?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5=E5=AD=97=E6=AE=B5=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue              | 8 ++++----
 src/views/modules/base/smartImport/index.vue | 2 +-
 src/views/modules/home/index.vue             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 55e81ea73..36a27bc17 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -445,7 +445,7 @@ export default {
     // this.handleSearchFrom();
   },
   activated() {
-    this.handleSearchFrom();
+    // this.handleSearchFrom();
   },
   methods: {
     mouseOverNode(event) {
@@ -1193,9 +1193,9 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        if (newVal.name == "base-resi" && oldVal.name!='edit-resi') {
+        if (newVal.name == "base-resi" && !oldVal) {
           this.$nextTick(() => {
-            this.$refs.myResiSearch.form.attentionCrowds = [];
+              this.$refs.myResiSearch.form.attentionCrowds = [];
               this.$refs.myResiSearch.form.healthStatus = [];
               this.$refs.myResiSearch.form.specialCategoryCodes = [];
               this.$refs.myResiSearch.form.partyFlag=null;
@@ -1212,7 +1212,7 @@ export default {
             }else if(newVal.params.category === 'PARTY_FLAG'){
               this.$refs.myResiSearch.form.partyFlag =1;
             }
-            this.handleSearchFrom();
+          this.handleSearchFrom();
           });
         }
       },
diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue
index 811eb4436..bf55f2818 100644
--- a/src/views/modules/base/smartImport/index.vue
+++ b/src/views/modules/base/smartImport/index.vue
@@ -4,7 +4,7 @@
       <div class="m-search">
         <el-form  :inline="true" :model="formData"  :label-width="'100px'">
         <el-form-item label="任务类型">
-            <el-select v-model.trim="formData.importCategory" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
+            <el-select v-model.trim="formData.importCategoryName" placeholder="请输入" size="small" class="u-item-width-normal" clearable>
               <el-option v-for="item in dicts.resident_category_import" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index a61a094db..045914bcc 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -157,7 +157,7 @@
             </el-table-column>
             <el-table-column label="总人数" width="105" align="center">
               <template slot-scope="scope">
-                  <span style="color:#006fd6" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
+                  <span style="color:#006fd6;cursor: pointer;" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
               </template>
             </el-table-column>
             <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">