From e8aa606cc05325fcf5453b7e87ff217c564a9bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 13 Mar 2023 16:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9B=B8=E5=85=B3=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 4c7d815..451bbac 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -76,7 +76,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="核酸检测状态"
+            <!-- <el-form-item label="核酸检测状态"
                           prop="checkState"
                           label-width="120px">
               <el-select v-model="dataForm.checkState"
@@ -114,7 +114,7 @@
                 </div>
                 <i class="el-icon-question" />
               </el-tooltip>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="有无所属组织"
                           prop="haveDept"
                           label-width="120px">
@@ -505,11 +505,11 @@
                      v-if="$hasPermission('epidemic:person:export')"
                      @click="exports()">{{ $t('export') }}</el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button v-if="$hasPermission('epidemicreportuserinfo:reset')"
                      type="primary"
                      @click="resetState">重置核酸检测状态</el-button>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item>
           <el-button type="danger"
@@ -600,21 +600,22 @@
                          align="center"
                          width="150"></el-table-column>
 
-        <el-table-column prop="checkStateName"
-                         label="核酸检测状态"
+        
+                <el-table-column prop="householdRegisterName"
+                                 label="户籍地">
+                                 header-align="center"
+                                 align="center"
+                                 width="150"></el-table-column>
+                <el-table-column prop="hushaiStatus"
+                         label="户籍状态"
                          header-align="center"
                          align="center"
                          width="150"></el-table-column>
-        <!--        <el-table-column prop="householdRegisterName"-->
-        <!--                         label="户籍地"-->
-        <!--                         header-align="center"-->
-        <!--                         align="center"-->
-        <!--                         width="150"></el-table-column>-->
-        <!--        <el-table-column prop="outLiveAddressName"-->
-        <!--                         label="现居住地名称"-->
-        <!--                         header-align="center"-->
-        <!--                         align="center"-->
-        <!--                         width="150"></el-table-column>-->
+                <!-- <el-table-column prop="outLiveAddressName"
+                                 label="现居住地名称"
+                                 header-align="center"
+                                 align="center"
+                                 width="150"></el-table-column> -->
         <!--        <el-table-column prop="street"-->
         <!--                         label="街道/乡镇"-->
         <!--                         header-align="center"-->
@@ -660,16 +661,16 @@
                          align="center"
                          :formatter="peopleCategoriesFormat"
                          width="180"></el-table-column> -->
-        <el-table-column prop="isInoculate"
+        <!-- <el-table-column prop="isInoculate"
                          label="是否接种"
                          header-align="center"
                          align="center"
                          width="180">
-          <template slot-scope="scope">
+          <template slot-scope="scope"> -->
             <!-- <el-tag size="small" :type="scope.row.vaccinationState === 0 ? 'danger' : 'success'">
               {{scope.row.vaccinationState === 2 ? '接种完成' : scope.row.vaccinationState === 0 ? '未接种' : '第'+scope.row.vaccinationNum+'针'}}
             </el-tag> -->
-            <el-tag v-if='scope.row.vaccinationState === 0'
+            <!-- <el-tag v-if='scope.row.vaccinationState === 0'
                     size="small"
                     type="danger">未接种</el-tag>
             <el-tag v-else-if='scope.row.vaccinationState === 1'
@@ -679,13 +680,13 @@
                     size="small"
                     type="success">接种完成</el-tag>
           </template>
-        </el-table-column>
-        <el-table-column prop="specialCrowd"
+        </el-table-column> -->
+        <!-- <el-table-column prop="specialCrowd"
                          label="特殊人群"
                          header-align="center"
                          align="center"
                          :formatter="specialCrowdFormat"
-                         width="180"></el-table-column>
+                         width="180"></el-table-column> -->
 
         <el-table-column :label="$t('handle')"
                          fixed="right"