From dcc3a4d842740f7ff6e79a58ddec945f50ea9b5d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 03 六月 2026 10:10:22 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_宁夏_英泽防锈
---
src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
index e2f1e45..ecd310c 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
@@ -19,6 +19,9 @@
{ value: "quotation", label: "鎶ヤ环瀹℃壒", cellBg: "#f4ecfc", cellColor: "#9b59b6" },
{ value: "shipment", label: "鍙戣揣瀹℃壒", cellBg: "#e8faf6", cellColor: "#1abc9c" },
{ value: "enterprise_news", label: "浼佷笟鏂伴椈", cellBg: "#ecf5ff", cellColor: "#409eff" },
+ { value: "vehicle", label: "杞﹁締瀹℃壒", cellBg: "#fff7e6", cellColor: "#fa8c16" },
+ { value: "vehicle_return", label: "杞﹁締杩樿溅瀹℃壒", cellBg: "#e6fffb", cellColor: "#13c2c2" },
+ { value: "vehicle_extend", label: "杞﹁締寤舵湡瀹℃壒", cellBg: "#f6ffed", cellColor: "#52c41a" },
];
/** 鍒楄〃鏌ヨ锛氬鎵圭姸鎬侊紙涓庡悗绔� status 鏋氫妇涓�鑷达級 */
@@ -519,12 +522,12 @@
return APPROVAL_STATUS_OPTIONS.find(x => x.value === key)?.label || "鈥�";
}
-/** 涓氬姟鐢宠椤电姸鎬佹枃妗堬細PENDING鈫掕繘琛屼腑 APPROVED鈫掑凡瀹屾垚 REJECTED鈫掑凡椹冲洖 */
+/** 涓氬姟鐢宠椤电姸鎬佹枃妗堬細PENDING鈫掑鎵逛腑 APPROVED鈫掑凡閫氳繃 REJECTED鈫掑凡椹冲洖 */
export function businessApprovalStatusLabel(v) {
const key = normalizeApprovalStatusKey(v);
if (key === "draft") return "鑽夌";
- if (key === "pending") return "杩涜涓�";
- if (key === "approved") return "宸插畬鎴�";
+ if (key === "pending") return "瀹℃壒涓�";
+ if (key === "approved") return "宸查�氳繃";
if (key === "rejected") return "宸查┏鍥�";
if (key === "cancelled") return "宸叉挙閿�";
return "鈥�";
@@ -603,6 +606,7 @@
flowNodes,
templateAttachments: tpl?.storageBlobDTOs ? JSON.parse(JSON.stringify(tpl.storageBlobDTOs)) : [],
storageBlobDTOs: [],
+ formConfig: null,
};
}
--
Gitblit v1.9.3