From 7ec0b6ddb14897fa47769b14cc4cb36049bb5ebb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 22 六月 2026 09:11:53 +0800
Subject: [PATCH] 1、报价系统中，需将付款方式改为选择项（现金、电汇、微信、支付宝等），不能做成手工输入；4、退货单未明确退货规则；5、客户往来信息过于简单，只做总结性信息，无多维度明细信息；
---
src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index f61e038..38125ef 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);
@@ -192,7 +192,7 @@
{
name: "瀹℃壒",
type: "text",
- disabled: (row) => row.approvalStatus !== "pending" || !row.isApprove,
+ disabled: (row) => row.approvalStatus !== "pending",
clickFun: (row) => openApprove(row),
},
{
@@ -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