From c415cd152c1a3a0deb4570512a893826deb84527 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 13 Sep 2021 10:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9F=A5=E8=AF=A2=E5=92=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       |  1 -
 .../modules/epidemic/epidemicuserinfo.vue     | 46 ++++++++-----------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 3288e3e..793e70e 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -377,7 +377,6 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        activatedIsNeed: false,
         getDataListURL: '/custom/epidemicuserinfo/page',
         getDataListIsPage: true,
         deleteURL: '/custom/epidemicuserinfo',
diff --git a/src/views/modules/epidemic/epidemicuserinfo.vue b/src/views/modules/epidemic/epidemicuserinfo.vue
index 7e10cf6..01d35a3 100644
--- a/src/views/modules/epidemic/epidemicuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicuserinfo.vue
@@ -6,9 +6,9 @@
                :model="dataForm"
                @keyup.enter.native="beforeGetDataList()">
         <el-form-item label="姓名"
-                      prop="residentsName"
+                      prop="userName"
                       label-width="90px">
-          <el-input v-model="dataForm.residentsName"
+          <el-input v-model="dataForm.userName"
                     placeholder="姓名"
                     clearable
                     maxlength="49"
@@ -16,9 +16,9 @@
                     style="width:200px"></el-input>
         </el-form-item>
         <el-form-item label="身份证"
-                      prop="residentsIdentityNo"
+                      prop="idCard"
                       label-width="90px">
-          <el-input v-model="dataForm.residentsIdentityNo"
+          <el-input v-model="dataForm.idCard"
                     placeholder="身份证"
                     clearable
                     maxlength="49"
@@ -26,9 +26,9 @@
                     style="width:200px"></el-input>
         </el-form-item>
         <el-form-item label="手机号"
-                      prop="residentsPhone"
+                      prop="mobile"
                       label-width="70px">
-          <el-input v-model="dataForm.residentsPhone"
+          <el-input v-model="dataForm.mobile"
                     placeholder="手机号"
                     clearable
                     maxlength="11"
@@ -100,34 +100,34 @@
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <el-table-column prop="residentsName"
+        <el-table-column prop="userName"
                          label="姓名"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
                          width="75"></el-table-column>
-        <el-table-column prop="residentsIdentityNo"
+        <el-table-column prop="idCard"
                          label="身份证号"
                          header-align="center"
                          align="center"
                          width="165"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column prop="residentsPhone"
+        <el-table-column prop="mobile"
                          label="联系方式"
                          header-align="center"
                          align="center"
                          width="110"></el-table-column>
-        <el-table-column prop="residentsSex"
+        <el-table-column prop="gender"
                          label="性别"
                          header-align="center"
                          align="center"
                          width="65">
                          <template slot-scope="scope">
-                          <el-tag v-if="scope.row.residentsSex == '0'" size="small" type="success">女</el-tag>
-                          <el-tag v-if="scope.row.residentsSex == '1'" size="small" type="success">男</el-tag>
+                          <el-tag v-if="scope.row.gender == '0'" size="small" type="success">女</el-tag>
+                          <el-tag v-if="scope.row.gender == '1'" size="small" type="success">男</el-tag>
                          </template>
         </el-table-column>
-        <el-table-column prop="residentsBirthday"
+        <el-table-column prop="birthday"
                          label="出生年月"
                          header-align="center"
                          align="center"
@@ -144,23 +144,16 @@
             <el-tag v-if="scope.row.vaccinationState == '1'" size="small" type="yellow">第 {{scope.row.vaccinationNum}} 针</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="householdRegistrationPlace"
-                         label="户籍"
+        <el-table-column prop="liveAddressName"
+                         label="居住地名称"
                          header-align="center"
                          align="center"
-                         show-overflow-tooltip width="220"></el-table-column>
-        <el-table-column prop="houseAddress"
-                         label="居住地址"
+                         show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="所属组织"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip></el-table-column>
-        
-        <!-- <el-table-column prop="gridName"
-                         label="网格名称"
-                         header-align="center"
-                         align="center"
-                         width="110"></el-table-column> -->
-        
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -234,8 +227,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        activatedIsNeed: false,
-        getDataListURL: '/custom/epidemicuserinfo/v2/getEpidemicPage',
+        getDataListURL: '/custom/epidemicuserinfo/getEpidemicPage',
         getDataListIsPage: true,
         deleteURL: '/custom/epidemicuserinfo',
         deleteIsBatch: true,