From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 25 十二月 2023 10:23:08 +0800 Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1 --- src/main/webapp/static/js/node/node.js | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/static/js/node/node.js b/src/main/webapp/static/js/node/node.js index e53d167..de3d782 100644 --- a/src/main/webapp/static/js/node/node.js +++ b/src/main/webapp/static/js/node/node.js @@ -2,6 +2,7 @@ var admin; var areas; var matXmSelect; +var printContent = []; layui.config({ base: baseUrl + "/static/layui/lay/modules/" }).extend({ @@ -77,18 +78,32 @@ }); doDel({ids: ids}); } else if (obj.event === 'printBatch') { + printContent = []; if (checkRows.length === 0) { layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁', {icon: 2}); return; } - var printContent = checkRows.map(function (d) { + printContent = checkRows.map(function (d) { if (!d.LAY_INDETERMINATE && d.type === 3) { return d.name; } else { return null; } }); - printBatch(printContent, 1); + layer.open({ + type: 1, + title: '鎵归噺鎵撳嵃 [鏁伴噺'+ printContent.length +']', + area: ['500px'], + shadeClose: true, + content: $('#printDataDiv'), + success: function(layero, index){ + }, + end: function () { + } + }); + + + //printBatch(printContent, 1); }else if (obj.event === 'nodeInit'){ nodeInit(); } @@ -101,6 +116,12 @@ } else if (obj.event === 'del') { // 鍒犻櫎 doDel(obj); } + }); + + // 妯℃澘閫夋嫨 + form.on('radio(selectTemplateRadio)', function (data) { + $('.template-preview').hide(); + $('#template-preview-'+data.value).show(); }); /* 鏄剧ず琛ㄥ崟寮圭獥 */ @@ -201,14 +222,15 @@ // 鎵归噺鎵撳嵃 function printBatch(printMsgList, type) { + var data = []; for (var i = 0; i<printMsgList.length; i ++) { if (printMsgList[i] != null && printMsgList[i] !== '') { var barcodeUrl; if (type === 1) { - barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"¶m="+printMsgList[i]+"&width="+200+"&height="+70; + barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printMsgList[i]+"&width="+200+"&height="+70; } else { - barcodeUrl = baseUrl+"/barcode/qrcode/auth?type="+type+"¶m="+printMsgList[i]+"&width="+400+"&height="+180; + barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printMsgList[i]+"&width="+400+"&height="+180; } data.push({ item: printMsgList[i], @@ -226,6 +248,36 @@ box.hide(); } + // 寮�濮嬫墦鍗� + form.on('submit(doPrint)', function (data) { + var templateNo = data.field.selectTemplate; + var data = []; + var type = 1; + for (var i = 0; i<printContent.length; i ++) { + if (printContent[i] != null && printContent[i] !== '') { + var barcodeUrl; + if (type === 1) { + barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printContent[i]+"&width="+200+"&height="+70; + } else { + barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"¶m="+printContent[i]+"&width="+400+"&height="+180; + } + data.push({ + item: printContent[i], + barcodeUrl: barcodeUrl + }) + } + } + var templateDom = $("#templatePreview"+templateNo); + var tpl = templateDom.html(); + var template = Handlebars.compile(tpl); + var html = template({data: data}); + var box = $("#box"); + box.html(html); + box.show(); + box.print({mediaPrint:true}); + box.hide(); + }); + function nodeInit(){ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){ -- Gitblit v1.9.1