From 09ca172a1c5dc157b30ce70af17a9a89ff17baf4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 15:31:42 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/matCode/matCode.js |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 630d5e7..20d0018 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -334,6 +334,7 @@
 
     // 寮�濮嬫墦鍗�
     form.on('submit(doPrint)', function (data) {
+        console.log(data);
         var templateNo = data.field.selectTemplate;
         $.ajax({
             url: baseUrl+"/macCode/print/auth",
@@ -345,9 +346,15 @@
                 if (res.code === 200){
                     layer.closeAll();
                     for (let i=0;i<res.data.length;i++){
-                        res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1&param="+res.data[i].barcode;
+                        var templateDom = $("#templatePreview"+templateNo);
+                        var className = templateDom.attr("class");
+                        if (className === 'template-barcode') {
+                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1&param="+res.data[i].barcode;
+                        } else {
+                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2&param="+res.data[i].barcode;
+                        }
                     }
-                    var tpl = $("#templatePreview"+templateNo).html();
+                    var tpl = templateDom.html();
                     var template = Handlebars.compile(tpl);
                     var html = template(res);
                     let box = $("#box");

--
Gitblit v1.9.1