From ec6e06888e0ec58441b9299fc23e0084183b5349 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期三, 01 七月 2026 16:21:21 +0800
Subject: [PATCH] 发货状态页：补齐数量字段、产品状态三态与发货按钮规则
---
src/pages/sales/salesAccount/out.vue | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/pages/sales/salesAccount/out.vue b/src/pages/sales/salesAccount/out.vue
index d4fc5be..bf33c8f 100644
--- a/src/pages/sales/salesAccount/out.vue
+++ b/src/pages/sales/salesAccount/out.vue
@@ -52,6 +52,10 @@
<text class="detail-label">浜у搧鐘舵��</text>
<text v-if="item.approveStatus === 1"
class="detail-value highlight">鍏呰冻</text>
+ <text v-else-if="
+ item.approveStatus === 0 && Number(item.noQuantity || 0) === 0
+ "
+ class="detail-value highlight">宸插嚭搴�</text>
<text v-else
class="detail-value danger">涓嶈冻</text>
</view>
@@ -59,6 +63,10 @@
<text class="detail-label">鍙戣揣鐘舵��</text>
<u-tag size="mini"
:type="getShippingStatusType(item)">{{ getShippingStatusText(item) }}</u-tag>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">瀹℃壒涓暟閲�</text>
+ <text class="detail-value">{{ item.pendingApprovalQuantity || 0 }}</text>
</view>
<view class="detail-row">
<text class="detail-label">蹇�掑叕鍙�</text>
@@ -84,6 +92,14 @@
<view class="detail-row">
<text class="detail-label">鏁伴噺</text>
<text class="detail-value">{{ item.quantity }}</text>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">閫�璐ф暟閲�</text>
+ <text class="detail-value">{{ item.returnQuantity || 0 }}</text>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">寰呭彂璐ф暟閲�</text>
+ <text class="detail-value">{{ item.noQuantity || 0 }}</text>
</view>
<view class="detail-row">
<text class="detail-label">绋庣巼锛�%锛�</text>
@@ -229,14 +245,19 @@
// 鑾峰彇鍙戣揣鐘舵��
const shippingStatus = row.shippingStatus;
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屼笉鑳藉啀娆″彂璐�
- if (row.shippingDate || row.shippingCarNumber) {
+ // 濡傛灉宸插彂璐э紝涓嶈兘鍐嶆鍙戣揣
+ if (shippingStatus === "宸插彂璐�") {
return false;
}
- // 鍙戣揣鐘舵�佸繀椤绘槸"寰呭彂璐�"鎴�"瀹℃牳鎷掔粷"
+ // 鍙戣揣鐘舵�佸繀椤绘槸"寰呭彂璐�"銆�"瀹℃壒涓�"銆�"瀹℃牳鎷掔粷"鎴�"閮ㄥ垎鍙戣揣"
const statusStr = shippingStatus ? String(shippingStatus).trim() : "";
- return statusStr === "寰呭彂璐�" || statusStr === "瀹℃牳鎷掔粷";
+ return (
+ statusStr === "寰呭彂璐�" ||
+ statusStr === "瀹℃壒涓�" ||
+ statusStr === "瀹℃牳鎷掔粷" ||
+ statusStr === "閮ㄥ垎鍙戣揣"
+ );
};
// 鏄剧ず鍔犺浇鎻愮ず
--
Gitblit v1.9.3