From 91ba7212f27528ee44b538e2a150f844e257b9f6 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期一, 19 五月 2025 09:05:22 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/schemeManagement/components/approvalDialog.vue | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/laboratory/src/views/dataManagement/schemeManagement/components/approvalDialog.vue b/laboratory/src/views/dataManagement/schemeManagement/components/approvalDialog.vue
index d3a3873..68edb82 100644
--- a/laboratory/src/views/dataManagement/schemeManagement/components/approvalDialog.vue
+++ b/laboratory/src/views/dataManagement/schemeManagement/components/approvalDialog.vue
@@ -2,7 +2,7 @@
<div>
<el-dialog
title="实验方案详情"
- :visible.sync="visible"
+ :visible="dialogVisible"
width="80%"
:close-on-click-modal="false"
@close="handleClose"
@@ -26,7 +26,7 @@
<img src="@/assets/public/headercard.png" />
<div>所属实验调度</div>
</div>
- <el-button @click="handleStopExperiment" type="danger">
+ <el-button @click="handleStopExperiment" type="danger" v-if='form.status != 2 && form.status != 3 && form.status != 4'>
申请终止实验</el-button>
</div>
</div>
@@ -216,6 +216,7 @@
},
data() {
return {
+ dialogVisible: false,
form: {
projectName: "", // 项目课题方案名称
projectCode: "", // 项目课题方案编号
@@ -249,6 +250,16 @@
};
},
watch: {
+ visible: {
+ handler(val) {
+ this.dialogVisible = val;
+ if (val && this.data && this.data.id) {
+ // 弹窗打开时，确保数据已获取
+ this.getPlanDetail(this.data.id);
+ }
+ },
+ immediate: true,
+ },
data: {
handler(val) {
if (val && val.id) {
@@ -258,15 +269,6 @@
},
immediate: true,
deep: true,
- },
- visible: {
- handler(val) {
- if (val && this.data && this.data.id) {
- // 弹窗打开时，确保数据已获取
- this.getPlanDetail(this.data.id);
- }
- },
- immediate: true,
},
},
methods: {
@@ -292,8 +294,7 @@
return statusMap[status] || "未知";
},
handleClose() {
- this.$emit("update:visible", false);
- this.form.approvalComment = "";
+ this.$emit('update:visible', false);
},
handleApprove() {
if (!this.form.approvalComment) {
@@ -346,20 +347,15 @@
});
if(res.status==4||res.status==3){
processData.push({
- type:
- res.auditStatus === 2
- ? "primary"
- : res.auditStatus === 3
- ? "danger"
- : "warning",
+ type:'primary',
mode: "list",
fields: [
{
label: "审核结果：",
value:
- res.auditStatus === 2
+ res.status ==3
? "通过"
- : res.auditStatus === 3
+ : res.status ==4
? "驳回"
: "待审批",
},
--
Gitblit v1.7.1