From 7a0790d8224db45a039bf33d0ef4e24ae879a243 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 30 六月 2026 10:38:05 +0800
Subject: [PATCH] 采购退货重构,添加新增、删除功能;供应商管理新增修改删除功能

---
 src/pages/procurementManagement/purchaseReturnOrder/view.vue |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/pages/procurementManagement/purchaseReturnOrder/view.vue b/src/pages/procurementManagement/purchaseReturnOrder/view.vue
index bc33f1c..3aa852d 100644
--- a/src/pages/procurementManagement/purchaseReturnOrder/view.vue
+++ b/src/pages/procurementManagement/purchaseReturnOrder/view.vue
@@ -80,6 +80,14 @@
           <up-divider></up-divider>
           <view class="item-details">
             <view class="detail-row">
+              <text class="detail-label">鍏ュ簱鍗曞彿</text>
+              <text class="detail-value">{{ p.inboundBatches || "-" }}</text>
+            </view>
+            <view class="detail-row">
+              <text class="detail-label">鎵规鍙�</text>
+              <text class="detail-value">{{ p.batchNo || "-" }}</text>
+            </view>
+            <view class="detail-row">
               <text class="detail-label">浜у搧澶х被</text>
               <text class="detail-value">{{ p.productCategory || "-" }}</text>
             </view>
@@ -93,23 +101,23 @@
             </view>
             <view class="detail-row">
               <text class="detail-label">鏁伴噺</text>
-              <text class="detail-value">{{ p.quantity ?? "-" }}</text>
+              <text class="detail-value">{{ p.stockInNum ?? p.quantity ?? "-" }}</text>
+            </view>
+            <view class="detail-row">
+              <text class="detail-label">鍙��璐ф暟閲�</text>
+              <text class="detail-value">{{ p.unQuantity ?? "-" }}</text>
+            </view>
+            <view class="detail-row">
+              <text class="detail-label">宸查��璐ф暟閲�</text>
+              <text class="detail-value">{{ calcAlreadyReturned(p) }}</text>
             </view>
             <view class="detail-row">
               <text class="detail-label">閫�璐ф暟閲�</text>
               <text class="detail-value highlight">{{ p.returnQuantity ?? "-" }}</text>
             </view>
             <view class="detail-row">
-              <text class="detail-label">绋庣巼(%)</text>
-              <text class="detail-value">{{ p.taxRate ?? "-" }}</text>
-            </view>
-            <view class="detail-row">
               <text class="detail-label">鍚◣鍗曚环(鍏�)</text>
               <text class="detail-value">{{ formatAmount(p.taxInclusiveUnitPrice) }}</text>
-            </view>
-            <view class="detail-row">
-              <text class="detail-label">鍚◣鎬讳环(鍏�)</text>
-              <text class="detail-value">{{ formatAmount(p.taxInclusiveTotalPrice) }}</text>
             </view>
             <view class="detail-row">
               <text class="detail-label">鏄惁璐ㄦ</text>
@@ -161,6 +169,13 @@
     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);
+  };
+
   const loadDetail = () => {
     if (!id.value) return;
     uni.showLoading({ title: "鍔犺浇涓�...", mask: true });

--
Gitblit v1.9.3