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 |   79 +++++++--------------------------------
 1 files changed, 14 insertions(+), 65 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 09a58d7..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;
@@ -19,50 +29,7 @@
         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: '淇敼浜哄憳'}
-            ,{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'
@@ -288,26 +255,6 @@
                     }
                 });
                 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 = [];
@@ -359,7 +306,9 @@
                     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+"/";
                 }else {

--
Gitblit v1.9.1