From 8616db4ff233414053845a742058197691aafd99 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 16:35:04 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/trayCode/trayCode.js |   57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index 91b56e2..5d5d836 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -104,12 +104,12 @@
             // 鐢熸垚鎵樼洏鐮�
             case "btnTray":
                 layer.open({
-                    type: 2,
+                    type: 1,
                     title: '鐢熸垚鎵樼洏鐮�',
                     offset: '100px',
                     area: ['360px'],
                     shade: 0.1,
-                    content: 'tray.html',
+                    content: $('#print-windows'),
                     success: function(layero, index){
                         layer.iframeAuto(index)
                     },
@@ -295,18 +295,51 @@
         ,range: true
     });
 
+    form.on('submit(print)', function (data) {
+        // $.ajax({
+        //     url: baseUrl+"/trayCode/print/preview",
+        //     headers: {'token': localStorage.getItem('token')},
+        //     data: {
+        //         startNo: $('#startNo'),
+        //         count: $('#count'),
+        //         type: $("input[name='type']:checked").val()
+        //     },
+        //     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();
+        //             // parent.layer.close(parent.layer.getFrameIndex(window.name));
+        //         } else if (res.code === 403){
+        //             top.location.href = baseUrl+"/";
+        //         }else {
+        //             layer.msg(res.msg)
+        //         }
+        //     }
+        // })
+    });
+
+
 });
 
-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();
-}
+
+$('#print').click(function () {
+
+});
+
+$('#cancel').click(function () {
+    // layer.close(layer.getFrameIndex(window.name));
+})
 
 // 鍏抽棴鍔ㄤ綔
 $(document).on('click','#data-detail-close', function () {

--
Gitblit v1.9.1