From ce6b5be6c0e1544bcc66f9fce9efec3ced724d95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 15:46:29 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index b408f9d..80d052e 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -10,9 +10,10 @@
tableIns = table.render({
elem: '#wrkMastLog',
headers: {token: localStorage.getItem('token')},
- url: '/wrkMastLog/list/auth',
+ url: baseUrl+'/wrkMastLog/list/auth',
page: true,
- limit: 10,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -26,10 +27,10 @@
,{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 = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -113,7 +114,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -155,7 +156,7 @@
} else {
layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
$.ajax({
- url: "/wrkMastLog/delete/auth",
+ url: baseUrl+"/wrkMastLog/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
@@ -165,7 +166,7 @@
layer.closeAll();
tableReload(false);
} else if (res.code === 403){
- top.location.href = "/";
+ 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) {
@@ -193,7 +194,7 @@
'fields': fields
};
$.ajax({
- url: "/wrkMastLog/export/auth",
+ url: baseUrl+"/wrkMastLog/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -204,7 +205,7 @@
if (res.code === 200) {
table.exportFile(titles,res.data,'xls');
} else if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg)
}
@@ -276,7 +277,7 @@
content: '../basWrkStatus/basWrkStatus_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basWrkStatus/"+ param +"/auth",
+ url: baseUrl+"/basWrkStatus/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -312,7 +313,7 @@
content: '../basWrkIotype/basWrkIotype_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basWrkIotype/"+ param +"/auth",
+ url: baseUrl+"/basWrkIotype/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -348,7 +349,7 @@
content: '../basCrnp/basCrnp_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basCrnp/"+ param +"/auth",
+ url: baseUrl+"/basCrnp/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -384,7 +385,7 @@
content: '../locMast/locMast_detail.html',
success: function(layero, index){
$.ajax({
- url: "/locMast/"+ param +"/auth",
+ url: baseUrl+"/locMast/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -420,7 +421,7 @@
content: '../basDevp/basDevp_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basDevp/"+ param +"/auth",
+ url: baseUrl+"/basDevp/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -456,7 +457,7 @@
content: '../basDevp/basDevp_detail.html',
success: function(layero, index){
$.ajax({
- url: "/basDevp/"+ param +"/auth",
+ url: baseUrl+"/basDevp/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -492,7 +493,7 @@
content: '../locMast/locMast_detail.html',
success: function(layero, index){
$.ajax({
- url: "/locMast/"+ param +"/auth",
+ url: baseUrl+"/locMast/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -528,7 +529,7 @@
content: '../user/user_detail.html',
success: function(layero, index){
$.ajax({
- url: "/user/"+ param +"/auth",
+ url: baseUrl+"/user/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -564,7 +565,7 @@
content: '../user/user_detail.html',
success: function(layero, index){
$.ajax({
- url: "/user/"+ param +"/auth",
+ url: baseUrl+"/user/"+ param +"/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -669,7 +670,7 @@
};
$.ajax({
- url: "/wrkMastLog/"+name+"/auth",
+ url: baseUrl+"/wrkMastLog/"+name+"/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
@@ -681,7 +682,7 @@
$(this).val("");
});
} else if (res.code === 403){
- top.location.href = "/";
+ 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 = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
--
Gitblit v1.9.1