From fde7a28aae0a134821d6eb5ebaa5e6319cb73139 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:44:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/webapp/static/js/rowLastno/rowLastno.js | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index 6ec9492..f26e048 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -18,13 +18,16 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left'}
+ // {type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'whsType', align: 'center',title: '绫诲埆', width:80}
+// ,
+ {field: 'whsType', align: 'center',title: '绫诲埆', width:80}
,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�'}
,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿'}
,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿', style: 'color: #AA3130;font-weight: bold'}
,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿'}
+ ,{field: 'sCrnNo', align: 'center',title: '璧峰鍫嗗灈鏈哄彿'}
+ ,{field: 'eCrnNo', align: 'center',title: '缁堟鍫嗗灈鏈哄彿'}
,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�'}
,{field: 'staNoList', align: 'center',title: '绔欑偣闆嗗悎'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
@@ -328,6 +331,8 @@
sRow: $('#sRow').val(),
eRow: $('#eRow').val(),
crnQty: $('#crnQty').val(),
+ sCrnNo: $('#sCrnNo').val(),
+ eCrnNo: $('#eCrnNo').val(),
staNoList: $('#staNoList').val(),
memo: $('#memo').val(),
modiUser: $('#modiUser').val(),
--
Gitblit v1.9.1