From 3a7267cd8eebce7c75afb142f8632bfadd5e7a49 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 20 四月 2026 11:33:20 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/salesManagement/salesLedger/index.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index c974cc9..1d54201 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -2841,7 +2841,7 @@
const res = await productList({ salesLedgerId: id, type: 1 });
stockProductList.value = [];
stockProductList.value =
- res.data.filter(item => item.productStockStatus == 0) || [];
+ res.data.filter(item => item.productStockStatus == 0 || item.productStockStatus == 1) || [];
} catch (e) {
proxy?.$modal?.msgError?.("鑾峰彇浜у搧鍒楄〃澶辫触");
} finally {
@@ -3780,6 +3780,13 @@
} else {
const res = await getProcessCard(selectedId);
const processCardData = res?.data ?? {};
+ // 琛ラ綈浜岀淮鐮佹墍闇�鐨勫彴璐︽爣璇嗭紙鍚庣鏁版嵁鏈夋椂涓嶅甫 id锛�
+ if (processCardData && typeof processCardData === "object") {
+ processCardData.salesLedgerId = processCardData.salesLedgerId ?? selectedId;
+ processCardData.salesContractNo =
+ (processCardData.salesContractNo ?? "").trim() ||
+ String(selectedRow?.salesContractNo ?? "").trim();
+ }
const routeNodes = processCardData?.routeNodes;
const isProcessRouteEmpty =
!Array.isArray(routeNodes) || routeNodes.length === 0;
@@ -3798,9 +3805,9 @@
} catch {
return;
}
- printFinishedProcessCard(processCardData);
+ await printFinishedProcessCard(processCardData);
} else {
- printFinishedProcessCard(processCardData);
+ await printFinishedProcessCard(processCardData);
}
}
} catch (error) {
--
Gitblit v1.9.3