From d16d3b70e94f798d7e5abd145f8566d81d0c66c9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 18:07:45 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/trayCode/trayCode.js | 163 +++++++++++++++++++++++++++---------------------------
1 files changed, 81 insertions(+), 82 deletions(-)
diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index 2af384b..bc70c7a 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',
@@ -104,15 +104,18 @@
// 鐢熸垚鎵樼洏鐮�
case "btnTray":
layer.open({
- type: 2,
+ type: 1,
title: '鐢熸垚鎵樼洏鐮�',
- area: ['500px'],
- shadeClose: true,
- content: 'tray.html',
+ offset: '100px',
+ area: ['360px'],
+ shade: 0.1,
+ content: $('#print-windows'),
success: function(layero, index){
+ layer.iframeAuto(index)
+ http.post(baseUrl+"/trayCode/latest", null, function (res) {
+ $('#startNo').val(res.data);
+ })
},
- end: function () {
- }
});
break;
case 'exportData':
@@ -197,78 +200,6 @@
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
}
});
- break;
- case 'modiUser':
- var param = top.reObject(data).modiUser;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '淇敼浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- 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');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'appeUser':
- var param = top.reObject(data).appeUser;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '娣诲姞浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- 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');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
break;
}
@@ -359,10 +290,78 @@
elem: '#appeTime\\$',
type: 'datetime'
});
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ // 寮�濮嬫墦鍗�
+ form.on('submit(print)', function (data) {
+ $.ajax({
+ url: baseUrl+"/trayCode/print/preview",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ for (let i=0;i<res.data.length;i++){
+ if (data.field.type === '1') {
+ res.data[i]["barcodeUrl"]=baseUrl+"/file/barcode/qrcode/auth?" +
+ "type="+data.field.type+"¶m="+res.data[i].item+"&width="+200+"&height="+90;
+ } else {
+ res.data[i]["barcodeUrl"]=baseUrl+"/file/barcode/qrcode/auth?" +
+ "type="+data.field.type+"¶m="+res.data[i].item+"&width="+400+"&height="+180;
+ }
+ }
+ var tpl = $('#trayCodeTemplate').html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ let box = $("#printBox");
+ box.html(html);
+ box.show();
+ box.print({
+ mediaPrint:true,
+ deferred: $.Deferred().done(function () {
+ layer.confirm('[閲嶈] 鎵撳嵃鏄惁鎴愬姛锛�', {btn: ['Yes', 'No']}, function(){
+ $.ajax({
+ url: baseUrl+"/trayCode/print/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ $(".layui-laypage-btn")[0].click();
+ layer.msg("鎿嶄綔鎴愬姛")
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ })
+ });
+ box.hide();
+ layer.closeAll();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ $('#cancel').click(function () {
+ layer.closeAll();
+ })
});
+
// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
parent.layer.closeAll();
--
Gitblit v1.9.1