From 98de20f08240e3252c93e4896b911095e2928552 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 15:35:25 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/matCode/matCode.js |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index d443f0d..0483179 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -15,6 +15,7 @@
         url: baseUrl+'/matCode/list/auth',
         page: true,
         limit: 16,
+        limits: [16, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -79,7 +80,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -109,7 +110,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -153,7 +154,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 +205,7 @@
                 } else {
                     layer.open({
                         type: 1,
-                        title: '鎵归噺鎵撳嵃',
+                        title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
                         area: ['500px'],
                         shadeClose: true,
                         content: $('#printDataDiv'),
@@ -311,7 +312,7 @@
                 printMatCodeNos = [];
                 layer.open({
                     type: 1,
-                    title: '鎵撳嵃',
+                    title: data.matNo + ' [鏁伴噺锛�1]',
                     area: ['500px'],
                     shadeClose: true,
                     content: $('#printDataDiv'),
@@ -326,6 +327,12 @@
         }
     });
 
+    // 妯℃澘閫夋嫨
+    form.on('radio(selectTemplateRadio)', function (data) {
+        $('.template-preview').hide();
+        $('#template-preview-'+data.value).show();
+    });
+
     // 寮�濮嬫墦鍗�
     form.on('submit(doPrint)', function (data) {
         var templateNo = data.field.selectTemplate;
@@ -337,20 +344,28 @@
             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;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
             }
         })
-
     })
 
     // 鏁版嵁淇濆瓨鍔ㄤ綔
@@ -425,7 +440,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -491,7 +506,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