From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/matCode/matCode.js | 171 +++++++++++++++++++++++++-------------------------------
1 files changed, 77 insertions(+), 94 deletions(-)
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index d443f0d..a5871d6 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:110})
+ 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');
@@ -267,6 +236,27 @@
table.on('tool(matCode)', function(obj){
var data = obj.data;
switch (obj.event) {
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '缂栬緫',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'matCode_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ top.convertDisabled(layer.getChildFrame('#matNo', index), true);
+ // layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.getChildFrame('#data-detail-submit-save,#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');
+ }
+ });
+ break;
// 璇︽儏
case 'detail':
layer.open({
@@ -286,32 +276,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,31 +296,47 @@
}
});
+ // 妯℃澘閫夋嫨
+ 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',
async: false,
success: function (res) {
if (res.code === 200){
- var tpl = $("#templatePreview"+templateNo).html();
+ layer.closeAll();
+ for (let i=0;i<res.data.length;i++){
+ 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].matNo;
+ } else {
+ 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);
- $("#box").html(html);
- $("#box").print();
- // $('#template-preview-'+templateNo).print();
+ let box = $("#box");
+ 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)
}
}
})
-
})
// 鏁版嵁淇濆瓨鍔ㄤ綔
@@ -369,12 +355,18 @@
function method(name){
var index = layer.load(1, {
- shade: [0.5,'#000']
+ shade: [0.5,'#000000']
});
var data = {
matNo: $('#matNo').val(),
barcode: $('#barcode').val(),
matName: $('#matName').val(),
+ specs: $('#specs').val(),
+ unit: $('#unit').val(),
+ size: $('#size').val(),
+ color: $('#color').val(),
+ weight: $('#weight').val(),
+
str1: $('#str1').val(),
str2: $('#str2').val(),
str3: $('#str3').val(),
@@ -385,25 +377,11 @@
str8: $('#str8').val(),
str9: $('#str9').val(),
str10: $('#str10').val(),
- str11: $('#str11').val(),
- str12: $('#str12').val(),
- str13: $('#str13').val(),
- str14: $('#str14').val(),
- str15: $('#str15').val(),
- str16: $('#str16').val(),
- str17: $('#str17').val(),
- str18: $('#str18').val(),
- str19: $('#str19').val(),
- str20: $('#str20').val(),
- str21: $('#str21').val(),
- str22: $('#str22').val(),
- str23: $('#str23').val(),
num1: $('#num1').val(),
num2: $('#num2').val(),
num3: $('#num3').val(),
num4: $('#num4').val(),
num5: $('#num5').val(),
- num6: $('#num6').val(),
date1: top.strToDate($('#date1\\$').val()),
appeUser: $('#appeUser').val(),
appeTime: top.strToDate($('#appeTime\\$').val()),
@@ -425,7 +403,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -467,8 +445,13 @@
type: 'datetime'
});
layDate.render({
- elem: '#modiTime\\$',
+ elem: 'modiTime#\\$',
type: 'datetime'
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
});
@@ -491,7 +474,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