From d0d64cf47ce37027307ceb64dc72e3ae36796a92 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 27 二月 2025 18:28:00 +0800
Subject: [PATCH] 四期

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

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index 25f8710..51f6a95 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -120,6 +120,7 @@
                 break;
             case 'exportData':
                 layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    layer.load(2, {time: 600*1000});
                     var titles=[];
                     var fields=[];
                     obj.config.cols[0].map(function (col) {
@@ -309,10 +310,10 @@
                     for (let i=0;i<res.data.length;i++){
                         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="+100;
+                                "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="+200;
+                                "type="+data.field.type+"&param="+res.data[i].item+"&width="+400+"&height="+180;
                         }
                     }
                     var tpl = $('#trayCodeTemplate').html();
@@ -324,7 +325,7 @@
                     box.print({
                         mediaPrint:true,
                         deferred: $.Deferred().done(function () {
-                            layer.confirm('[閲嶈] 鎵撳嵃鏄惁鎴愬姛锛�', function(){
+                            layer.confirm('[閲嶈] 鎵撳嵃鏄惁鎴愬姛锛�',  {btn: ['Yes', 'No']}, function(){
                                 $.ajax({
                                     url: baseUrl+"/trayCode/print/auth",
                                     headers: {'token': localStorage.getItem('token')},
@@ -334,6 +335,7 @@
                                         if (res.code === 200){
                                             layer.closeAll();
                                             $(".layui-laypage-btn")[0].click();
+                                            layer.msg("鎿嶄綔鎴愬姛")
                                         } else if (res.code === 403){
                                             top.location.href = baseUrl+"/";
                                         } else {

--
Gitblit v1.9.1