From 5842af2c8f3d00b0a5afbee4a1f4b1778ff1872d Mon Sep 17 00:00:00 2001
From: 王佳豪 <wangjiahao@wondersgroup.com>
Date: 星期四, 04 三月 2021 08:42:20 +0800
Subject: [PATCH] 1.显示"通知单号"列 2.出库作业-提取出货内容-增加通知单号的检索条件
---
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/webapp/views/pakStore/locDetlQuery.html | 7 ++++++-
src/main/webapp/static/js/common.js | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 48bed9e..7f473cb 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -49,6 +49,9 @@
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
</if>
+ <if test="supplier!=null and supplier!=null">
+ and a.supplier like '%' + #{supplier} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 89a564e..50956f9 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -177,7 +177,7 @@
,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅', hide: true}
,{field: 'str4', align: 'center',title: '鐘舵��', hide: true}
,{field: 'str5', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'str6', align: 'center',title: '閫氱煡鍗曞彿', hide: true}
+ ,{field: 'str6', align: 'center',title: '閫氱煡鍗曞彿'}
,{field: 'str7', align: 'center',title: '榛樿浠撳簱', hide: true}
// ,{field: 'str8', align: 'center',title: '鍝佺墝'}
// ,{field: 'str9', align: 'center',title: '閲囪喘鍛�'}
@@ -208,7 +208,7 @@
,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
,{field: 'mnemonic', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿', hide: true}
+ ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿'}
// ,{field: 'warehouse', align: 'center',title: '浠撳簱'}
// ,{field: 'brand', align: 'center',title: '鍝佺墝'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 44fe0ca..2c632b4 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -69,8 +69,13 @@
<input class="layui-input" type="text" name="lgnum" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="supplier" placeholder="閫氱煡鍗曞彿" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
- <div class="layui-inline" style="width: 300px">
+ <div class="layui-inline" style="width: 300px;margin-left: 30px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
--
Gitblit v1.9.1