From 50b9207fb0835f0eb011b68b891bb4420b591de2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 13:31:09 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/pakStore.js | 123 ++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index c652138..1510b4a 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -17,30 +17,25 @@
cellMinWidth: 50,
toolbar: '#toolbar',
cols: [[
- {fixed: 'left', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80},
- {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;'},
+ {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
{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: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
+ {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
]],
done: function (res, curr, count) {
$('td[data-field=count] div').html(initCountVal);
setMatCodeData(res.data);
+ limit();
+ getInBound();
}
});
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- if (!isNaN(obj.value)) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
- tableIns.reload({data: matCodeData,done:function (res) {
- // 瑕嗙洊render鏂规硶鐨刣one
- }});
- } else {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- }
+ updateMatCodeData(obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -56,19 +51,35 @@
}
// 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
for (var i=0;i<matCodeData.length;i++){
+ if (isNaN(matCodeData[i].count)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
+ return;
+ }
if (matCodeData[i].count === 0){
layer.msg("鏁伴噺涓嶈兘涓洪浂");
return;
}
}
- layer.open({
- type: 1,
- title: '閫夋嫨鍏ュ簱绔�',
- maxmin: true,
- shadeClose: true,
- content: $('#combDiv'),
- success: function (layero, index) {
-
+ $.ajax({
+ url: baseUrl+"/full/store/put/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ devpNo: Number($('#putSiteSelect').val()),
+ list: matCodeData
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
+ matCodeData = [];
+ tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
}
})
break;
@@ -79,7 +90,6 @@
table.on('tool(chooseData)', function(obj){
var data = obj.data;
switch (obj.event) {
- // 璇︽儏
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
if (matCodeData[i].matNo === data.matNo) {
@@ -87,6 +97,8 @@
}
}
tableIns.reload({data: matCodeData,done:function (res) {
+ limit();
+ getInBound();
// 瑕嗙洊render鏂规硶鐨刣one
}});
break;
@@ -101,41 +113,55 @@
}
function updateMatCodeData(matNo, count) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
- matCodeData[i]["count"] = count;
+ if (isNaN(count)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
+ } else {
+ if (count > 0) {
+ for (var i=0;i<matCodeData.length;i++){
+ if (matCodeData[i]["matNo"] === matNo){
+ matCodeData[i]["count"] = count;
+ }
+ }
+ } else {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�");
}
}
+
+ tableIns.reload({data: matCodeData,done:function (res) {
+ limit();
+ getInBound();
+ // 瑕嗙洊render鏂规硶鐨刣one
+ }});
}
- // 琛ㄥ崟
- form.on('submit(combDo)', function (data) {
+ // 鑾峰彇鍙敤鍏ュ簱绔欑偣
+ function getInBound() {
$.ajax({
- url: baseUrl+"/put/site/start",
+ url: baseUrl + "/available/put/site",
headers: {'token': localStorage.getItem('token')},
- data: null,
method: 'POST',
- async: false,
success: function (res) {
- if (res.code === 200){
- layer.closeAll();
- layer.msg(res.msg);
- matCodeData = [];
- tableIns.reload({data: matCodeData,done:function (res) {}});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ if (res.code === 200) {
+ var tpl = $("#putSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#putSiteSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg)
}
}
})
- });
+ }
+
+
});
// 鎻愬彇鐗╂枡
var matCodeLayerIdx;
function getMat() {
- // tableIns.reload({data: []});
matCodeLayerIdx = layer.open({
type: 2,
title: '鎻愬彇鐗╂枡',
@@ -147,3 +173,24 @@
}
});
}
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+ for (var i=0;i<data.length;i++){
+ let pass = false;
+ for (var j=0;j<matCodeData.length;j++){
+ if (data[i].matNo === matCodeData[j].matNo) {
+ pass = true;
+ break;
+ }
+ }
+ if (pass) {
+ data.splice(i--, 1);
+ } else {
+ data[i]["count"] = initCountVal;
+ }
+ }
+ matCodeData.push.apply(matCodeData, data);
+ tableIns.reload({data: matCodeData});
+ layer.close(matCodeLayerIdx);
+}
\ No newline at end of file
--
Gitblit v1.9.1