From 44c6df2e7b14b2126b0157b07803ac83047d7829 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 26 十二月 2025 16:20:20 +0800
Subject: [PATCH] #agv任务
---
src/main/webapp/static/js/taskLog/taskLog.js | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/static/js/taskLog/taskLog.js b/src/main/webapp/static/js/taskLog/taskLog.js
index d7f562b..231f2bb 100644
--- a/src/main/webapp/static/js/taskLog/taskLog.js
+++ b/src/main/webapp/static/js/taskLog/taskLog.js
@@ -11,7 +11,7 @@
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#taskLog',
- headers: {token: localStorage.getItem('token')},
+ headers: { token: localStorage.getItem('token') },
url: baseUrl + '/taskLog/list/auth',
page: true,
limit: 16,
@@ -20,19 +20,24 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {field: 'id', align: 'center', title: 'id'}
- , {field: 'wrkNo', align: 'center', title: '浠诲姟鍙�'}
- , {field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�',}
- , {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��'}
- , {field: 'ioPri', align: 'center', title: '浼樺厛绾�',hide: true}
- , {field: 'sourceStaNo', align: 'center', title: '婧愮珯'}
- , {field: 'staNo', align: 'center', title: '鐩爣绔�'}
- , {field: 'invWh', align: 'center', title: 'agv'}
- , {field: 'barcode', align: 'center', title: '鏉＄爜'}
- , {field: 'appeUser$', align: 'center', title: '鍒涘缓浜�'}
- , {field: 'appeTime$', align: 'center', title: '鍒涘缓鏃堕棿',width: 170}
- , {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true}
- , {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true,width: 170}
+ // {field: 'id', align: 'center', title: 'id'}
+ { field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 105 }
+ , { field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', }
+ , { field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��', }
+ , { field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�', width: 150 }
+ , { field: 'ioPri', align: 'center', title: '浼樺厛绾�', width: 80 }
+ , { field: 'taskType$', align: 'center', title: '浠诲姟绫诲瀷', width: 120 }
+ , { field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�', hide: true }
+ , { field: 'sourceStaNo$', align: 'center', title: '婧愮珯', width: 120 }
+ , { field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�', width: 120 }
+ , { field: 'staNo$', align: 'center', title: '鐩爣绔�', width: 120 }
+ , { field: 'locNo', align: 'center', title: '鐩爣搴撲綅', width: 120 }
+ , { field: 'barcode', align: 'center', title: '鏉＄爜', width: 110 }
+ , { field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true }
+ , { field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true }
+ , { field: 'modiUser$', align: 'center', title: '淇敼浜哄憳', hide: true }
+ , { field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿', hide: true, width: 160 }
+ , { fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 200 }
]],
request: {
pageName: 'curr',
@@ -95,6 +100,7 @@
switch (obj.event) {
// 鏄庣粏灞曠ず
case 'detlShow':
+ id = data.id;
wrkNo = data.wrkNo;
ioTime = data.ioTime;
// 琛ㄦ牸涓嬫柟鏄剧ず
@@ -133,7 +139,7 @@
shade: [0.5, '#000'] //0.1閫忔槑搴︾殑鑳屾櫙
});
var data = {
-// id: $('#id').val(),
+ // id: $('#id').val(),
id: $('#id').val(),
wrkNo: $('#wrkNo').val(),
invWh: $('#invWh').val(),
@@ -194,7 +200,7 @@
};
$.ajax({
url: baseUrl + "/taskLog/" + name + "/auth",
- headers: {'token': localStorage.getItem('token')},
+ headers: { 'token': localStorage.getItem('token') },
data: top.reObject(data),
method: 'POST',
success: function (res) {
@@ -372,7 +378,7 @@
height = ($(window).height() * 0.8);
}
layer.style(index, {
-// top: (($(window).height()-height)/3)+"px",
+ // top: (($(window).height()-height)/3)+"px",
height: height + 'px'
});
}
--
Gitblit v1.9.1