From 9e69930684912a000b1c8f29e77dcebbe65f94f8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 13 Jun 2024 13:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=90=9C=E7=B4=A2=E8=B7=9F=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
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     | 33 +++++++++++++++--------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 7af85a4d3..7af8ce3a3 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -88,7 +88,7 @@
           <el-input v-model.trim="form[item.value]" class="u-item-width-service" placeholder="请输入" clearable size="small">
           </el-input>
         </el-form-item>
-        <el-form-item label="居民参加满意度调查次数">
+        <el-form-item label="满意度次数">
           <el-select v-model.trim="form.satisfactionNum" class="u-item-width-normal" clearable size="small">
             <template v-for="(item,index) in 6">
               <el-option :label='`${index}次`' :value='index'> </el-option>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 0e57eb9b0..c4115b7b8 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -118,14 +118,14 @@
               </a>
               <div v-else-if="item.columnName == 'gender'">
                 {{
-      scope.row.gender == null
-        ? "--"
-        : scope.row.gender == 1
-          ? "男"
-          : scope.row.gender == 2
-            ? "女"
-            : "--"
-    }}
+                  scope.row.gender == null
+                    ? "--"
+                    : scope.row.gender == 1
+                      ? "男"
+                      : scope.row.gender == 2
+                        ? "女"
+                        : "--"
+                }}
               </div>
 
 
@@ -163,14 +163,14 @@
                 <template v-if="scope.row.home">
                   <div>
                     {{
-      scope.row.home.resiHouseRel != null
-        ? scope.row.home.resiHouseRel == 0
-          ? "自住"
-          : scope.row.home.resiHouseRel == 1
-            ? "租住"
-            : ""
-        : ""
-    }}
+                      scope.row.home.resiHouseRel != null
+                        ? scope.row.home.resiHouseRel == 0
+                          ? "自住"
+                          : scope.row.home.resiHouseRel == 1
+                            ? "租住"
+                            : ""
+                        : ""
+                    }}
                   </div>
                 </template>
               </div>
@@ -365,6 +365,7 @@ export default {
         { columnName: "careerStatusName", label: "就业状况", width: 100 },
         { columnName: "resiHouseRel", label: "人房关系", width: 80 },
         // { columnName: "mobile", label: "联系电话", width: 110 },
+        { columnName: "statisfactionNum", label: "满意度次数", width: 100},
         { columnName: "updatedTime", label: "更新时间", width: 180 },
         { columnName: "updatedByName", label: "更新人", width: 80 },
       ],