From 4c127c0e1b2d661f09474d63fe60330da082801a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:13:09 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期

---
 src/main/webapp/static/js/trayCode/trayCode.js |   87 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index b283fe6..bc70c7a 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -18,10 +18,10 @@
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
-            {type: 'checkbox'}
+            // {type: 'checkbox'}
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
 //             ,{field: 'id', align: 'center',title: '缂栧彿'}
-            ,{field: 'trayNo', align: 'center',title: '搴忓垪鍙�'}
+            {field: 'trayNo', align: 'center',title: '搴忓垪鍙�', sort: true}
             ,{field: 'start', align: 'center',title: '璧峰', templet:function(row){
                     var html = "<input value='start' type='checkbox' disabled='disabled' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                     if(row.start === 'Y'){html += " checked ";}
@@ -37,10 +37,10 @@
             ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
             // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
             // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
-            ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+            ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿', sort: true}
             ,{field: 'appeUser$', align: 'center',title: '娣诲姞浜哄憳'}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
         ]],
         request: {
             pageName: 'curr',
@@ -104,15 +104,18 @@
             // 鐢熸垚鎵樼洏鐮�
             case "btnTray":
                 layer.open({
-                    type: 2,
+                    type: 1,
                     title: '鐢熸垚鎵樼洏鐮�',
-                    area: ['500px'],
-                    shadeClose: true,
-                    content: 'tray.html',
+                    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);
+                        })
                     },
-                    end: function () {
-                    }
                 });
                 break;
             case 'exportData':
@@ -293,8 +296,72 @@
         ,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++){
+                        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);
+                    var html = template(res);
+                    let box = $("#printBox");
+                    box.html(html);
+                    box.show();
+                    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){
+                    top.location.href = baseUrl+"/";
+                }else {
+                    layer.msg(res.msg)
+                }
+            }
+        })
+    });
+
+    $('#cancel').click(function () {
+        layer.closeAll();
+    })
 });
 
+
 // 鍏抽棴鍔ㄤ綔
 $(document).on('click','#data-detail-close', function () {
     parent.layer.closeAll();

--
Gitblit v1.9.1