From ff5782381a5ad6896a2c5b198aff75b4fe0267e6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 17:16:31 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/trayCode/trayCode.js | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index c8bb9e0..8919623 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -104,15 +104,15 @@
// 鐢熸垚鎵樼洏鐮�
case "btnTray":
layer.open({
- type: 2,
+ type: 1,
title: '鐢熸垚鎵樼洏鐮�',
- area: ['360px'],
- shadeClose: true,
- content: 'tray.html',
+ // offset: '100px',
+ // area: ['360px'],
+ // shade: 0.1,
+ content: $('#print-windows'),
success: function(layero, index){
+ layer.iframeAuto(index)
},
- end: function () {
- }
});
break;
case 'exportData':
@@ -293,8 +293,43 @@
,range: true
});
+ // 寮�濮嬫墦鍗�
+ form.on('submit(print)', function (data) {
+ $.ajax({
+ url: baseUrl+"/trayCode/print/preview",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ for (let i=0;i<res.data.length;i++){
+ res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type="+data.field.type+"¶m="+res.data[i].item;
+ }
+ var tpl = $('#trayCodeTemplate').html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ let box = $("#printBox");
+ box.html(html);
+ box.show();
+ box.print();
+ box.hide();
+ layer.closeAll();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+
+ $('#cancel').click(function () {
+ layer.closeAll();
+ })
});
+
// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
parent.layer.closeAll();
--
Gitblit v1.9.1