From fd5c26877a27fc2385b3caf3e45d3d20d2c65184 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 10:37:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/matQuery.html | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index d43a665..f9241a7 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -31,7 +31,11 @@
<input class="layui-input" type="text" name="mat_no" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -55,7 +59,6 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
</body>
<script>
@@ -79,7 +82,7 @@
toolbar: '#toolbar',
cols: [[
{type: 'checkbox', fixed: 'left'},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', sort: 'true'},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'barcode', align: 'center', title: '鏉＄爜'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
{field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
@@ -104,31 +107,7 @@
if (res.code === 403) {
top.location.href = baseUrl + "/";
}
-
}
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(matCode)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- matQueryTable.reload({
- where: searchData,
- page: {
- curr: 1
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- limit();
- }
- });
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -137,9 +116,11 @@
var data = checkStatus.data;
switch(obj.event) {
case 'confirm':
- parent.matCodeData.push.apply(parent.matCodeData, data);
- parent.tableIns.reload({data: parent.matCodeData});
- parent.layer.close(parent.matCodeLayerIdx);
+ if (data.length === 0){
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ parent.addTableData(data);
break;
}
});
--
Gitblit v1.9.1