From 6ec763ab7467fc01783336e13613a516423578e7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 17:14:32 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/trayCode/trayCode.js |   55 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index 91b56e2..72d445a 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -104,17 +104,15 @@
             // 鐢熸垚鎵樼洏鐮�
             case "btnTray":
                 layer.open({
-                    type: 2,
+                    type: 1,
                     title: '鐢熸垚鎵樼洏鐮�',
-                    offset: '100px',
-                    area: ['360px'],
-                    shade: 0.1,
-                    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':
@@ -295,18 +293,41 @@
         ,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=1&param="+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();
+    })
 });
 
-function printPreview(content) {
-    var tpl = $('#trayCodeTemplate').html();
-    var template = Handlebars.compile(tpl);
-    var html = template(content);
-    let box = $("#printBox");
-    box.html(html);
-    box.show();
-    box.print();
-    box.hide();
-}
 
 // 鍏抽棴鍔ㄤ綔
 $(document).on('click','#data-detail-close', function () {

--
Gitblit v1.9.1