From ace1b66fe094e791216f6c46f4bd628e1c23b2dd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:09:01 +0800
Subject: [PATCH] 协同办公系统模块优化
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index c38ee89..99c5173 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -74,6 +74,13 @@
</el-row>
</el-form>
+ <el-descriptions v-if="[1, 3, 5].includes(Number(props.approveType))" :column="2" border style="margin-bottom: 18px">
+ <el-descriptions-item label="涓氬姟缂栧彿">{{ form.businessNo || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹℃壒鏍囬">{{ form.businessTitle || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="閲戦">{{ form.amount == null ? '-' : `楼${form.amount}` }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠浜嬬敱">{{ form.approveReason || '-' }}</el-descriptions-item>
+ </el-descriptions>
+
<!-- 鎶ヤ环瀹℃壒锛氬睍绀烘姤浠疯鎯咃紙澶嶇敤閿�鍞姤浠封�滄煡鐪嬭鎯呭璇濇鈥濆唴瀹圭粨鏋勶級 -->
<div v-if="isQuotationApproval" style="margin: 10px 0 18px;">
<el-divider content-position="left">鎶ヤ环璇︽儏</el-divider>
@@ -298,10 +305,17 @@
// 鎻愪氦瀹℃壒
const submitForm = (status) => {
const filteredActivities = activities.value.filter(activity => activity.isShen);
+ if (!filteredActivities.length) {
+ proxy.$modal.msgError("褰撳墠娌℃湁鍙鎵圭殑鑺傜偣");
+ return;
+ }
+ const opinion = filteredActivities[0].approveNodeReason?.trim();
+ if (!opinion || (status === 2 && opinion.length < 2)) {
+ proxy.$modal.msgError(status === 2 ? "椹冲洖鎰忚鑷冲皯杈撳叆2涓瓧绗�" : "璇疯緭鍏ュ鎵规剰瑙�");
+ return;
+ }
filteredActivities[0].approveNodeStatus = status;
- // 鍒ゆ柇鏄惁涓烘渶鍚庝竴姝�
- const isLast = activities.value.findIndex(a => a.isShen) === activities.value.length-1;
- updateApproveNode({ ...filteredActivities[0], isLast }).then(() => {
+ updateApproveNode(filteredActivities[0]).then(() => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
});
@@ -350,4 +364,4 @@
width: 200px;
height: 60px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3