From 4614d2ec1bc32eab5f0332176a3ecac7598e3f5c Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期五, 09 五月 2025 14:38:33 +0800
Subject: [PATCH] 项目课题方案模块完成
---
laboratory/src/views/dataManagement/approvalPlan/components/approvalDialog.vue | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/laboratory/src/views/dataManagement/approvalPlan/components/approvalDialog.vue b/laboratory/src/views/dataManagement/approvalPlan/components/approvalDialog.vue
index 8833254..9c4000c 100644
--- a/laboratory/src/views/dataManagement/approvalPlan/components/approvalDialog.vue
+++ b/laboratory/src/views/dataManagement/approvalPlan/components/approvalDialog.vue
@@ -157,7 +157,7 @@
</div>
</div>
</div>
- <div class="approval-dialog-approve">
+ <div class="approval-dialog-approve" v-if="type === 'approve'">
<div class="status">
<div class="status-title">审批结果</div>
<div class="status-content">
@@ -242,6 +242,7 @@
createTime: "",
approver: "",
approveTime: "",
+ processData: [],
},
rules: {},
status: "1",
@@ -272,9 +273,9 @@
.then((res) => {
console.log("获取详情：", res);
if (res) {
- this.form = { ...res };
+ this.form = { ...res, processData: [] };
// 组装流程数据
- const processData = [];
+ let processData = [];
// 提交节点
processData.push({
type: "primary",
@@ -287,39 +288,41 @@
if (res.auditStatus == 2 || res.auditStatus == 3) {
processData.push({
type:
- audit.status === 2
- ? "success"
- : audit.status === 3
+ res.auditStatus === 2
+ ? "primary"
+ : res.auditStatus === 3
? "danger"
: "warning",
mode: "list",
fields: [
{
- label: "审核结果",
+ label: "审核结果：",
value:
- audit.status === 2
+ res.auditStatus === 2
? "通过"
- : audit.status === 3
+ : res.auditStatus === 3
? "驳回"
: "待审批",
},
- { label: "审批意见：", value: audit.auditRemark || "" },
- { label: "审核人：", value: audit.auditPersonName || "" },
- { label: "审核时间：", value: audit.auditTime || "" },
+ { label: "审批意见：", value: res.auditRemark || "" },
+ { label: "审核人：", value: res.auditPersonName || "" },
+ { label: "审核时间：", value: res.auditTime || "" },
],
});
}else{
processData.push({
- type: "primary",
- mode: "list",
- fields: [
- { label: "等待审核"},
- ],
- });
+ type: "warning",
+ mode: "list",
+ fields: [
+ { label: "等待审核"},
+ ],
+ });
}
// 如有卡片模式，按前述结构 push
- this.form.processData = processData;
+ this.$nextTick(() => {
+ this.form.processData = processData;
+ })
}
})
.catch((err) => {
@@ -339,11 +342,13 @@
}
const params = {
id: this.form.id,
- auditStatus: this.status === "1" ? 2 : 3, // 2-通过，3-驳回
- auditComment: this.remark,
+ auditStatus: this.status === "1" ? 2 : 3, // 2-已通过，3-已驳回
+ auditRemark: this.remark,
};
+ console.log('审批请求参数：', params);
audit(params)
.then((res) => {
+ console.log('审批返回结果：', res);
if (res.code === 200) {
this.$message.success("审批成功");
this.$emit("update:visible", false);
--
Gitblit v1.7.1