From 9d4f8432efa8b500902fdfbef02100e6be90222e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Fri, 8 Nov 2024 19:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NavigationBar/peopleCentre.vue | 28 +++++++++++++++----
 .../NavigationBar/warningCentre.vue           | 22 +++++++++++----
 src/views/components/xiaoqu/bottomList.vue    |  4 ++-
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/components/NavigationBar/peopleCentre.vue b/src/components/NavigationBar/peopleCentre.vue
index 547b362..9f4e130 100644
--- a/src/components/NavigationBar/peopleCentre.vue
+++ b/src/components/NavigationBar/peopleCentre.vue
@@ -101,6 +101,16 @@
         </el-option>
       </el-select>
 
+      <el-select v-model="queryParams.mzcgf" placeholder="选择民族" clearable>
+        <el-option
+          v-for="dict in dict.type.sys_nationality"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        >
+        </el-option>
+      </el-select>
+
       <el-radio v-model="queryParams.type" :label="1">户籍</el-radio>
       <el-radio v-model="queryParams.type" :label="2">流动</el-radio>
 
@@ -262,8 +272,8 @@
           <div>数据更新时间</div>
           <div>{{ infoData.updateTime || "/" }}</div>
 
-          <div class="no-left">参保单位</div>
-          <div>{{ infoData.qymc || "/" }} 天</div>
+          <div class="no-left">社保联系电话</div>
+          <div>{{ infoData.lxdh || "/" }}</div>
           <div>参保类型</div>
           <div>
             <dict-tag
@@ -279,8 +289,8 @@
             />
           </div>
 
-          <div>社保联系电话</div>
-          <div style="width: 80%">{{ infoData.lxdh || "/" }}</div>
+          <div>参保单位</div>
+          <div style="width: 80%">{{ infoData.qymc || "/" }}</div>
 
           <div>社保联系地址</div>
           <div style="width: 80%">{{ infoData.lxdzDzmc || "/" }}</div>
@@ -361,6 +371,7 @@ export default {
         color: undefined,
         type: undefined,
         qymc: undefined,
+        mzcgf: undefined,
         pageNum: 1,
         pageSize: 20,
       },
@@ -478,7 +489,9 @@ export default {
       }
       if (this.currentIndex == 1) this.queryParams.phone = this.keyWord;
       if (this.currentIndex == 2) this.queryParams.name = this.keyWord;
-      if (this.currentIndex == 3) this.queryParams.qymc = this.keyWord;
+      if (this.currentIndex == 3)
+        this.queryParams.qymc = this.keyWord ? this.keyWord : "null";
+
       this.load();
     },
 
@@ -530,7 +543,10 @@ export default {
       this.queryParams.yuanid = undefined;
       this.queryParams.buildingId = undefined;
       this.queryParams.houseid = undefined;
-      (this.queryParams.qymc = undefined), (this.colorList = []);
+      this.queryParams.mzcgf = undefined;
+
+      this.queryParams.qymc = undefined;
+      this.colorList = [];
       this.isCheck = [];
       this.reset();
       this.load();
diff --git a/src/components/NavigationBar/warningCentre.vue b/src/components/NavigationBar/warningCentre.vue
index e063cdd..07e12d2 100644
--- a/src/components/NavigationBar/warningCentre.vue
+++ b/src/components/NavigationBar/warningCentre.vue
@@ -101,6 +101,16 @@
         </el-option>
       </el-select>
 
+      <el-select v-model="queryParams.mzcgf" placeholder="选择民族" clearable>
+        <el-option
+          v-for="dict in dict.type.sys_nationality"
+          :key="dict.value"
+          :label="dict.label"
+          :value="dict.value"
+        >
+        </el-option>
+      </el-select>
+
       <el-radio v-model="queryParams.mark" label="">全部</el-radio>
       <el-radio v-model="queryParams.mark" label="ninety">3个月</el-radio>
       <el-radio v-model="queryParams.mark" label="eighty">半年</el-radio>
@@ -223,7 +233,7 @@
           <div class="border-top">社区名称</div>
           <div class="border-top">{{ infoData.shequ_name }}</div>
           <div class="border-top no-left">姓名</div>
-          <div class="border-top">{{ infoData.name }}</div>
+          <div class="border-top">{{ infoData.pname }}</div>
           <div>小区名称</div>
           <div>{{ infoData.xiaoqu_name }}</div>
           <div class="no-left">身份证号</div>
@@ -264,8 +274,8 @@
           <div>{{ infoData.updateTime || "/" }}</div>
           <div>未更新天数</div>
           <div>{{ infoData.daycount || "/" }} 天</div>
-          <div class="no-left">参保单位</div>
-          <div>{{ infoData.qymc || "/" }} 天</div>
+          <div class="no-left">社保联系电话</div>
+          <div>{{ infoData.lxdh || "/" }}</div>
           <div>参保类型</div>
           <div>
             <dict-tag
@@ -281,8 +291,8 @@
             />
           </div>
 
-          <div>社保联系电话</div>
-          <div style="width: 80%">{{ infoData.lxdh || "/" }}</div>
+          <div>参保单位</div>
+          <div style="width: 80%">{{ infoData.qymc || "/" }}</div>
 
           <div>社保联系地址</div>
           <div style="width: 80%">{{ infoData.lxdzDzmc || "/" }}</div>
@@ -356,6 +366,7 @@ export default {
         // phone: undefined,
         // name: undefined,
         color: undefined,
+        mzcgf: undefined,
         // type: undefined,
         mark: "",
         pageNum: 1,
@@ -511,6 +522,7 @@ export default {
           : undefined;
       this.queryParams.parentid = undefined;
       this.queryParams.yuanid = undefined;
+      this.queryParams.mzcgf = undefined;
       this.queryParams.buildingId = undefined;
       this.queryParams.houseid = undefined;
 
diff --git a/src/views/components/xiaoqu/bottomList.vue b/src/views/components/xiaoqu/bottomList.vue
index 95df368..93858a1 100644
--- a/src/views/components/xiaoqu/bottomList.vue
+++ b/src/views/components/xiaoqu/bottomList.vue
@@ -290,7 +290,9 @@ export default {
   > .body-rows[data-v-a33623d4]:nth-child(even) {
   background: rgba(0, 169, 255, 0.15);
 }
-
+.table-body {
+  background: rgba(15, 42, 79, 1);
+}
 .typeis {
   height: 18px;
   width: 18px;