From f880d10c22e01c9bc2d3f6f5020bb868c98f298c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Fri, 23 Sep 2022 16:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=B3=E5=8A=A1=E7=AE=A1=E7=90=86(=E9=98=B2?=
 =?UTF-8?q?=E7=96=AB=E7=AE=A1=E7=90=86):=E6=8F=90=E4=BA=A4=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laborManage/EpidemicPrevention/index.vue  | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
index 99ac7190..4cc6558f 100644
--- a/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
+++ b/src/views/projectFront/laborManage/EpidemicPrevention/index.vue
@@ -236,8 +236,8 @@
                   :value="item.value"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="vaccineForm.remark" type="textarea" placeholder="可备注疫苗厂商"
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model="vaccineForm.remarks" type="textarea" placeholder="可备注疫苗厂商"
                 :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
             </el-form-item>
             <el-form-item style="display: flex;justify-content: flex-end;">
@@ -276,7 +276,7 @@
               <span class="value">{{ vaccineStatusEnum[row.needleTimes] }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="remark" label="备注"></el-table-column>
+          <el-table-column align="center" prop="remarks" label="备注"></el-table-column>
         </template>
       </el-table>
     </el-dialog>
@@ -311,6 +311,7 @@ import {
 export default {
   components: {},
   data: () => ({
+    workerId:'',
     // 3 衢州版 2 星璇版 1 正常版本
     styleType:'',
     // 项目SN
@@ -498,7 +499,7 @@ export default {
       this.vaccineForm = {
         inoculationTime: null,
         needleTimes: undefined,
-        remark: undefined,
+        remarks: undefined,
       },
       this.resetForm('nucleicAcidForm');
       this.resetForm('vaccineForm');
@@ -541,19 +542,20 @@ export default {
     /** 更新 */
     handleUpdate(row, title) {
       console.log('row: ', row);
+      this.workerId = row.id
       this.title = title;
       this.reset();
       this.detailLoading = true;
       // 核酸时间
       if (title.includes('核酸')) {
-        workerNucleicAcidDetectionList({ workerId: row.id }).then(res => {
+        workerNucleicAcidDetectionList({ workerId: this.workerId }).then(res => {
           console.log('查询人员新冠核酸检测记录: ', res);
           this.detailList = res.result;
           this.detailLoading = false;
           this.open = true;
         })
       } else {
-        workerVaccineInoculationList({ workerId: row.id }).then(res => {
+        workerVaccineInoculationList({ workerId: this.workerId}).then(res => {
           console.log('查询人员疫苗接种记录: ', res);
           this.detailList = res.result;
           this.detailLoading = false;
@@ -609,10 +611,14 @@ export default {
     submitNucleicAcidForm: function() {
       this.$refs['nucleicAcidForm'].validate(valid => {
         if (!valid) return
-        addWorkerNucleicAcidDetection(this.nucleicAcidForm).then(res => {
-          this.$message.success('提交成功');
+        let data  = this.nucleicAcidForm
+        data.workerId = this.workerId
+        addWorkerNucleicAcidDetection(data).then(res => {
+          if(res.code == 200 ){
+            this.$message.success('提交成功');
           this.getList();
           this.cancel()
+          }
         })
       })
     },
@@ -620,11 +626,14 @@ export default {
     submitVaccineForm: function() {
       this.$refs['vaccineForm'].validate(valid => {
         if (!valid) return
-        console.log('this.vaccineForm: ', this.vaccineForm);
-        addWorkerVaccineInfo(this.vaccineForm).then(res => {
-          this.$message.success('提交成功');
+        let data  = this.vaccineForm
+        data.workerId = this.workerId
+        addWorkerVaccineInfo(data).then(res => {
+          if(res.code == 200){
+            this.$message.success('提交成功');
           this.getList();
           this.cancel()
+          }
         })
       })
     },