Merge remote-tracking branch 'origin/feature/reset_state'

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()

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="女">女</el-radio>
-              <el-radio  label="1">男</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 '女'
               }
             }
           },