From e2461a48bfce4f9f3660c2bb70bff71f86210f6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 六月 2020 08:38:36 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/matQuery.html | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index dd63968..abdfab1 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -60,11 +60,13 @@
</body>
<script>
+ var initCountVal = 1;
var matCodeData = [];
var pageCurr;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
+ var layer = layui.layer;
var form = layui.form;
// 鐗╂枡鏌ヨ鏁版嵁琛�
matQueryTable = table.render({
@@ -72,14 +74,14 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl + '/matCode/list/auth',
page: true,
- limit: 10,
- limits: [10, 30,50,100],
+ limit: 7,
+ limits: [7, 10, 30,50,100],
even: true,
cellMinWidth: 50,
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: '鐗╂枡鍗曚綅'},
@@ -105,16 +107,18 @@
if (res.code === 403) {
top.location.href = baseUrl + "/";
}
- setMatCodeData(res.data);
$('td[data-field=count] div').html("1");
+ setMatCodeData(res.data);
}
});
-
-
// 椤甸潰淇敼
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("璇疯緭鍏ユ暟瀛�");
+ }
});
// 鐩戝惉鎺掑簭浜嬩欢
@@ -125,7 +129,7 @@
});
searchData['orderByField'] = obj.field;
searchData['orderByType'] = obj.type;
- tableIns.reload({
+ matQueryTable.reload({
where: searchData,
page: {
curr: 1
@@ -145,7 +149,14 @@
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'confirm':
- console.log(checkStatus);
+ // 鏁版嵁鏍煎紡妫�鏌�
+ for (var i=0;i<matCodeData.length;i++){
+ if (isNaN(matCodeData[i]["count"])) {
+ layer.msg("鏁伴噺閿欒");
+ return;
+ }
+ }
+ parent.layer.close(parent.matCodeLayerIdx);
break;
}
});
@@ -164,14 +175,17 @@
});
})
- function setMatCodeData(data, matNo, count) {
+ function setMatCodeData(data) {
matCodeData = data;
+ for (var i=0;i<matCodeData.length;i++){
+ matCodeData[i]["count"] = initCountVal;
+ }
}
function updateMatCodeData(matNo, count) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i][matNo] === matNo){
- matCodeData[i][count] = count;
+ if (matCodeData[i]["matNo"] === matNo){
+ matCodeData[i]["count"] = count;
}
}
console.log(matCodeData);
@@ -191,8 +205,8 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- setMatCodeData(res.data);
$('td[data-field=count] div').html("1");
+ setMatCodeData(res.data);
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
--
Gitblit v1.9.1