From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/webapp/static/js/order/out.js | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index be85831..c83dd62 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -36,11 +36,12 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'sPgNO', align: 'center',title: '娲惧伐鍗曞彿'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
@@ -140,7 +141,7 @@
,title: false
,closeBtn: false
,offset: '50px'
- ,area: ['1200px', '700px']
+ ,area: ['80%', '80%']
,shade: 0.5
,shadeClose: false
,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
@@ -159,8 +160,11 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'model', title: '浜у搧缂栧彿', align: 'center'},
+ {field: 'batch', title: '鎵规', align: 'center'},
+ {field: 'sPgNO', title: '娲惧伐鍗曞彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
{type: 'checkbox', merge: ['locNo']},
--
Gitblit v1.9.1