From 0b83d075e78acfded07fafe8da133376b2260ef6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 10:26:16 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/matQuery.html | 76 ++++++--------------------------------
1 files changed, 12 insertions(+), 64 deletions(-)
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 45bf474..84eb658 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -55,12 +55,10 @@
<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>
- var initCountVal = 1;
- var matCodeData = [];
+
var pageCurr;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
@@ -80,12 +78,11 @@
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: '鐗╂枡鍗曚綅'},
{field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
- {field: 'count', title: '鏁伴噺', align: 'center', edit:'text', width: 100}
]],
request: {
pageName: 'curr',
@@ -106,41 +103,7 @@
if (res.code === 403) {
top.location.href = baseUrl + "/";
}
- $('td[data-field=count] div').html("1");
- setMatCodeData(res.data);
}
- });
-
- // 椤甸潰淇敼
- table.on('edit(matCode)', function (obj) {
- if (!isNaN(obj.value)) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
- } else {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- }
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- 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();
- }
- });
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -149,14 +112,17 @@
var data = checkStatus.data;
switch(obj.event) {
case 'confirm':
- // 鏁版嵁鏍煎紡妫�鏌�
- for (var i=0;i<data.length;i++){
- if (isNaN(data[i]["count"])) {
- layer.msg("鏁伴噺閿欒");
- return;
- }
+ if (data.length === 0){
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
}
- parent.tableIns.reload({data: data});
+ for (var i=0;i<data.length;i++){
+ data[i]["count"] = parent.initCountVal;
+ }
+
+
+ parent.matCodeData.push.apply(parent.matCodeData, data);
+ parent.tableIns.reload({data: parent.matCodeData});
parent.layer.close(parent.matCodeLayerIdx);
break;
}
@@ -176,22 +142,6 @@
});
})
- 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;
- }
- }
- console.log(matCodeData);
- }
-
function tableReload(child) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
@@ -206,8 +156,6 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- $('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