From e2d1545d46f3ed1c98a80d74561a31369901d632 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 01 七月 2020 15:50:51 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/matCode/matCode.js | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js index 9dfe277..b3c4d7e 100644 --- a/src/main/webapp/static/js/matCode/matCode.js +++ b/src/main/webapp/static/js/matCode/matCode.js @@ -26,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: ''} @@ -57,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} @@ -338,7 +338,7 @@ 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', @@ -350,16 +350,18 @@ var templateDom = $("#templatePreview"+templateNo); var className = templateDom.attr("class"); if (className === 'template-barcode') { - res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].barcode; + res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].matNo; } else { - res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2¶m="+res.data[i].barcode; + res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2¶m="+res.data[i].matNo; } } 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+"/"; }else { @@ -486,6 +488,11 @@ elem: '#modiTime\\$', type: 'datetime' }); + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); }); -- Gitblit v1.9.1