From d17c089f1d7ff3be848b05161917346e7f664a1d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 26 四月 2022 15:17:53 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pickout/pickout.js | 169 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 138 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/static/js/pickout/pickout.js b/src/main/webapp/static/js/pickout/pickout.js
index 08458ee..aca4626 100644
--- a/src/main/webapp/static/js/pickout/pickout.js
+++ b/src/main/webapp/static/js/pickout/pickout.js
@@ -1,4 +1,5 @@
var pageCurr;
+var currPick;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
@@ -40,6 +41,7 @@
,{field: 'userId', align: 'center',title: '鐢ㄦ埛ID', hide: true}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��' ,templet: '#wrkStsTpl' , width: 100}
+ ,{field: 'printTimes', align: 'center', title: '鎵撳嵃娆℃暟',width: 90}
,{field: 'zpallet', align: 'center',title: '鏉″舰鐮�' , hide:true}
,{field: 'createTime$', align: 'center',title: '', hide:true}
,{field: 'createBy', align: 'center',title: '', hide:true}
@@ -56,22 +58,30 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(leftTable)', function(obj){
var data = obj.data;
+
+
+
switch (obj.event) {
- case 'complete':
- complete(data);
+ case 'printOrder':
+ printPick(data);
break;
case "del":
var ids = [data.id];
del(ids);
+ break;
+ case "complete":
+ donePickOut(data);
break;
}
});
/* 鐩戝惉琛屽崟鍑讳簨浠� */
var selObj;
table.on('row(leftTable)', function (obj) {
+ currPick = obj.data.id;
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
tableIns.reload({where: {head_id: obj.data.id}, page: {curr: 1}});
+
});
/* 鍒犻櫎 */
@@ -89,18 +99,105 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
+
if (res.code === 200){
+
layer.msg(res.msg, {icon: 1});
- tableReload();
+
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg, {icon: 2});
}
+ leftTB.reload({where: null,page: {curr: 1}});
+ tableIns.reload({where: null,page: {curr: 1}});
}
})
});
}
+ form.on('submit(leftResearch)', function (data) {
+
+ leftTB.reload({where: {wrk_no: data.field.docName}});
+ return false;
+ });
+ // 閲嶇疆
+ form.on('submit(leftReset)', function (data) {
+
+ leftTB.reload({where: null,page: {curr: 1}});
+ $("#docName").val("");
+ tableReload(false);
+ });
+
+ function donePickOut(data) {
+ $.ajax({
+ url:baseUrl + "/pickout/done/auth",
+ headers : {'token' : localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+
+ leftTB.reload();
+ }
+ })
+ }
+
+ function printPick(data){
+ $.ajax({
+ url:baseUrl + "/work/pick/out/print",
+ headers : {'token' : localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ console.log(res);
+ res.data["barcodeUrl"]=baseUrl+"/order/code/auth?type=1¶m="+res.data.pickout.wrkNo;
+ var tpl = $('#pakoutPrintTpl').html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ var box = $("#pakoutPrintBox");
+ box.html(html);box.show();
+ box.print({
+ mediaPrint:true,
+ deferred: $.Deferred().done(function () {
+ layer.confirm('[閲嶈] 鎵撳嵃鏄惁鎴愬姛锛�', {btn: ['Yes', 'No']}, function(){
+ $.ajax({
+ url: baseUrl+"/pickout/print/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(res.data.pickout),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ leftTB.reload();
+ }
+ })
+ });
+ })
+ });
+ box.hide();
+ }
+ else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+
+ }
+
+ })
+ }
+
+
/****************************************** 鍙宠竟琛� *************************************************/
// 鏁版嵁娓叉煋
@@ -133,7 +230,7 @@
,{field: 'price', align: 'center',title: '浠锋牸', hide:true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide:true}
,{field: 'status', align: 'center',title: '鐘舵��' , hide:true}
- ,{field: 'pickStaff', align: 'center',title: '鎷ｈ揣鍛業D'}
+ ,{field: 'pickStaff$', align: 'center',title: '鎷ｈ揣鍛業D'}
,{field: 'pickStart$', align: 'center',title: '鎷ｈ揣寮�濮嬫椂闂�'}
,{field: 'pickEnd$', align: 'center',title: '鎷ｈ揣缁撴潫鏃堕棿'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿', hide:true}
@@ -142,7 +239,7 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳ID', hide:true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150, hide:true}
]],
request: {
pageName: 'curr',
@@ -167,7 +264,12 @@
limit();
}
});
-
+ // /* 琛ㄦ牸2鎼滅储 */
+ // form.on('submit(rightSearch)', function (data) {
+ //
+ // tableIns.reload({where: data.field , page: {curr: 1}});
+ // return false;
+ // });
// // 鐩戝惉鎺掑簭浜嬩欢
// table.on('sort(pickout)', function (obj) {
// var searchData = {};
@@ -246,32 +348,36 @@
// });
//
//
- // // 鎼滅储
- // form.on('submit(search)', function (data) {
- // pageCurr = 1;
- // tableReload(false);
- // });
+ // 鎼滅储
+ form.on('submit(rightSearch)', function (data) {
+ data.field.head_id = currPick;
+ tableIns.reload({
+ where: data.field,
+ page: {curr: 1}
+ });
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+
+ tableIns.reload({where: null,page: {curr: 1}});
+ $("#matnr").val("");
+ tableReload(false);
+ });
//
- // // 閲嶇疆
- // form.on('submit(reset)', function (data) {
- // pageCurr = 1;
- // clearFormVal($('#search-box'));
- // tableReload(false);
- // });
- //
- // // 鏃堕棿閫夋嫨鍣�
- // function layDateRender() {
- // layDate.render({
- // elem: '#createTime\\$',
- // type: 'datetime'
- // });
- // layDate.render({
- // elem: '#updateTime\\$',
- // type: 'datetime'
- // });
- //
- // }
- // layDateRender();
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender() {
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime'
+ });
+
+ }
+ layDateRender();
});
@@ -285,6 +391,7 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
--
Gitblit v1.9.1