From 3c797428bd595aac4195cf45f4ea7304daa8f029 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/method/methodVerification/component/formDIa.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/process/method/methodVerification/component/formDIa.vue b/src/views/CNAS/process/method/methodVerification/component/formDIa.vue
index 5b8d568..aaffbc6 100644
--- a/src/views/CNAS/process/method/methodVerification/component/formDIa.vue
+++ b/src/views/CNAS/process/method/methodVerification/component/formDIa.vue
@@ -291,12 +291,12 @@
</table>
</fieldset>
<template #footer><span class="dialog-footer">
- <el-button @click="closeDia">鍙� 娑�</el-button>
+ <el-button @click="closeDia">{{ operationType === 'view' ? '鍏抽棴' : '鍙� 娑�' }}</el-button>
<el-button v-if="operationType !== 'view'" :loading="editLoad" type="primary" @click="handleEdit">鎻� 浜�</el-button>
</span></template>
</el-dialog>
- <ViewDeviceDialog v-if="viewDeviceDialog" ref="viewDeviceDialog" @closDeviceDia="closDeviceDia" @handleDeviceInfo="handleDeviceInfo"></ViewDeviceDialog>
- <ViewTestRecord v-if="viewTestRecordDialog" ref="viewTestRecordDialog"></ViewTestRecord>
+ <ViewDeviceDialog v-if="viewDeviceDialog" ref="viewDeviceDialog" :read-only="operationType === 'view'" @closDeviceDia="closDeviceDia" @handleDeviceInfo="handleDeviceInfo"></ViewDeviceDialog>
+ <ViewTestRecord v-if="viewTestRecordDialog" ref="viewTestRecordDialog" :read-only="operationType === 'view'"></ViewTestRecord>
<ViewWorkPermitDia v-if="viewWorkPermitDia" ref="viewWorkPermitDia"></ViewWorkPermitDia>
<calibrations-file-dia v-if="calibrationsFileDia" ref="calibrationsFileDia"></calibrations-file-dia>
</div>
@@ -410,6 +410,7 @@
},
// 鎻愪氦
handleEdit() {
+ if (this.operationType === 'view') return
this.editLoad = true
const processMethodSearchNews = this.HaveJson(this.form)
processMethodSearchNews.confirmUser = processMethodSearchNews.confirmUser && processMethodSearchNews.confirmUser.join(',')
@@ -422,10 +423,12 @@
},
// 璇勫鎰忚鍕鹃�夛紙涓夐�変竴锛屽啀鐐逛竴娆″彇娑堬級
toggleReview (value, checked) {
+ if (this.operationType === 'view') return
this.form.reviewResult = checked ? value : ''
},
// 瀹℃壒鎰忚鍕鹃�夛紙涓夐�変竴锛屽啀鐐逛竴娆″彇娑堬級
toggleApproval (value, checked) {
+ if (this.operationType === 'view') return
this.form.approvalResult = checked ? value : ''
},
// 鏌ョ湅涓婂矖璇�
@@ -455,6 +458,7 @@
},
// 鎻愪氦璁惧淇℃伅
handleDeviceInfo (machineAttachmentList) {
+ if (this.operationType === 'view') return
this.viewDeviceDialog = false
this.form.machineAttachmentList = machineAttachmentList
},
--
Gitblit v1.9.3