From 41490d6a55c4d9d33cbbedaad5d3c0ee07eb0c0a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 二月 2025 11:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/CNAS/process/ensureResultsValidity/index.vue |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/views/CNAS/process/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResultsValidity/index.vue
index 04828cc..d61209f 100644
--- a/src/views/CNAS/process/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/index.vue
@@ -92,7 +92,7 @@
       </div>
       <div>
         鎵瑰噯鎰忚锛�
-        <el-input v-model="approvalRemarks" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
+        <el-input v-model="ratifyRemark" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
       </div>
       <span v-if="this.ratifyStatus !== 1" slot="footer" class="dialog-footer">
         <el-button :loading="lookDialogLoading" @click="handleApproval(0)">涓嶆壒鍑�</el-button>
@@ -132,7 +132,7 @@
       </div>
       <div style="margin: 0 auto;">
         <el-upload ref="upload" :action="action" :auto-upload="false" :file-list="fileList"
-                   :headers="headers" :limit="1"
+                   :headers="uploadHeader" :limit="1"
                    accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
                    :on-change="beforeUpload" :on-error="onError" :on-success="handleSuccessUp" drag
                    :data="{planYear: planYear, examineUserId: examineUserId}"
@@ -148,13 +148,12 @@
     </el-dialog>
     <!--鐢熸垚鎶ュ憡寮规-->
     <el-dialog :visible.sync="uploadDia1" title="鐢熸垚鎶ュ憡" width="500px">
-      <div v-if="approvalRemarks">
+      <div v-if="ratifyRemark">
         鎵瑰噯鎰忚锛�
-        <el-input v-model="approvalRemarks" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
+        <el-input v-model="ratifyRemark" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
       </div>
       <div style="margin: 0 auto;">
-        <el-upload ref="upload1" :action="action1" :auto-upload="false"
-                   :data="{qualityMonitorDetailsId: qualityMonitorDetailsId}" :file-list="fileList1" :headers="headers"
+        <el-upload ref="upload1" :action="action1" :auto-upload="false" :data="{qualityMonitorDetailsId: qualityMonitorDetailsId}" :file-list="fileList1" :headers="uploadHeader"
                    :limit="1"
                    :on-change="beforeUpload1" :on-error="onError1" :on-success="onSuccess1" accept='.doc,.docx'
                    drag
@@ -185,7 +184,7 @@
   ratifyQualityMonitor
 } from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
 import {selectUserCondition} from "@/api/performance/class";
-import {getToken} from "@/utils/auth";
+import {mapGetters} from "vuex";
 
 export default {
   name: 'a7-Ensure-results-validity',
@@ -297,7 +296,7 @@
               name: '瀹℃牳',
               type: 'text',
               disabled: (row) => {
-                if (row.examineStatus === 1 || JSON.parse(localStorage.getItem("user")).userId != row.examineUserId) {
+                if (row.examineStatus === 1 || this.userId != row.examineUserId) {
                   return true
                 } else {
                   return false
@@ -311,7 +310,7 @@
               name: '鎵瑰噯',
               type: 'text',
               disabled: (row) => {
-                if (row.ratifyStatus === 1 || row.examineStatus !== 1 || JSON.parse(localStorage.getItem("user")).userId != row.ratifyUserId) {
+                if (row.ratifyStatus === 1 || row.examineStatus !== 1 || this.userId != row.ratifyUserId) {
                   return true
                 } else {
                   return false
@@ -469,13 +468,10 @@
       currentInfo: {},
       qualityMonitorDetailsId: '',
       ratifyStatus: '',
-      approvalRemarks: '',
+      ratifyRemark: '',
       downloadDialog: false,
       download: {},
-      planYear: '',
-      headers: {
-        Authorization: "Bearer " + getToken(),
-      },
+      planYear: ''
     };
   },
   mounted() {
@@ -612,7 +608,7 @@
     handleApproval (status) {
       const personTrainingUpdateDto = {
         qualityMonitorDetailsId: this.currentInfo.qualityMonitorDetailsId,
-        ratifyRemark: this.approvalRemarks,
+        ratifyRemark: this.ratifyRemark,
         ratifyStatus: status
       }
       this.lookDialogLoading = true
@@ -701,10 +697,10 @@
       this.carryOutDia = false
       this.getYearDetailPlanList()
     },
-    // 鎵撳紑鎶ュ憡寮规
+    // 鎵撳紑瀹屾垚鎶ュ憡寮规
     record (row) {
       this.qualityMonitorDetailsId = row.qualityMonitorDetailsId
-      this.approvalRemarks = row.approvalRemarks
+      this.ratifyRemark = row.ratifyRemark
       if (row.finishReportUrl) {
         this.currentInfo = row
         this.ratifyStatus = row.ratifyStatus
@@ -819,6 +815,7 @@
   },
   // 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
   computed: {
+    ...mapGetters(["userId"]),
     action() {
       return this.javaApi + '/qualityMonitor/importQualityMonitor'
     },

--
Gitblit v1.9.3