From 57ffb18d77f3142bcb2b2163011235b8de9a5e9b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 七月 2026 17:10:01 +0800
Subject: [PATCH] 增加销售发货数量
---
src/views/procurementManagement/procurementLedger/index.vue | 2 ++
src/views/procurementManagement/purchaseReturnOrder/New.vue | 13 ++++---------
src/views/procurementManagement/purchaseReturnOrder/index.vue | 12 ++----------
src/views/procurementManagement/purchaseReturnOrder/ProductList.vue | 13 ++++---------
4 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index ed7e5d9..a45d75d 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -121,6 +121,8 @@
</el-table-column>
<el-table-column label="鏁伴噺"
prop="quantity" />
+ <el-table-column label="閿�鍞彂璐ф暟閲�"
+ prop="shippedQuantity" />
<el-table-column label="鍙敤鏁伴噺"
prop="availableQuality" />
<el-table-column label="閫�璐ф暟閲�"
diff --git a/src/views/procurementManagement/purchaseReturnOrder/New.vue b/src/views/procurementManagement/purchaseReturnOrder/New.vue
index f4771d3..0453310 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/New.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/New.vue
@@ -259,13 +259,16 @@
<el-table-column label="鏁伴噺"
prop="stockInNum"
width="100" />
+ <el-table-column label="閿�鍞彂璐ф暟閲�"
+ prop="saleOutQuantity"
+ width="120" />
<el-table-column label="鍙��璐ф暟閲�"
prop="unQuantity"
width="130" />
<el-table-column label="宸查��璐ф暟閲�"
width="130">
<template #default="scope">
- {{ calcAlreadyReturned(scope.row) }}
+ {{ formattedNumber(scope.row, null, scope.row.totalReturnNum || 0) }}
</template>
</el-table-column>
<el-table-column label="閫�璐ф暟閲�"
@@ -528,14 +531,6 @@
const toNumber = (val) => {
const num = Number(val)
return Number.isNaN(num) ? 0 : num
-}
-
-/** 宸查��璐ф暟閲� = 鍏ュ簱琛屾�绘暟閲� 鈭� 褰撳墠鍙��璐ф暟閲忥紙鍓╀綑锛� */
-const calcAlreadyReturned = (row) => {
- const total = Number(row?.stockInNum ?? row?.totalQuantity ?? row?.quantity ?? 0)
- const un = Number(row?.unQuantity ?? 0)
- if (!Number.isFinite(total) || !Number.isFinite(un)) return 0
- return Math.max(total - un, 0)
}
const getReturnTotal = (row) => {
diff --git a/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue b/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue
index 27fae4a..9b3e6f7 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue
@@ -34,13 +34,16 @@
<el-table-column label="鏁伴噺"
prop="stockInNum"
width="70" />
+ <el-table-column label="閿�鍞彂璐ф暟閲�"
+ prop="saleOutQuantity"
+ width="120" />
<el-table-column label="鍙��璐ф暟閲�"
prop="unQuantity"
width="130" />
<el-table-column label="宸查��璐ф暟閲�"
width="130">
<template #default="scope">
- {{ calcAlreadyReturned(scope.row) }}
+ {{ formattedNumber(scope.row, null, scope.row.totalReturnNum || 0) }}
</template>
</el-table-column>
<!-- <el-table-column label="搴撳瓨棰勮鏁伴噺"
@@ -118,14 +121,6 @@
const formattedNumber = (row, column, cellValue) => {
return parseFloat(cellValue).toFixed(2);
};
-
-/** 宸查��璐ф暟閲� = 鍏ュ簱琛屾�绘暟閲� 鈭� 褰撳墠鍙��璐ф暟閲忥紙鍓╀綑锛� */
-const calcAlreadyReturned = (row) => {
- const total = Number(row?.stockInNum ?? row?.totalQuantity ?? row?.quantity ?? 0)
- const un = Number(row?.unQuantity ?? 0)
- if (!Number.isFinite(total) || !Number.isFinite(un)) return 0
- return Math.max(total - un, 0)
-}
const handleChangeSelection = (val) => {
selectedRows.value = val;
diff --git a/src/views/procurementManagement/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index f8866e1..df2c137 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -142,13 +142,14 @@
/>
<el-table-column label="鍗曚綅" prop="unit" width="80" />
<el-table-column label="鏁伴噺" prop="stockInNum" width="80" />
+ <el-table-column label="閿�鍞彂璐ф暟閲�" prop="saleOutQuantity" width="110" />
<el-table-column label="鍙��璐ф暟閲�"
prop="unQuantity"
width="100" />
<el-table-column label="宸查��璐ф暟閲�"
width="100">
<template #default="scope">
- {{ calcAlreadyReturned(scope.row) }}
+ {{ formatAmount(scope.row.totalReturnNum || 0) }}
</template>
</el-table-column>
<!-- <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" width="120" /> -->
@@ -461,14 +462,6 @@
return num.toFixed(2);
};
-/** 宸查��璐ф暟閲� = 鍏ュ簱琛屾�绘暟閲� 鈭� 褰撳墠鍙��璐ф暟閲忥紙鍓╀綑锛� */
-const calcAlreadyReturned = (row) => {
- const total = Number(row?.stockInNum ?? row?.totalQuantity ?? row?.quantity ?? 0);
- const un = Number(row?.unQuantity ?? 0);
- if (!Number.isFinite(total) || !Number.isFinite(un)) return 0;
- return Math.max(total - un, 0);
-};
-
onMounted(() => {
getList();
});
@@ -478,4 +471,3 @@
margin-top: unset;
}
</style>
-
--
Gitblit v1.9.3