From 98de20f08240e3252c93e4896b911095e2928552 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 15:35:25 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/matCode/matCode.js | 83 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index b5032e6..0483179 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -1,4 +1,5 @@
var pageCurr;
+var printMatCodeNos = [];
layui.use(['table','laydate', 'form','upload'], function(){
var table = layui.table;
var $ = layui.jquery;
@@ -14,6 +15,7 @@
url: baseUrl+'/matCode/list/auth',
page: true,
limit: 16,
+ limits: [16, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -78,7 +80,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -108,7 +110,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -152,7 +154,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -196,18 +198,26 @@
break;
// 鎵归噺鎵撳嵃
case "btnPrintBatch":
- layer.open({
- type: 1,
- title: '鎵归噺鎵撳嵃',
- area: ['500px'],
- shadeClose: true,
- content: $('#printDataDiv'),
- success: function(layero, index){
-
- },
- end: function () {
- }
- });
+ printMatCodeNos = [];
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鎵撳嵃鏁版嵁');
+ } else {
+ layer.open({
+ type: 1,
+ title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
+ area: ['500px'],
+ shadeClose: true,
+ content: $('#printDataDiv'),
+ success: function(layero, index){
+ for (var i = 0; i<data.length;i++) {
+ printMatCodeNos.push(data[i].matNo);
+ }
+ },
+ end: function () {
+ }
+ });
+ }
break;
}
});
@@ -299,15 +309,16 @@
break;
// 鎵撳嵃
case "btnPrint":
- console.log(data);
+ printMatCodeNos = [];
layer.open({
type: 1,
- title: '鎵撳嵃',
+ title: data.matNo + ' [鏁伴噺锛�1]',
area: ['500px'],
shadeClose: true,
content: $('#printDataDiv'),
success: function(layero, index){
layer.iframeAuto(index);
+ printMatCodeNos.push(data.matNo);
},
end: function () {
}
@@ -316,31 +327,45 @@
}
});
+ // 妯℃澘閫夋嫨
+ form.on('radio(selectTemplateRadio)', function (data) {
+ $('.template-preview').hide();
+ $('#template-preview-'+data.value).show();
+ });
+
// 寮�濮嬫墦鍗�
form.on('submit(doPrint)', function (data) {
- let param = [];
- param.push("1902980-11/12");
- console.log(param)
+ var templateNo = data.field.selectTemplate;
$.ajax({
url: baseUrl+"/macCode/print/auth",
headers: {'token': localStorage.getItem('token')},
- data: {param: param},
+ data: {param: printMatCodeNos},
method: 'POST',
async: false,
success: function (res) {
if (res.code === 200){
- console.log(res.data);
-
-
+ layer.closeAll();
+ for (let i=0;i<res.data.length;i++){
+ var templateDom = $("#templatePreview"+templateNo);
+ var className = templateDom.attr("class");
+ if (className === 'template-barcode') {
+ res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].barcode;
+ } else {
+ res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2¶m="+res.data[i].barcode;
+ }
+ }
+ var tpl = templateDom.html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ let box = $("#box");
+ box.html(html);box.show();box.print();box.hide();
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
}
})
- console.log(data.field);
- // $('#template-preview-1').print();
})
// 鏁版嵁淇濆瓨鍔ㄤ綔
@@ -415,7 +440,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -481,7 +506,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
--
Gitblit v1.9.1