From 7f07ca76b0f76066823d4649ce4a30cb43fd6743 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 六月 2020 11:24:16 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/matQuery.html | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 65178d8..45bf474 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -46,7 +46,6 @@
</div>
</script>
-
<div class="layui-form">
<table class="layui-hide" id="matCode" lay-filter="matCode"></table>
</div>
@@ -66,6 +65,7 @@
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
+ var layer = layui.layer;
var form = layui.form;
// 鐗╂枡鏌ヨ鏁版嵁琛�
matQueryTable = table.render({
@@ -80,7 +80,7 @@
toolbar: '#toolbar',
cols: [[
{type: 'checkbox', fixed: 'left'},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', sort: 'true'},
{field: 'barcode', align: 'center', title: '鏉＄爜'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
{field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
@@ -111,11 +111,13 @@
}
});
-
-
// 椤甸潰淇敼
table.on('edit(matCode)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ if (!isNaN(obj.value)) {
+ updateMatCodeData(obj.data.matNo, Number(obj.value));
+ } else {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
+ }
});
// 鐩戝惉鎺掑簭浜嬩欢
@@ -126,7 +128,7 @@
});
searchData['orderByField'] = obj.field;
searchData['orderByType'] = obj.type;
- tableIns.reload({
+ matQueryTable.reload({
where: searchData,
page: {
curr: 1
@@ -144,9 +146,18 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(matCode)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
+ var data = checkStatus.data;
switch(obj.event) {
case 'confirm':
- console.log(checkStatus);
+ // 鏁版嵁鏍煎紡妫�鏌�
+ for (var i=0;i<data.length;i++){
+ if (isNaN(data[i]["count"])) {
+ layer.msg("鏁伴噺閿欒");
+ return;
+ }
+ }
+ parent.tableIns.reload({data: data});
+ parent.layer.close(parent.matCodeLayerIdx);
break;
}
});
--
Gitblit v1.9.1