From f08dd93e49e8461f362c8f45f17fe10e0fbdebec Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 12 一月 2026 18:54:58 +0800
Subject: [PATCH] #新增和得码入库流程，渝程进仓后续下发货主转换
---
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index 0467e6c..353a1b2 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -326,7 +326,7 @@
@size-change="handleDetailSizeChange"
@current-change="handleDetailCurrentChange"
:current-page="detailCurrentPage"
- :page-sizes="[5, 10, 20]"
+ :page-sizes="[5, 10, 20, 50, 100]"
:page-size="detailPageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="detailTotal">
@@ -597,7 +597,7 @@
// // 妯℃嫙鏁版嵁
// that.mockTableBData();
// }
- // });
+ // });c
// },
// 鑾峰彇鍟嗗搧鍞竴鏍囪瘑
@@ -773,22 +773,35 @@
method: 'POST',
success: (res) => {
loadingInstance.close();
+
if (res.code === 200 || res.success) {
this.$message({
- message: `淇敼鎴愬姛锛佽鍗曞彿: ${orderNo}, id: ${id}`,
+ message: `淇敼鎴愬姛锛佽鍗曞彿: ${orderNo}`,
type: 'success',
- duration: 3000
+ duration: 2500
});
- this.getTableDataB(orderNo);//
- // 涓嶉渶瑕侀噸鏂板姞杞芥暣椤垫暟鎹紙閬垮厤涓㈠け鐢ㄦ埛淇敼鐨勬暟閲忥級
- } else {
- this.$message.error(res.msg || '淇敼澶辫触');
+ this.getTableDataB(orderNo);
+ }
+ else {
+ // 澶勭悊鍚庣杩斿洖鐨勮缁嗛敊璇俊鎭�
+ let errorMsg = res.msg || '淇敼澶辫触';
+
+ // 濡傛灉鍚庣杩斿洖浜� errors 鏁扮粍锛屽睍绀哄緱鏇存紓浜�
+ if (res.errors && Array.isArray(res.errors) && res.errors.length > 0) {
+ errorMsg = res.errors.join('\n');
+ this.$alert(errorMsg, '灏哄鏍￠獙澶辫触', {
+ confirmButtonText: '鐭ラ亾浜�',
+ type: 'error',
+ dangerouslyUseHTMLString: true // 濡傛灉鎯虫崲琛屾洿鏄庢樉
+ });
+ } else {
+ this.$message.error(errorMsg);
+ }
}
},
error: (error) => {
loadingInstance.close();
- console.error('淇敼澶辫触:', error);
- this.$message.error('淇敼澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
+ this.$message.error('缃戠粶寮傚父锛岃绋嶅悗閲嶈瘯');
}
});
},
--
Gitblit v1.9.1