From 7d5b4ab84d9b36bdf3f6733f55c70981dcba4f22 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 17 四月 2026 13:34:58 +0800
Subject: [PATCH] 合并发货限制
---
src/views/salesManagement/salesLedger/index.vue | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 2b0a984..ace1ee9 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -353,6 +353,10 @@
prop="remarks"
width="200"
show-overflow-tooltip />
+ <el-table-column label="瀹㈡埛澶囨敞"
+ prop="customerRemarks"
+ width="200"
+ show-overflow-tooltip />
<el-table-column fixed="right"
label="鎿嶄綔"
width="200"
@@ -1952,6 +1956,30 @@
if (!row) return false;
if (!row.productCategory) {
proxy.$modal.msgWarning("璇烽�夋嫨浜у搧澶х被");
+ return false;
+ }
+ if (row.width <= 0) {
+ proxy.$modal.msgWarning("瀹藉繀椤诲ぇ浜�0");
+ return false;
+ }
+ if (row.height <= 0) {
+ proxy.$modal.msgWarning("楂樺繀椤诲ぇ浜�0");
+ return false;
+ }
+ if (row.settlePieceArea <= 0) {
+ proxy.$modal.msgWarning("缁撶畻鍗曠墖闈㈢Н蹇呴』澶т簬0");
+ return false;
+ }
+ if (row.quantity <= 0) {
+ proxy.$modal.msgWarning("鏁伴噺蹇呴』澶т簬0");
+ return false;
+ }
+ if (row.actualTotalArea <= 0) {
+ proxy.$modal.msgWarning("闈㈢Н蹇呴』澶т簬0");
+ return false;
+ }
+ if (row.taxInclusiveUnitPrice <= 0) {
+ proxy.$modal.msgWarning("鍚◣鍗曚环蹇呴』澶т簬0");
return false;
}
if (!row.productModelId) {
@@ -3927,12 +3955,21 @@
}
// 鍙厑璁搞�愭湭鍙戣揣/瀹℃壒澶辫触銆戣繘鍏ュ彂璐ф祦绋�
- const canDeliveryLedgers = selectedRows.value.filter(r => {
- const status = Number(r.deliveryStatus);
- return status === 1 || status === 3;
+ const statusItem = selectedRows.value[0].deliveryStatus;
+ const isTrue = true;
+ selectedRows.value.forEach(row => {
+ if (row.deliveryStatus != 1 && row.deliveryStatus != 3) {
+ proxy.$modal.msgWarning("浠呮湭鍙戣揣鎴栧鎵瑰け璐ョ殑鍙拌处鍙互鍚堝苟鍙戣揣");
+ isTrue = false;
+ return;
+ }
+ if (row.deliveryStatus !== statusItem) {
+ proxy.$modal.msgWarning("璇烽�夋嫨鐩稿悓鐘舵�佺殑閿�鍞彴璐�");
+ isTrue = false;
+ return;
+ }
});
- if (canDeliveryLedgers.length === 0) {
- proxy.$modal.msgWarning("浠呮湭鍙戣揣鎴栧鎵瑰け璐ョ殑鍙拌处鍙互鍙戣揣");
+ if (!isTrue) {
return;
}
--
Gitblit v1.9.3