From 3cd0964299bf9e83c6b2d10d8d37ddbeecf2a6e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 12 八月 2026 10:54:18 +0800
Subject: [PATCH] Merge branch 'dev_天津_意博凯信' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_意博凯信
---
src/views/procurementManagement/purchaseReturnOrder/index.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/views/procurementManagement/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index 3986f03..22afb0a 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -102,10 +102,10 @@
detailData.createUserName || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍒涘缓鏃堕棿">{{
- detailData.createTime || "--"
+ formatDate(detailData.createTime) || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鏈�杩戞洿鏂版椂闂�">{{
- detailData.updateTime || "--"
+ formatDate(detailData.updateTime) || "--"
}}</el-descriptions-item>
<el-descriptions-item label="澶囨敞" :span="3">{{
detailData.remark || "--"
@@ -146,8 +146,11 @@
prop="unQuantity"
width="100" />
<el-table-column label="宸查��璐ф暟閲�"
- prop="totalReturnNum"
- width="100" />
+ width="100">
+ <template #default="scope">
+ {{ calcAlreadyReturned(scope.row) }}
+ </template>
+ </el-table-column>
<!-- <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" width="120" /> -->
<!-- <el-table-column label="绋庣巼(%)" prop="taxRate" width="90" /> -->
<el-table-column
@@ -310,12 +313,14 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
- width: 170,
+ width: 130,
+ formatData: (val) => formatDate(val),
},
{
label: "鏈�杩戞洿鏂版椂闂�",
prop: "updateTime",
- width: 170,
+ width: 130,
+ formatData: (val) => formatDate(val),
},
{
label: "澶囨敞",
@@ -458,6 +463,19 @@
return num.toFixed(2);
};
+const formatDate = (value) => {
+ if (!value) return "";
+ return String(value).slice(0, 10);
+};
+
+/** 宸查��璐ф暟閲� = 鍏ュ簱琛屾�绘暟閲� 鈭� 褰撳墠鍙��璐ф暟閲忥紙鍓╀綑锛� */
+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();
});
--
Gitblit v1.9.3