From 2da79f8364653941c59c3a6f5aec261ab9ea22ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 02 七月 2020 15:36:01 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/trayCode/trayCode.js |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index b283fe6..91b56e2 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -18,10 +18,10 @@
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
-            {type: 'checkbox'}
+            // {type: 'checkbox'}
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
 //             ,{field: 'id', align: 'center',title: '缂栧彿'}
-            ,{field: 'trayNo', align: 'center',title: '搴忓垪鍙�'}
+            {field: 'trayNo', align: 'center',title: '搴忓垪鍙�', sort: true}
             ,{field: 'start', align: 'center',title: '璧峰', templet:function(row){
                     var html = "<input value='start' type='checkbox' disabled='disabled' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                     if(row.start === 'Y'){html += " checked ";}
@@ -37,10 +37,10 @@
             ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
             // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
             // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
-            ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+            ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿', sort: true}
             ,{field: 'appeUser$', align: 'center',title: '娣诲姞浜哄憳'}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
         ]],
         request: {
             pageName: 'curr',
@@ -106,10 +106,12 @@
                 layer.open({
                     type: 2,
                     title: '鐢熸垚鎵樼洏鐮�',
-                    area: ['500px'],
-                    shadeClose: true,
+                    offset: '100px',
+                    area: ['360px'],
+                    shade: 0.1,
                     content: 'tray.html',
                     success: function(layero, index){
+                        layer.iframeAuto(index)
                     },
                     end: function () {
                     }
@@ -295,6 +297,17 @@
 
 });
 
+function printPreview(content) {
+    var tpl = $('#trayCodeTemplate').html();
+    var template = Handlebars.compile(tpl);
+    var html = template(content);
+    let box = $("#printBox");
+    box.html(html);
+    box.show();
+    box.print();
+    box.hide();
+}
+
 // 鍏抽棴鍔ㄤ綔
 $(document).on('click','#data-detail-close', function () {
     parent.layer.closeAll();

--
Gitblit v1.9.1