From 7e832f2c7ccaa2bc26e84ad90e685c7b5a637f2f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 08:18:01 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 621cce7..5d0e30f 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -12,24 +12,25 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/wrkMastLog/list/auth',
page: true,
- limit: 10,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
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: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯',event: 'sourceStaNo', style: 'cursor:pointer'}
- ,{field: 'staNo$', align: 'center',title: '鐩爣绔�',event: 'staNo', style: 'cursor:pointer'}
- ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�',event: 'sourceLocNo', style: 'cursor:pointer'}
- ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅',event: 'locNo', style: 'cursor:pointer'}
+ ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
+ ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
+ ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
+ ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
// var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
// if(row.picking === 'Y'){html += " checked ";}
@@ -52,8 +53,8 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
- // ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
- // ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
@@ -83,7 +84,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -113,7 +114,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -165,7 +166,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -175,7 +176,7 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -204,7 +205,7 @@
if (res.code === 200) {
table.exportFile(titles,res.data,'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -681,7 +682,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = baseUrl;
+ top.location.href = baseUrl+"/";
}else {
layer.msg(res.msg)
}
@@ -762,7 +763,11 @@
elem: '#logErrTime\\$',
type: 'datetime'
});
-
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
@@ -783,7 +788,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