Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inv...

huminmin

2026-06-01 a563ea879ef5fb6897e76d2df661e465dce2ab9b

 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();