From 9b4de84e744b2f76a24103e791086c647c1c3027 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 13 九月 2023 07:58:36 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index 72d445a..83b0ae8 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -105,13 +105,16 @@
             case "btnTray":
                 layer.open({
                     type: 1,
-                    title: '鐢熸垚鎵樼洏鐮�',
-                    // offset: '100px',
-                    // area: ['360px'],
-                    // shade: 0.1,
+                    title: '鐢熸垚pack鐮�',
+                    offset: '100px',
+                    area: ['360px'],
+                    shade: 0.1,
                     content: $('#print-windows'),
                     success: function(layero, index){
                         layer.iframeAuto(index)
+                        http.post(baseUrl+"/trayCode/latest", null, function (res) {
+                            $('#startNo').val(res.data);
+                        })
                     },
                 });
                 break;
@@ -293,6 +296,7 @@
         ,range: true
     });
 
+    // 寮�濮嬫墦鍗�
     form.on('submit(print)', function (data) {
         $.ajax({
             url: baseUrl+"/trayCode/print/preview",
@@ -303,7 +307,13 @@
             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;
+                        if (data.field.type === '1') {
+                            res.data[i]["barcodeUrl"]=baseUrl+"/file/barcode/qrcode/auth?" +
+                                "type="+data.field.type+"&param="+res.data[i].item+"&width="+200+"&height="+90;
+                        } else {
+                            res.data[i]["barcodeUrl"]=baseUrl+"/file/barcode/qrcode/auth?" +
+                                "type="+data.field.type+"&param="+res.data[i].item+"&width="+400+"&height="+180;
+                        }
                     }
                     var tpl = $('#trayCodeTemplate').html();
                     var template = Handlebars.compile(tpl);
@@ -311,7 +321,30 @@
                     let box = $("#printBox");
                     box.html(html);
                     box.show();
-                    box.print();
+                    box.print({
+                        mediaPrint:true,
+                        deferred: $.Deferred().done(function () {
+                            layer.confirm('[閲嶈] 鎵撳嵃鏄惁鎴愬姛锛�',  {btn: ['Yes', 'No']}, function(){
+                                $.ajax({
+                                    url: baseUrl+"/trayCode/print/auth",
+                                    headers: {'token': localStorage.getItem('token')},
+                                    data: data.field,
+                                    method: 'POST',
+                                    success: function (res) {
+                                        if (res.code === 200){
+                                            layer.closeAll();
+                                            $(".layui-laypage-btn")[0].click();
+                                            layer.msg("鎿嶄綔鎴愬姛")
+                                        } else if (res.code === 403){
+                                            top.location.href = baseUrl+"/";
+                                        } else {
+                                            layer.msg(res.msg)
+                                        }
+                                    }
+                                })
+                            });
+                        })
+                    });
                     box.hide();
                     layer.closeAll();
                 } else if (res.code === 403){

--
Gitblit v1.9.1