From a52ac50ffc5f3b369eb689dd734bfb8a4bb988a4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:41:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/method/methodVerification/component/wordFormDIa.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/process/method/methodVerification/component/wordFormDIa.vue b/src/views/CNAS/process/method/methodVerification/component/wordFormDIa.vue
index b4ef1d5..7f6c3b2 100644
--- a/src/views/CNAS/process/method/methodVerification/component/wordFormDIa.vue
+++ b/src/views/CNAS/process/method/methodVerification/component/wordFormDIa.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-dialog v-model="visible" :title="operationType === 'edit' ? '缂栬緫鏂规硶楠岃瘉' : '鏂板鏂规硶楠岃瘉'"
+ <el-dialog v-model="visible" :title="dialogTitle"
width="90%" :close-on-click-modal="false" @close="closeDia">
<div class="form-body">
<table class="verify-table">
@@ -104,7 +104,7 @@
</div>
<template #footer>
<el-button @click="closeDia">鍙栨秷</el-button>
- <el-button :loading="loading" type="primary" @click="submit">鎻愪氦</el-button>
+ <el-button v-if="operationType !== 'view'" :loading="loading" type="primary" @click="submit">鎻愪氦</el-button>
</template>
</el-dialog>
<ViewDeviceDialog v-if="deviceVisible" ref="device" @closDeviceDia="deviceVisible = false"
@@ -116,12 +116,12 @@
</template>
<script>
-import ViewDeviceDialog from '../../standardMethodsChange/component/ViewDeviceDialog.vue'
-import ViewTestRecord from '../../standardMethodsChange/component/ViewTestRecord.vue'
+import ViewDeviceDialog from './ViewDeviceDialog.vue'
+import ViewTestRecord from './ViewTestRecord.vue'
import ViewWorkPermitDia from './viewWorkPermitDia.vue'
-import CalibrationsFileDia from '../../standardMethodsChange/component/calibrationsFileDia.vue'
+import CalibrationsFileDia from './calibrationsFileDia.vue'
import {addMethodVerify, getMethodVerifyOne, updateMethodVerify} from '@/api/cnas/process/method/methodVerification'
-import {selectUserCondition} from '@/api/cnas/process/method/standardMethodsChange'
+import {selectUserCondition} from '@/api/cnas/process/method/methodVerification'
const labels = [
['personnel', '浜哄憳鑳藉姏'], ['equipment', '妫�娴嬭澶�'], ['reagents', '璇曞墏瑕佹眰'],
@@ -156,6 +156,12 @@
name: 'MethodVerificationWordForm',
components: {ViewDeviceDialog, ViewTestRecord, ViewWorkPermitDia, CalibrationsFileDia},
props: {operationType: {type: String, default: 'add'}},
+ computed: {
+ dialogTitle() {
+ if (this.operationType === 'view') return '鏌ョ湅鏂规硶楠岃瘉'
+ return this.operationType === 'edit' ? '缂栬緫鏂规硶楠岃瘉' : '鏂板鏂规硶楠岃瘉'
+ }
+ },
data() {
return {
visible: false, loading: false, decisions,
@@ -171,7 +177,7 @@
selectUserCondition().then(res => {
if (res.code === 200) this.userList = res.data || []
})
- if (this.operationType === 'edit') this.load(row)
+ if (this.operationType !== 'add') this.load(row)
},
load(row) {
getMethodVerifyOne({methodVerifyId: row.methodVerifyId}).then(res => {
--
Gitblit v1.9.3