From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码

---
 src/main/webapp/static/js/trayCode/trayCode.js |   48 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index 8919623..fc2b372 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -106,12 +106,15 @@
                 layer.open({
                     type: 1,
                     title: '鐢熸垚鎵樼洏鐮�',
-                    // offset: '100px',
-                    // area: ['360px'],
-                    // shade: 0.1,
+                    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;
@@ -147,7 +150,7 @@
                             } else if (res.code === 403) {
                                 top.location.href = baseUrl+"/";
                             } else {
-                                layer.msg(res.msg)
+                                layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                             }
                         }
                     });
@@ -248,7 +251,7 @@
                 } else if (res.code === 403){
                     top.location.href = baseUrl+"/";
                 }else {
-                    layer.msg(res.msg)
+                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                 }
                 layer.close(index);
             }
@@ -304,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="+data.field.type+"&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);
@@ -312,13 +321,36 @@
                     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(typeof I18n !== 'undefined' ? I18n.t('response.operation_success') : '鎿嶄綔鎴愬姛', {icon: 1})
+                                        } else if (res.code === 403){
+                                            top.location.href = baseUrl+"/";
+                                        } else {
+                                            layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
+                                        }
+                                    }
+                                })
+                            });
+                        })
+                    });
                     box.hide();
                     layer.closeAll();
                 } else if (res.code === 403){
                     top.location.href = baseUrl+"/";
                 }else {
-                    layer.msg(res.msg)
+                    layer.msg(typeof I18n !== 'undefined' ? I18n.t(res.msg) : res.msg, {icon: 2})
                 }
             }
         })

--
Gitblit v1.9.1