From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

---
 src/main/webapp/static/js/nodeLoc/nodeLoc.js |  107 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/src/main/webapp/static/js/nodeLoc/nodeLoc.js b/src/main/webapp/static/js/nodeLoc/nodeLoc.js
index d144f92..2fde79e 100644
--- a/src/main/webapp/static/js/nodeLoc/nodeLoc.js
+++ b/src/main/webapp/static/js/nodeLoc/nodeLoc.js
@@ -1,6 +1,9 @@
 var pageCurr;
 var printMatCodeNos = [];
 var admin;
+var printContent = [];
+var insTb;
+var tableIns;
 function getCol() {
     var cols = [
         {type: 'checkbox'}
@@ -28,7 +31,7 @@
     var xmSelect = layui.xmSelect;
 
     // 鍟嗗搧鍒嗙被鏁版嵁
-    var insTb = treeTable.render({
+    insTb = treeTable.render({
         elem: '#tag',
         url: baseUrl+'/node/list/auth',
         headers: {token: localStorage.getItem('token')},
@@ -191,29 +194,38 @@
                 });
                 break;
             // 鎵归噺鎵撳嵃
-            case "btnPrintBatch":
-                printMatCodeNos = [];
-                var data = checkStatus.data;
-                if (data.length === 0){
-                    layer.msg('璇烽�夋嫨鎵撳嵃鏁版嵁');
-                } else {
-                    layer.open({
-                        type: 1,
-                        title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
-                        area: ['500px'],
-                        shadeClose: true,
-                        content: $('#printDataDiv'),
-                        success: function(layero, index){
-                            for (var i = 0; i<data.length;i++) {
-                                printMatCodeNos.push(data[i].matnr);
-                            }
-                        },
-                        end: function () {
-                        }
-                    });
+            case "printBatch":
+                var checkRows = checkStatus.data;
+                printContent = [];
+                if (checkRows.length === 0) {
+                    layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏁版嵁', {icon: 2});
+                    return;
                 }
+                printContent = checkRows.map(function (d) {
+                    if (!d.LAY_INDETERMINATE && d.type === 3) {
+                        return d.name;
+                    } else {
+                        return null;
+                    }
+                });
+                layer.open({
+                    type: 1,
+                    title: '鎵归噺鎵撳嵃 [鏁伴噺'+ printContent.length +']',
+                    area: ['500px'],
+                    shadeClose: true,
+                    content: $('#printDataDiv'),
+                    success: function(layero, index){
+                    },
+                    end: function () {
+                    }
+                });
                 break;
         }
+    });
+    // 妯℃澘閫夋嫨
+    form.on('radio(selectTemplateRadio)', function (data) {
+        $('.template-preview').hide();
+        $('#template-preview-'+data.value).show();
     });
 
     // 鐩戝惉琛屽伐鍏蜂簨浠�
@@ -325,38 +337,31 @@
     // 寮�濮嬫墦鍗�
     form.on('submit(doPrint)', function (data) {
         var templateNo = data.field.selectTemplate;
-        $.ajax({
-            url: baseUrl+"/node/print/auth",
-            headers: {'token': localStorage.getItem('token')},
-            data: {param: printMatCodeNos},
-            method: 'POST',
-            async: false,
-            success: function (res) {
-                if (res.code === 200){
-                    layer.closeAll();
-                    for (let i=0;i<res.data.length;i++){
-                        var templateDom = $("#templatePreview"+templateNo);
-                        var className = templateDom.attr("class");
-                        if (className === 'template-barcode') {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+res.data[i].matnr;
-                        } else {
-                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr;
-                        }
-                    }
-                    var tpl = templateDom.html();
-                    var template = Handlebars.compile(tpl);
-                    var html = template(res);
-                    var box = $("#box");
-                    box.html(html);box.show();
-                    box.print({mediaPrint:true});
-                    box.hide();
-                } else if (res.code === 403){
-                    top.location.href = baseUrl+"/";
-                }else {
-                    layer.msg(res.msg)
+        var data = [];
+        var type = 1;
+        for (var i = 0; i<printContent.length; i ++) {
+            if (printContent[i] != null && printContent[i] !== '') {
+                var barcodeUrl;
+                if (type === 1) {
+                    barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"&param="+printContent[i]+"&width="+200+"&height="+70;
+                } else {
+                    barcodeUrl = baseUrl+"/mac/code/auth?type="+type+"&param="+printContent[i]+"&width="+400+"&height="+180;
                 }
+                data.push({
+                    item: printContent[i],
+                    barcodeUrl: barcodeUrl
+                })
             }
-        })
+        }
+        var templateDom = $("#templatePreview"+templateNo);
+        var tpl = templateDom.html();
+        var template = Handlebars.compile(tpl);
+        var html = template({data: data});
+        var box = $("#box");
+        box.html(html);
+        box.show();
+        box.print({mediaPrint:true});
+        box.hide();
     });
 
     // 鎼滅储鏍忔悳绱簨浠�

--
Gitblit v1.9.1