From bd88e8063c13c0fca3ca006ec7f9667d7c505473 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 31 八月 2026 13:30:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_豹鸣' into dev_天津_豹鸣
---
src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index 25b6ae5..742fc5c 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
@@ -310,7 +310,10 @@
else if (row.businessType === 5) {
const purchaseContractNumber = row?.purchaseContractNumber;
if (purchaseContractNumber) {
- const res = await getPurchaseByCode({ purchaseContractNumber });
+ const res = await getPurchaseByCode({
+ purchaseContractNumber,
+ approvalInstanceId: row?.id,
+ });
detailData.value = res || {};
}
}
@@ -321,6 +324,19 @@
if (shippingNo) {
const res = await getDeliveryDetailByShippingNo({ shippingNo });
detailData.value = res?.data || res || {};
+ }
+ }
+
+ // 璁惧鐘舵�佸彉鏇村鎵�
+ else if (row.businessType === 19) {
+ if (row.formConfig) {
+ try {
+ detailData.value = JSON.parse(row.formConfig);
+ } catch(e) {
+ detailData.value = {};
+ }
+ } else {
+ detailData.value = {};
}
}
@@ -355,7 +371,10 @@
else if (row.businessType === 5) {
const purchaseContractNumber = row?.purchaseContractNumber;
if (purchaseContractNumber) {
- const res = await getPurchaseByCode({ purchaseContractNumber });
+ const res = await getPurchaseByCode({
+ purchaseContractNumber,
+ approvalInstanceId: row?.id,
+ });
detailData.value = res || {};
}
}
@@ -366,6 +385,19 @@
if (shippingNo) {
const res = await getDeliveryDetailByShippingNo({ shippingNo });
detailData.value = res?.data || res || {};
+ }
+ }
+
+ // 璁惧鐘舵�佸彉鏇村鎵�
+ else if (row.businessType === 19) {
+ if (row.formConfig) {
+ try {
+ detailData.value = JSON.parse(row.formConfig);
+ } catch(e) {
+ detailData.value = {};
+ }
+ } else {
+ detailData.value = {};
}
}
@@ -699,4 +731,4 @@
openApprove,
fetchApprovalList,
};
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3