From a60dc30be50598fe2d1acb42f8171ec69e37b436 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期三, 28 五月 2025 17:29:05 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/testResultReport/components/evaluation-dialog.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/laboratory/src/views/dataManagement/testResultReport/components/evaluation-dialog.vue b/laboratory/src/views/dataManagement/testResultReport/components/evaluation-dialog.vue
index 41fc3e6..ca0b1d8 100644
--- a/laboratory/src/views/dataManagement/testResultReport/components/evaluation-dialog.vue
+++ b/laboratory/src/views/dataManagement/testResultReport/components/evaluation-dialog.vue
@@ -5,7 +5,7 @@
width="79.17%"
@close="handleClose"
>
- <EvaluateTable ref="evaluateTable" />
+ <EvaluateTable ref="evaluateTable" :viewJson="viewJson" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmit" class="submit-btn">确认评定结果</el-button>
</div>
@@ -26,6 +26,10 @@
type: String,
default: 'labTechnician'
},
+ viewJson: {
+ type: String,
+ default: ''
+ }
},
data() {
return {
@@ -34,7 +38,7 @@
},
computed: {
dialogTitle() {
- return this.type === 'labTechnician' ? '化验师工作评定' : '实验员工作评定';
+ return this.type === 'labTechnician' ? '化验师工作评定' : this.type === 'experimenter' ? '实验员工作评定' : '工艺工程师工作评定';
}
},
watch: {
--
Gitblit v1.7.1