From 1fe4313bb3326afa12c827e2d620fa735b8e37fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十二月 2020 14:15:10 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/matCode/matCode.js |  120 ++++++++++++++++++++++--------------------------------------
 1 files changed, 44 insertions(+), 76 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 30ded55..043cc41 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -1,5 +1,15 @@
 var pageCurr;
 var printMatCodeNos = [];
+function getCol() {
+    var cols = [
+        {type: 'checkbox'}
+    ];
+    cols.push.apply(cols, matCols);
+    cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+        ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+        ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+    return cols;
+}
 layui.use(['table','laydate', 'form','upload'], function(){
     var table = layui.table;
     var $ = layui.jquery;
@@ -15,53 +25,11 @@
         url: baseUrl+'/matCode/list/auth',
         page: true,
         limit: 16,
+        limits: [16, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
-        cols: [[
-            {type: 'checkbox'}
-//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-            ,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
-            ,{field: 'barcode', align: 'center',title: '鏉$爜'}
-            ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
-            ,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
-            ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
-            // ,{field: 'str3', align: 'center',title: ''}
-            // ,{field: 'str4', align: 'center',title: ''}
-            // ,{field: 'str5', align: 'center',title: ''}
-            // ,{field: 'str6', align: 'center',title: ''}
-            // ,{field: 'str7', align: 'center',title: ''}
-            // ,{field: 'str8', align: 'center',title: ''}
-            // ,{field: 'str9', align: 'center',title: ''}
-            // ,{field: 'str10', align: 'center',title: ''}
-            // ,{field: 'str11', align: 'center',title: ''}
-            // ,{field: 'str12', align: 'center',title: ''}
-            // ,{field: 'str13', align: 'center',title: ''}
-            // ,{field: 'str14', align: 'center',title: ''}
-            // ,{field: 'str15', align: 'center',title: ''}
-            // ,{field: 'str16', align: 'center',title: ''}
-            // ,{field: 'str17', align: 'center',title: ''}
-            // ,{field: 'str18', align: 'center',title: ''}
-            // ,{field: 'str19', align: 'center',title: ''}
-            // ,{field: 'str20', align: 'center',title: ''}
-            // ,{field: 'str21', align: 'center',title: ''}
-            // ,{field: 'str22', align: 'center',title: ''}
-            // ,{field: 'str23', align: 'center',title: ''}
-            // ,{field: 'num1', align: 'center',title: ''}
-            // ,{field: 'num2', align: 'center',title: ''}
-            // ,{field: 'num3', align: 'center',title: ''}
-            // ,{field: 'num4', align: 'center',title: ''}
-            // ,{field: 'num5', align: 'center',title: ''}
-            // ,{field: 'num6', align: 'center',title: ''}
-            // ,{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: 'status', align: 'center',title: ''}
-
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
-        ]],
+        cols: [getCol()],
         request: {
             pageName: 'curr',
             pageSize: 'limit'
@@ -79,7 +47,7 @@
         },
         done: function(res, curr, count) {
             if (res.code === 403) {
-                top.location.href = baseUrl;
+                top.location.href = baseUrl+"/";
             }
             pageCurr=curr;
             limit();
@@ -109,7 +77,7 @@
             },
             done: function (res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }
                 pageCurr=curr;
                 limit();
@@ -153,7 +121,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 +172,7 @@
                 } else {
                     layer.open({
                         type: 1,
-                        title: '鎵归噺鎵撳嵃',
+                        title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
                         area: ['500px'],
                         shadeClose: true,
                         content: $('#printDataDiv'),
@@ -257,6 +225,7 @@
             $('#fileMame').html("");
             layer.closeAll('loading');
             layer.msg(res.msg);
+            tableReload(false);
         }
         , error: function(index, upload){
             layer.closeAll('loading');
@@ -286,32 +255,12 @@
                     }
                 });
                 break;
-            // 缂栬緫
-            case 'edit':
-                layer.open({
-                    type: 2,
-                    title: '淇敼',
-                    maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
-                    shadeClose: false,
-                    content: 'matCode_detail.html',
-                    success: function(layero, index){
-                        layer.getChildFrame('#data-detail-submit-save', index).hide();
-                        setFormVal(layer.getChildFrame('#detail', index), data, false);
-                        top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
-                        top.convertDisabled(layer.getChildFrame('#matNo', index), true);
-                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
-                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-                    }
-                });
-                break;
             // 鎵撳嵃
             case "btnPrint":
                 printMatCodeNos = [];
                 layer.open({
                     type: 1,
-                    title: '鎵撳嵃',
+                    title: data.matNo + ' [鏁伴噺锛�1]',
                     area: ['500px'],
                     shadeClose: true,
                     content: $('#printDataDiv'),
@@ -326,11 +275,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,15 +294,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;
+                        }
                     }
-                    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)
                 }
@@ -427,7 +390,7 @@
                         $(this).val("");
                     });
                 } else if (res.code === 403){
-                    top.location.href = baseUrl;
+                    top.location.href = baseUrl+"/";
                 }else {
                     layer.msg(res.msg)
                 }
@@ -472,6 +435,11 @@
         elem: '#modiTime\\$',
         type: 'datetime'
     });
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
+    });
 
 
 });
@@ -493,7 +461,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