From 7ea6501464a8df3cad55c21e04b606e88d7b8580 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 05 五月 2025 15:41:45 +0800
Subject: [PATCH] 呼叫AGV搬运
---
src/main/webapp/static/js/stoMan/stoQue.js | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index bf2902c..b6fc115 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -4,36 +4,44 @@
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
+ var layDate = layui.laydate; //鏃堕棿鎺т欢
var form = layui.form;
+
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime' //鏃ユ湡鏃堕棿閫夋嫨鍣� 鍙�夊勾銆佹湀銆佹棩銆佹椂銆佸垎銆佺
+ ,range: true //璁剧疆涓簍rue锛岄粯璁ら噰鐢ㄢ��-鈥濆垎鍓�
+ });
// 鏁版嵁娓叉煋
tableIns = table.render({
- elem: '#stoQue',
+ elem: '#stoQue', //table id=鈥渟toQue鈥�
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/locMast/list/auth',
- page: true,
- limit: 10,
+ page: true, //寮�鍚垎椤�
+ limit: 20,
+ limits: [20, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',event: 'locDetl'}
- ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180,event: 'locDetl'}
- ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷',event: 'locDetl'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿',event: 'locDetl'}
- ,{field: 'row1', align: 'center',title: '鎺�',event: 'locDetl'}
- ,{field: 'bay1', align: 'center',title: '鍒�',event: 'locDetl'}
- ,{field: 'lev1', align: 'center',title: '灞�',event: 'locDetl'}
- ,{field: 'fullPlt', align: 'center',title: '婊℃澘',event: 'locDetl', templet:function(row){
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
+ // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'row1', align: 'center',title: '鎺�'}
+ ,{field: 'bay1', align: 'center',title: '鍒�'}
+ ,{field: 'lev1', align: 'center',title: '灞�'}
+ ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
html += "disabled='disabled' >";
return html;
},width:80}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'locDetl'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180,event: 'locDetl'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜鍙�'}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
]],
request: {
@@ -53,7 +61,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -86,7 +94,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
@@ -102,8 +110,8 @@
case 'refreshSto': // todo:luxiaotao
alert("杩樻病鍋�");
break;
- case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ case 'exportData': //瀵煎嚭Excel
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -121,7 +129,7 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/wrkLastno/export/auth",
+ url: baseUrl+"/locMast/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -132,7 +140,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)
}
@@ -150,10 +158,10 @@
// 鏌ョ湅鏄庣粏
case 'locDetl':
// locDetl(data.locNo);
- if (data.locType.trim() === ''
- || data.locType.trim() === 'S'
- || data.locType.trim() === 'D'
- || data.locType.trim() === 'O') {
+ if (data.locSts.trim() === ''
+ || data.locSts.trim() === 'S'
+ || data.locSts.trim() === 'D'
+ || data.locSts.trim() === 'O') {
layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪鐗╂枡");
return;
}
@@ -167,7 +175,7 @@
locNo = val;
layer.open({
type: 2,
- title: '宸ヤ綔妗ｆ槑缁�',
+ title: '搴撳瓨鏄庣粏',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
@@ -223,7 +231,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCur=curr;
form.on('checkbox(tableCheckbox)', function (data) {
@@ -265,7 +273,7 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCurr=curr;
if (count === 1){
--
Gitblit v1.9.1