From 8c15ddabb65e6736fb176104fde850fb35e42423 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 25 六月 2025 10:38:50 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/views/order/order.html | 1 +
zy-asrs-wms/src/main/webapp/static/js/order/out.js | 6 +++---
zy-asrs-wms/src/main/webapp/static/js/order/order.js | 4 ++--
zy-asrs-wms/src/main/resources/license.lic | 0
zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html | 2 +-
zy-asrs-wms/license.lic | 0
zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js | 2 +-
zy-asrs-wms/src/main/webapp/views/order/out.html | 14 +++++++-------
8 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-wms/license.lic b/zy-asrs-wms/license.lic
index 4d004a3..09d40f9 100644
--- a/zy-asrs-wms/license.lic
+++ b/zy-asrs-wms/license.lic
Binary files differ
diff --git a/zy-asrs-wms/src/main/resources/license.lic b/zy-asrs-wms/src/main/resources/license.lic
index fbde92e..6af8e0d 100644
--- a/zy-asrs-wms/src/main/resources/license.lic
+++ b/zy-asrs-wms/src/main/resources/license.lic
Binary files differ
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/order.js b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
index cafbbd3..ac897ab 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/order.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
@@ -52,10 +52,10 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl',sort:true},
- {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160,sort:true},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
- {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
+ {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160,sort:true},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 280}
]],
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/out.js b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
index 0e94556..7bd8188 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/out.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
@@ -34,7 +34,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍝佸彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ // ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
// ,{field: 'origin', align: 'center',title: '浠撳簱鍙�'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
@@ -155,14 +155,14 @@
limit: Number.MAX_VALUE,
cellMinWidth: 100,
cols: [[
- // {type: 'checkbox', merge: ['orderNo']},
+ //{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: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos',hide: true},
- // {type: 'checkbox', merge: ['locNo']},
+ {type: 'checkbox', merge: ['locNo']},
]],
done: function (res) {
tableMerge.render(this);
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
index 47094ec..962e486 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -20,7 +20,7 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ {type: 'checkbox', width: 70}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
diff --git a/zy-asrs-wms/src/main/webapp/views/order/order.html b/zy-asrs-wms/src/main/webapp/views/order/order.html
index 6f0d81e..ec13eb6 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/order.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/order.html
@@ -78,6 +78,7 @@
<option value="2">浣滀笟涓�</option>
<option value="4">宸插畬鎴�</option>
<option value="6">涓婃姤瀹屾垚</option>
+ <option value="7">涓婃姤澶辫触</option>
</select>
</div>
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/order/out.html b/zy-asrs-wms/src/main/webapp/views/order/out.html
index 6cfbb8b..8c3f305 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/out.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/out.html
@@ -106,12 +106,12 @@
<input name="maktx" class="layui-input" placeholder="鍚嶇О"/>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">搴忓垪鐮�:</label>
- <div class="layui-input-inline">
- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">搴忓垪鐮�:</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-inline">-->
<!-- <label class="layui-form-label">鐘舵��:</label>-->
<!-- <div class="layui-input-inline">-->
@@ -279,7 +279,7 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/out.js?v=2" charset="utf-8"></script>
<!--<script type="text/template" id="takeSiteSelectTemplate">-->
<!-- {{#each data}}-->
<!-- <option value="{{siteId}}">{{desc}}</option>-->
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
index 981aa50..62c7292 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast.html
@@ -132,7 +132,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=1" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=2" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1