From dc38614bc3cba86365175fec2d897f24fcb8a084 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 六月 2020 15:44:20 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/matCode/matCode.js |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 85f7dfc..65aa27a 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -79,7 +79,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -109,7 +109,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -153,7 +153,7 @@
                                     layer.closeAll();
                                     tableReload(false);
                                 } else if (res.code === 403){
-                                    top.location.href = baseUrl;
+                                    top.location.href = baseUrl+"/";
                                 } else {
                                     layer.msg(res.msg)
                                 }
@@ -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'),
@@ -324,6 +324,12 @@
                 });
                 break;
         }
+    });
+
+    // 妯℃澘閫夋嫨
+    form.on('radio(selectTemplateRadio)', function (data) {
+        $('.template-preview').hide();
+        $('#template-preview-'+data.value).show();
     });
 
     // 寮�濮嬫墦鍗�
@@ -339,15 +345,21 @@
                 if (res.code === 200){
                     layer.closeAll();
                     for (let i=0;i<res.data.length;i++){
-                        res.data[i]["barcodeUrl"]=baseUrl+"/macCode/barcode/auth?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");
                     box.html(html);box.show();box.print();box.hide();
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -427,7 +439,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -493,7 +505,7 @@
         },
         done: function (res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             if (res.data.length === 0 && count !== 0) {

--
Gitblit v1.9.1