From 4bb523147bc6e9fef20142d1389c893f97321e02 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 26 十一月 2025 09:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/webapp/static/js/order/order.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 9173fa0..c82bb3e 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -243,13 +243,13 @@
{field: 'matnr', title: 'sku', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 80},
// {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'supp', title: '渚涘簲鍟�', edit: true},
- {field: 'standby1', title: '瀹㈡埛po', edit: true},
- {field: 'standby2', title: '鏉＄爜upc', edit: true},
- {field: 'standby3', title: '瀹㈡埛SKU', edit: true},
- {field: 'boxType1', title: '璐т富鍚嶇О', edit: true},
- {field: 'boxType2', title: '璐т富缂栧彿', edit: true},
- {field: 'boxType3', title: '瀹㈡埛SKU', edit: true},
+ // {field: 'specs', title: '瑙勬牸'},
+ {field: 'standby1', title: 'po'},
+ {field: 'standby2', title: 'upc'},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富鍚嶇О'},
+ {field: 'boxType2', title: 'upc'},
+ {field: 'boxType3', title: '瀹㈡埛SKU'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
--
Gitblit v1.9.1