From f505378ae913355d377abf2b36ca7d85c07ddd08 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 21 May 2021 09:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=8E=A5=E7=A7=8D=E7=99=BB=E8=AE=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=8E=A5=E7=A7=8D=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E5=88=97=EF=BC=8C=E6=8F=90=E5=89=8D=E5=B1=95=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 33 ++++++++++++-------
 .../modules/epidemic/epidemicuserinfo.vue     | 22 ++++++-------
 src/views/modules/vim/vaccinationinfo.vue     | 26 ++++++++++++---
 3 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 99eaa08..a211457 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -86,6 +86,17 @@
                        :value="item.dictValue">
             </el-option>
           </el-select>
+          <el-tooltip class="item" effect="light" placement="top-end">
+            <div slot="content">
+              未接种：从未接种过疫苗<br/>
+              接种中：接种过疫苗，但没有完成全程接种<br/>
+              接种完成：已经完成全程接种<br/>
+              接种过：有过接种疫苗记录，包括接种中和接种完成记录<br/>
+              第一针：没有完成全程接种，只接种过第一针<br/>
+              第二针：没有完成全程接种，接种过第一针和第二针<br/>
+            </div>
+            <i class="el-icon-question" />
+          </el-tooltip>
         </el-form-item>
 <!--        <el-form-item label="生产企业"-->
 <!--                      prop="company">-->
@@ -170,6 +181,17 @@
                          header-align="center"
                          align="center"
                          width="150"></el-table-column>
+        <el-table-column prop="isInoculate"
+                         label="是否接种"
+                         header-align="center"
+                         align="center"
+                         width="180">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.vaccinationState == '0'" size="small" type="danger">未接种</el-tag>
+            <el-tag v-if="scope.row.vaccinationState == '2'" size="small" type="success">接种完成</el-tag>
+            <el-tag v-if="scope.row.vaccinationState == '1'" size="small" type="success">第 {{scope.row.vaccinationNum}} 针</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="street"
                          label="街道/乡镇"
                          header-align="center"
@@ -224,17 +246,6 @@
                          header-align="center"
                          align="center"
                          width="180"></el-table-column>
-        <el-table-column prop="isInoculate"
-                         label="是否接种"
-                         header-align="center"
-                         align="center"
-                         width="180">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.vaccinationState == '0'" size="small" type="danger">未接种</el-tag>
-            <el-tag v-if="scope.row.vaccinationState == '2'" size="small" type="success">接种完成</el-tag>
-            <el-tag v-if="scope.row.vaccinationState == '1'" size="small" type="success">第 {{scope.row.vaccinationNum}} 针</el-tag>
-          </template>
-        </el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
diff --git a/src/views/modules/epidemic/epidemicuserinfo.vue b/src/views/modules/epidemic/epidemicuserinfo.vue
index 9d2516a..5880f43 100644
--- a/src/views/modules/epidemic/epidemicuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicuserinfo.vue
@@ -106,6 +106,17 @@
                          align="center"
                          width="120"
                          show-overflow-tooltip></el-table-column>
+        <el-table-column prop="vaccinationNum"
+                         label="是否接种"
+                         header-align="center"
+                         align="center"
+                         width="180">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.vaccinationState == '0'" size="small" type="danger">未接种</el-tag>
+            <el-tag v-if="scope.row.vaccinationState == '2'" size="small" type="success">接种完成</el-tag>
+            <el-tag v-if="scope.row.vaccinationState == '1'" size="small" type="success">第 {{scope.row.vaccinationNum}} 针</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="city"
                          label="县/区"
                          header-align="center"
@@ -151,17 +162,6 @@
                          header-align="center"
                          align="center"
                          width="100"></el-table-column>
-        <el-table-column prop="vaccinationNum"
-                         label="已接种"
-                         header-align="center"
-                         align="center"
-                         width="180">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.vaccinationState == '0'" size="small" type="danger">未接种</el-tag>
-            <el-tag v-if="scope.row.vaccinationState == '2'" size="small" type="success">接种完成</el-tag>
-            <el-tag v-if="scope.row.vaccinationState == '1'" size="small" type="success">第 {{scope.row.vaccinationNum}} 针</el-tag>
-          </template>
-        </el-table-column>
         <el-table-column prop="createdTime"
                          label="录入时间"
                          header-align="center"
diff --git a/src/views/modules/vim/vaccinationinfo.vue b/src/views/modules/vim/vaccinationinfo.vue
index e74e82b..3550d3c 100644
--- a/src/views/modules/vim/vaccinationinfo.vue
+++ b/src/views/modules/vim/vaccinationinfo.vue
@@ -60,6 +60,11 @@
         <el-form-item>
           <el-button type="primary" @click="beforeGetDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('demo:reportuserinfo:updateAge')"
+                     type="danger"
+                     @click="updateAddress()">更新地址</el-button>
+        </el-form-item>
         <!-- <el-form-item>
           <el-button type="primary"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -94,10 +99,10 @@
                          label="性别"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="county"
-                         label="县/区"
-                         header-align="center"
-                         align="center"></el-table-column>
+<!--        <el-table-column prop="county"-->
+<!--                         label="县/区"-->
+<!--                         header-align="center"-->
+<!--                         align="center"></el-table-column>-->
         <el-table-column prop="street"
                          label="街道/乡镇"
                          header-align="center"
@@ -270,6 +275,19 @@ export default {
         .catch(() => {
         })
     },
+    updateAddress () {
+      this.$http.get(`/sys/vaccinationinfo/updateAddress`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          this.$message({
+            message: '更新成功',
+            type: 'success',
+            duration: 1000
+          })
+        }
+      }).catch(() => { })
+    },
     vaccineState: function (row, column) {
       let choosenItem = this.compantyOptions.filter(item => item.value === row.vaccineId)[0]
       if (choosenItem !== undefined) {