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 |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index d443f0d..20d0018 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -204,7 +204,7 @@
                 } else {
                     layer.open({
                         type: 1,
-                        title: '鎵归噺鎵撳嵃',
+                        title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
                         area: ['500px'],
                         shadeClose: true,
                         content: $('#printDataDiv'),
@@ -311,7 +311,7 @@
                 printMatCodeNos = [];
                 layer.open({
                     type: 1,
-                    title: '鎵撳嵃',
+                    title: data.matNo + ' [鏁伴噺锛�1]',
                     area: ['500px'],
                     shadeClose: true,
                     content: $('#printDataDiv'),
@@ -326,8 +326,15 @@
         }
     });
 
+    // 妯℃澘閫夋嫨
+    form.on('radio(selectTemplateRadio)', function (data) {
+        $('.template-preview').hide();
+        $('#template-preview-'+data.value).show();
+    });
+
     // 寮�濮嬫墦鍗�
     form.on('submit(doPrint)', function (data) {
+        console.log(data);
         var templateNo = data.field.selectTemplate;
         $.ajax({
             url: baseUrl+"/macCode/print/auth",
@@ -337,12 +344,21 @@
             async: false,
             success: function (res) {
                 if (res.code === 200){
-                    var tpl = $("#templatePreview"+templateNo).html();
+                    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+"/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 = templateDom.html();
                     var template = Handlebars.compile(tpl);
                     var html = template(res);
-                    $("#box").html(html);
-                    $("#box").print();
-                    // $('#template-preview-'+templateNo).print();
+                    let box = $("#box");
+                    box.html(html);box.show();box.print();box.hide();
                 } else if (res.code === 403){
                     top.location.href = baseUrl;
                 }else {
@@ -350,7 +366,6 @@
                 }
             }
         })
-
     })
 
     // 鏁版嵁淇濆瓨鍔ㄤ綔

--
Gitblit v1.9.1