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/useApproveList.js | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index f61e038..ae568b3 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
@@ -82,7 +82,7 @@
const detailRow = ref({});
const detailData = ref({});
- const approveDialog = reactive({ visible: false, row: null });
+ const approveDialog = reactive({ visible: false, row: null, warehouse: ''});
const approveOpinion = ref("");
const approveSubmitting = ref(false);
@@ -366,6 +366,7 @@
}
approveDialog.row = { ...row };
approveOpinion.value = "";
+ approveDialog.warehouse = row?.warehouse || '';
const bizType = Number(row.businessType);
// 鎶ヤ环瀹℃壒锛氱敤瀹℃壒浜嬬敱瀛楁鎵胯浇鐨�"鎶ヤ环鍗曞彿"鍘绘煡鎶ヤ环鍒楄〃
if (bizType === 6) {
@@ -642,7 +643,7 @@
approveSubmitting.value = true;
try {
await approveApprovalInstance(
- buildApproveInstanceDto(row, result, approveOpinion.value)
+ buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse)
);
reimburseDialog.visible = false;
await fetchApprovalList();
@@ -664,8 +665,13 @@
if (approveSubmitting.value) return { ok: false };
approveSubmitting.value = true;
try {
+ // 鍙戣揣瀹℃壒鏃朵紶閫掑嚭搴撴壒鍙�
+ const extraData = {};
+ if (Number(row.businessType) === 7 && detailData.value?.shippingInfo?.outboundBatches) {
+ extraData.outboundBatches = detailData.value.shippingInfo.outboundBatches;
+ }
await approveApprovalInstance(
- buildApproveInstanceDto(row, result, approveOpinion.value)
+ buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse, extraData)
);
approveDialog.visible = false;
await fetchApprovalList();
--
Gitblit v1.9.3