From c7d94e56033525c99d3dec0c3c08876a900b30d5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 30 六月 2020 16:38:09 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/matCode/matCode.js | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 20d0018..afa6628 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -15,6 +15,7 @@
url: baseUrl+'/matCode/list/auth',
page: true,
limit: 16,
+ limits: [16, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -25,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: ''}
@@ -56,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}
@@ -79,7 +80,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -109,7 +110,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -153,7 +154,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -257,6 +258,7 @@
$('#fileMame').html("");
layer.closeAll('loading');
layer.msg(res.msg);
+ tableReload(false);
}
, error: function(index, upload){
layer.closeAll('loading');
@@ -334,7 +336,6 @@
// 寮�濮嬫墦鍗�
form.on('submit(doPrint)', function (data) {
- console.log(data);
var templateNo = data.field.selectTemplate;
$.ajax({
url: baseUrl+"/macCode/print/auth",
@@ -360,7 +361,7 @@
let box = $("#box");
box.html(html);box.show();box.print();box.hide();
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -440,7 +441,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -485,6 +486,11 @@
elem: '#modiTime\\$',
type: 'datetime'
});
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
@@ -506,7 +512,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