From 0c780a71262676dacde56cb4011f3c68f37a5cf8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 22 二月 2022 09:12:01 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 3 +++
src/main/webapp/static/js/delivery/delivery.js | 5 +++++
src/main/webapp/views/delivery/delivery.html | 10 ++++++++++
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 322a922..641f144 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -84,6 +84,9 @@
<if test="order_no!=null and order_no!='' ">
and mo.order_no like '%' + #{order_no} + '%'
</if>
+ <if test="cstmr_name!=null and cstmr_name!='' ">
+ and mo.cstmr_name like '%' + #{cstmr_name} + '%'
+ </if>
<if test="doc_type!=null and doc_type!='' ">
and mo.doc_type like '%' + #{doc_type} + '%'
</if>
diff --git a/src/main/webapp/static/js/delivery/delivery.js b/src/main/webapp/static/js/delivery/delivery.js
index 2b32213..6e42c15 100644
--- a/src/main/webapp/static/js/delivery/delivery.js
+++ b/src/main/webapp/static/js/delivery/delivery.js
@@ -54,6 +54,11 @@
insTb.reload({where: data.field, page: {curr: 1}});
});
+ // 鍚堝苟
+ form.on('submit(orderMerge)', function (data) {
+ layer.msg("鏆傛湭寮�鏀炬鍔熻兘", {icon: 7});
+ });
+
// 宸ュ叿鏉＄偣鍑讳簨浠�
table.on('tool(order)', function (obj) {
var data = obj.data;
diff --git a/src/main/webapp/views/delivery/delivery.html b/src/main/webapp/views/delivery/delivery.html
index 0d087cd..cf21d53 100644
--- a/src/main/webapp/views/delivery/delivery.html
+++ b/src/main/webapp/views/delivery/delivery.html
@@ -35,10 +35,20 @@
</div>
</div>
<div class="layui-inline">
+ <div class="layui-input-inline mr0">
+ <input name="cstmr_name" class="layui-input" type="text" placeholder="杈撳叆瀹㈡埛鍚嶇О"/>
+ </div>
+ </div>
+ <div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="orderSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
</div>
+ <div class="layui-inline">
+ <button class="layui-btn icon-btn" lay-filter="orderMerge" lay-submit>
+ <i class="layui-icon"></i>鍚堝苟
+ </button>
+ </div>
</div>
</div>
<table id="order" lay-filter="order"></table>
--
Gitblit v1.9.1