From c67a8c5b44524e06cd58d9751e4b72aa62954412 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 13:48:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/process/ensureResultsValidity/index.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/CNAS/process/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResultsValidity/index.vue
index 7630d0b..c7f1316 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>
@@ -101,8 +101,8 @@
</el-dialog>
<el-dialog :visible.sync="downloadDialog" title="瀵煎嚭" width="600px">
<span>
- <el-button plain type="primary" @click="controlDown">瀹炴柦璁″垝瀵煎嚭</el-button>
- <el-button plain type="primary" @click="processingDown">璇勪环瀵煎嚭</el-button>
+ <el-button plain type="primary" :disabled="!download.qualityMonitorDetailsId" @click="controlDown">瀹炴柦璁″垝瀵煎嚭</el-button>
+ <el-button plain type="primary" :disabled="!download.qualityMonitorDetailsId" @click="processingDown">璇勪环瀵煎嚭</el-button>
</span>
<span slot="footer" class="dialog-footer">
<el-button @click="downloadDialog = false">鍙� 娑�</el-button>
@@ -148,9 +148,9 @@
</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="uploadHeader"
@@ -468,7 +468,7 @@
currentInfo: {},
qualityMonitorDetailsId: '',
ratifyStatus: '',
- approvalRemarks: '',
+ ratifyRemark: '',
downloadDialog: false,
download: {},
planYear: ''
@@ -608,7 +608,7 @@
handleApproval (status) {
const personTrainingUpdateDto = {
qualityMonitorDetailsId: this.currentInfo.qualityMonitorDetailsId,
- ratifyRemark: this.approvalRemarks,
+ ratifyRemark: this.ratifyRemark,
ratifyStatus: status
}
this.lookDialogLoading = true
@@ -697,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
--
Gitblit v1.9.3