From c45d612c0673c5037a12b4a7514b5c52e7ecdbe9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 26 十一月 2024 11:14:03 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/static/js/agvLocMast/locMast.js | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/static/js/agvLocMast/locMast.js b/src/main/webapp/static/js/agvLocMast/locMast.js
index 9cd58de..54d6f2c 100644
--- a/src/main/webapp/static/js/agvLocMast/locMast.js
+++ b/src/main/webapp/static/js/agvLocMast/locMast.js
@@ -10,7 +10,7 @@
tableIns = table.render({
elem: '#agvLocMast',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/agvLocMast/list/auth',
+ url: baseUrl+'/agv/locMast/list/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -23,16 +23,18 @@
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
- // ,{field: 'pltType', align: 'center',title: ''}
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
//,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true}
+ //,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
,{field: 'lev1', align: 'center',title: '灞�', sort:true}
,{field: 'floor', align: 'center',title: '妤�', sort:true}
+ ,{field: 'barcode', align: 'center',title: '璐ф灦鐮�', sort:true}
+ ,{field: 'locType2', align: 'center',title: '璐ф灦绫诲瀷', sort:true}
+ ,{field: 'pltType', align: 'center',title: '浠撲綅缂栫爜'}
,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' disabled table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
@@ -55,7 +57,7 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- //,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+ ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
@@ -151,7 +153,7 @@
} else {
layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
$.ajax({
- url: baseUrl+"/agvLocMast/delete/auth",
+ url: baseUrl+"/agv/locMast/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
@@ -189,7 +191,7 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/agvLocMast/export/auth",
+ url: baseUrl+"/agv/locMast/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -212,17 +214,35 @@
layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞堕噸缃簱浣�', formType: 1, shadeClose: true}, function(pass, idx){
http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) {
if (res.data) {
- layer.open({
- type: 1,
- title: '鍒濆鍖栧簱浣�',
- area: ["400px"],
- maxmin: true,
- shadeClose: true,
- content: $("#resetLocDiv"),
- success: function (layero, index) {
-
+ // layer.open({
+ // type: 1,
+ // title: '鍒濆鍖栧簱浣�',
+ // area: ["400px"],
+ // maxmin: true,
+ // shadeClose: true,
+ // content: $("#resetLocDiv"),
+ // success: function (layero, index) {
+ //
+ // }
+ // })
+ $.ajax({
+ url: baseUrl+"/agv/locMast/init/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify("param"),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
}
- })
+ });
} else {
layer.msg("鍙ｄ护閿欒");
}
@@ -393,7 +413,7 @@
// 鍒濆鍖栦繚瀛�
form.on('submit(initDo)', function (data) {
$.ajax({
- url: baseUrl+"/locMast/init/auth",
+ url: baseUrl+"/agv/locMast/init/auth",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
@@ -443,8 +463,11 @@
bay1: $('#bay1').val(),
lev1: $('#lev1').val(),
floor: $('#floor').val(),
+ mapRow1: $('#mapRow1').val(),
+ mapBay1: $('#mapBay1').val(),
+ rightSide: $('#rightSide').val(),
fullPlt: $('#fullPlt').val(),
- locType: $('#locType').val(),
+ locType1: $('#locType1').val(),
outEnable: $('#outEnable').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
firstTime: top.strToDate($('#firstTime\\$').val()),
@@ -464,7 +487,7 @@
};
$.ajax({
- url: baseUrl+"/avgLocMast/"+name+"/auth",
+ url: baseUrl+"/agv/locMast/"+name+"/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
--
Gitblit v1.9.1