From c6e32e5da5d30ce2f74f0e32c3290d421c0951f2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 17:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/webapp/static/js/orderPakout/out.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index c58479e..fbe2f93 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -32,10 +32,10 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: 'sku', width: 160}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ // ,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
+ // ,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'standby1', align: 'center',title: 'po', hide: false}
,{field: 'standby2', align: 'center',title: 'upc', hide: false}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
@@ -160,7 +160,7 @@
cols: [[
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
- {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+ {field: 'matnr', title: '鐗╂枡缂栫爜', merge: true, align: 'center', width: 350},
{field: 'batch', title: '搴忓垪鐮�', align: 'center',hide:true},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
--
Gitblit v1.9.1