From a563ea879ef5fb6897e76d2df661e465dce2ab9b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 15:02:27 +0800
Subject: [PATCH] Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inventory-management into dev_新疆_大罗素马铃薯new
---
src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
index 64793b7..f983240 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
@@ -460,6 +460,7 @@
purchaseContractNumber: row.purchaseContractNumber || "",
quotationNo: row.quotationNo || "",
shippingNo: row.shippingNo || "",
+ warehouse: row.warehouse || "",
};
}
@@ -473,12 +474,13 @@
}
/** 缁勮瀹℃壒鎻愪氦 DTO */
-export function buildApproveInstanceDto(row, uiResult, comment, extraData = {}) {
+export function buildApproveInstanceDto(row, uiResult, comment, warehouse, extraData = {}) {
const opinion = (comment || "").trim();
return {
id: row?.id,
approveAction: mapApproveActionToApi(uiResult),
approveComment: opinion || (uiResult === "approved" ? "鍚屾剰" : ""),
+ warehouse: warehouse || row?.warehouse || "",
...extraData,
};
}
@@ -610,4 +612,4 @@
export function initTemplateAttachmentsFromSnapshot(templateSnapshot) {
const list = templateSnapshot?.storageBlobDTOs;
return list?.length ? JSON.parse(JSON.stringify(list)) : [];
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3