From c9bb514f91a3a1b0e1eaa59718768d77373412c9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 08:58:59 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 5 +++++
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/webapp/static/js/common.js | 4 ++--
src/main/webapp/views/order/order.html | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 35c9ee4..39ad06b 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -108,6 +108,9 @@
<if test="manu!=null and manu!='' ">
and a.manu like '%' + #{manu} + '%'
</if>
+ <if test="batch!=null and batch!='' ">
+ and a.batch like '%' + #{batch} + '%'
+ </if>
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
</if>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index f399cd3..a05c91c 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -228,11 +228,11 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true, width: 290}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true, width: 200}
,{field: 'specs', align: 'center',title: '瑙勬牸', width: 200}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true, width: 150}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true, hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true, hide: false}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 4690b27..abb6f7d 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -84,7 +84,7 @@
<i class="layui-icon"></i>娣诲姞
</button>
<button id="importOrder" class="layui-btn icon-btn btn-add">
- <i class="layui-icon layui-icon-upload"></i> 瀵煎叆閿�鍞崟
+ <i class="layui-icon layui-icon-upload"></i> 瀵煎叆璁㈠崟
</button>
<input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
</div>
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index fca817d..67f8f58 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -66,6 +66,11 @@
<input class="layui-input" type="text" name="specs" placeholder="鐗╂枡瑙勬牸" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
--
Gitblit v1.9.1