From faaf07e1d8dfa4ef890209faa9e77b286b337466 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 15:14:06 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/matCode/matCode.js |   52 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 2340b15..b3c4d7e 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,
@@ -25,7 +26,7 @@
             ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
             ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
             ,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
-            ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
+            // ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
             // ,{field: 'str3', align: 'center',title: ''}
             // ,{field: 'str4', align: 'center',title: ''}
             // ,{field: 'str5', align: 'center',title: ''}
@@ -56,8 +57,8 @@
             // ,{field: 'date1$', align: 'center',title: ''}
             // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
             // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
-            // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
-            // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+            ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+            ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
             // ,{field: 'status', align: 'center',title: ''}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
@@ -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'),
@@ -257,6 +258,7 @@
             $('#fileMame').html("");
             layer.closeAll('loading');
             layer.msg(res.msg);
+            tableReload(false);
         }
         , error: function(index, upload){
             layer.closeAll('loading');
@@ -311,7 +313,7 @@
                 printMatCodeNos = [];
                 layer.open({
                     type: 1,
-                    title: '鎵撳嵃',
+                    title: data.matNo + ' [鏁伴噺锛�1]',
                     area: ['500px'],
                     shadeClose: true,
                     content: $('#printDataDiv'),
@@ -326,11 +328,17 @@
         }
     });
 
+    // 妯℃澘閫夋嫨
+    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;
         $.ajax({
-            url: baseUrl+"/macCode/print/auth",
+            url: baseUrl+"/matCode/print/auth",
             headers: {'token': localStorage.getItem('token')},
             data: {param: printMatCodeNos},
             method: 'POST',
@@ -339,16 +347,23 @@
                 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].barcodeUrl;
+                        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].matNo;
+                        } else {
+                            res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2&param="+res.data[i].matNo;
+                        }
                     }
-                    console.log(res.data);
-                    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();
+                    box.html(html);box.show();
+                    box.print({mediaPrint:true});
+                    box.hide();
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -428,7 +443,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -473,6 +488,11 @@
         elem: '#modiTime\\$',
         type: 'datetime'
     });
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
 
 
 });
@@ -494,7 +514,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