From 5ecdd5d1bee78753ced4c7e53a8dbe8745e471d7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 07 三月 2026 11:09:11 +0800
Subject: [PATCH] 纽维盛组托，订单组托
---
pages/order/orderComb.vue | 4 +++-
pages/home/home.vue | 28 ++++++++++++++--------------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8912508..8ecb585 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -55,20 +55,20 @@
cuIcon: 'pulldown',
url: '/order/orderComb'
},
- {
- title: '鍛煎彨绌烘墭',
- name: 'callEmptyTray',
- color: 'orange',
- cuIcon: 'pullup',
- url: '/order/callEmptyTray'
- },
- {
- title: '鎵樼洏鍥炲簱',
- name: 'trayReturn',
- color: 'yellow',
- cuIcon: 'pullup',
- url: '/order/trayReturn'
- },
+ // {
+ // title: '鍛煎彨绌烘墭',
+ // name: 'callEmptyTray',
+ // color: 'orange',
+ // cuIcon: 'pullup',
+ // url: '/order/callEmptyTray'
+ // },
+ // {
+ // title: '鎵樼洏鍥炲簱',
+ // name: 'trayReturn',
+ // color: 'yellow',
+ // cuIcon: 'pullup',
+ // url: '/order/trayReturn'
+ // },
// {
// title: '骞冲簱缁勬墭',
// name: 'putOn',
diff --git a/pages/order/orderComb.vue b/pages/order/orderComb.vue
index e2b6b77..fcbc098 100644
--- a/pages/order/orderComb.vue
+++ b/pages/order/orderComb.vue
@@ -202,15 +202,17 @@
continue
}
for (let m of _this.dataList) {
- if (k.matnr == m.matnr && k.orderNo == k.orderNo) {
+ if (k.matnr == m.matnr && k.orderNo == m.orderNo && k.batch == m.batch) {
add = false
}
}
+
if (add) {
k['maxCount'] = k.anfme
_this.dataList.push(k)
}
}
+
}
}
})
--
Gitblit v1.9.1