From 3571d8b2231e06e46774af86be502014d6974e1d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 07 四月 2026 16:16:53 +0800
Subject: [PATCH] 优化ERP接收单据逻辑,一期领料变更逻辑修改
---
项目代码/BigScreen/src/views/index.vue | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue"
index e8d5763..106ee5f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/BigScreen/src/views/index.vue"
@@ -173,10 +173,13 @@
// 1. 鎸夌焊鍗锋潯鐮佸垎缁�
const groupedData = {};
res.data.data.forEach((x) => {
- if (!groupedData[x.palletCode]) {
+ console.log(x);
+ if (x.taskNum) {
+ if (!groupedData[x.palletCode]) {
groupedData[x.palletCode] = [];
+ }
+ groupedData[x.palletCode].push(x);
}
- groupedData[x.palletCode].push(x);
});
// 2. 澶勭悊鏁版嵁锛氬皢姣忕粍鐩稿悓绾稿嵎鏉$爜鐨勮褰曞悎骞朵负涓�鏉�
@@ -196,7 +199,6 @@
uniquePalletCodes.add(item.palletCode);
}
});
- this.showMsg = uniquePalletCodes.size;
// 鐩存帴澶勭悊姣忔潯璁板綍锛屼笉杩涜鍒嗙粍
group.forEach((item) => {
@@ -216,26 +218,26 @@
// 鍒涘缓鍚堝苟鍚庣殑鍗曟潯璁板綍
var item = [
- '<span style="color:#FF4500; font-size:85px;">' + palletCode + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + palletCode + '</span>',
//'<span style="color:#FF4500; font-size:55px;">' + orderNos + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + firstItem.materielCode + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + machineLastChar + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + materialWide + '</span>',
- '<span style="color:#FF4500; font-size:85px;;">' + originalQuantity + '</span>',
- '<span style="color:#FF4500; font-size:85px;">' + parseInt(totalOrderQuantity) + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + firstItem.materielCode + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + machineLastChar + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + materialWide + '</span>',
+ '<span style="color:#FF4500; font-size:90px;;">' + originalQuantity + '</span>',
+ '<span style="color:#FF4500; font-size:90px;">' + parseInt(totalOrderQuantity) + '</span>',
];
arr.push(item);
});
if (this.IsDetail) {
this.config = {
header: [
- '<span style="font-size:63px;">绾稿嵎鏉$爜</span>',
+ '<span style="font-size:68px;">绾稿嵎鏉$爜</span>',
//'<span style="font-size:50px;">宸ュ崟鍙�</span>',
- '<span style="font-size:63px;">浠g爜</span>',
- '<span style="font-size:63px;">涓婃満浣�</span>',
- '<span style="font-size:63px;">瀹藉箙</span>',
- '<span style="font-size:63px;">绾稿嵎闀�</span>',
- '<span style="font-size:63px;">闇�鐢ㄧ焊闀�</span>'
+ '<span style="font-size:68px;">浠g爜</span>',
+ '<span style="font-size:68px;">涓婃満浣�</span>',
+ '<span style="font-size:68px;">瀹藉箙</span>',
+ '<span style="font-size:68px;">绾稿嵎闀�</span>',
+ '<span style="font-size:68px;">闇�鐢ㄧ焊闀�</span>'
],
data: arr,
headerHeight: 60,
--
Gitblit v1.9.3