From d6955d1b664d93584437a7a25d7d0a80887e2c91 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 1 Apr 2022 16:07:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9A=84=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E6=9C=AA=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/epidemicreportuserinfo.vue       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/views/modules/epidemic/epidemicreportuserinfo.vue b/src/views/modules/epidemic/epidemicreportuserinfo.vue
index 7d2bc1c..b592c73 100644
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@@ -283,6 +283,9 @@
         <el-form-item>
           <el-button type="primary" @click="beforeImportUser">导入</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary"  @click="resetState">重置核酸检测状态</el-button>
+        </el-form-item>
         <el-form-item>
           <el-upload ref="upload"
                      :action="uploadUrl"
@@ -699,6 +702,39 @@ export default {
     }
   },
   methods: {
+    resetState(){
+      this.$confirm('此操作将重置所有人员的核酸检测状态为未检测, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          fullscreen: true,
+          text: '操作中请稍后',
+          background:'rgba(0, 0, 0, 0.8)'
+        });
+
+        this.$http['post']('/custom/epidemicuserinfo/resetUserCheckState').then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              loading.close();
+              this.getDataList()
+            }
+          })
+        }).catch(() => {
+        })
+
+      }).catch(() => {
+
+      });
+    },
     importResult () {
       this.faultDataVisible = false
       this.getDataList()

From 02aebcfe555eb0b273eb8a944a0cf2b5db0da1b9 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Sat, 2 Apr 2022 10:39:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=20=E6=80=A7=E5=88=AB=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/epidemic/persontesting-add-or-update.vue      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/epidemic/persontesting-add-or-update.vue b/src/views/modules/epidemic/persontesting-add-or-update.vue
index cc7d9ad..fd33560 100644
--- a/src/views/modules/epidemic/persontesting-add-or-update.vue
+++ b/src/views/modules/epidemic/persontesting-add-or-update.vue
@@ -17,8 +17,8 @@
           </el-form-item>
           <el-form-item label="性别" prop="sex" label-width="120px">
             <el-radio-group v-model="dataForm.sex" disabled>
-              <el-radio  label="0">女</el-radio>
-              <el-radio  label="1">男</el-radio>
+              <el-radio  label="女">女</el-radio>
+              <el-radio  label="男">男</el-radio>
             </el-radio-group>
           </el-form-item>
             <!--          <el-form-item label="民族" prop="nation" label-width="120px">-->
@@ -235,10 +235,10 @@
               // 获取性别
               if (parseInt(UUserCard.substr(16, 1)) % 2 === 1) {
                 // 男
-                return '1'
+                return '男'
               } else {
                 // 女
-                return '0'
+                return '女'
               }
             }
           },