From 78df6cc0014e1b9ef290a8ae86c39b63c8fc36e1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 21 一月 2026 18:31:56 +0800
Subject: [PATCH] no message
---
src/main/webapp/static/js/locDetl/locDetl.js | 1
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/resources/mapper/LocDetlMapper.xml | 32 ++--
src/main/webapp/static/js/wrkMast/wrkMast.js | 266 +++++++++++++++++++++++--------------------
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 1
src/main/resources/mapper/OrderDetlPakinMapper.xml | 16 +-
7 files changed, 169 insertions(+), 154 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 867d291..b86ddbd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -468,7 +468,7 @@
}
// OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
- , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
+ , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), "1", locDto.getBoxType2(), locDto.getBoxType3());
// if (orderDetl == null) {
//// orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
// orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);
@@ -1525,7 +1525,6 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
-
// .淇敼骞舵墭鍏ュ簱鏄庣粏鎵樼爜
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index b8c5912..96ce548 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -392,7 +392,7 @@
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(),
wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
- wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(),
+ wrkDetl.getStandby2(), wrkDetl.getStandby3(), "1",
wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
try {
if (!Cools.isEmpty(orderDetlPakin)) {
@@ -400,7 +400,7 @@
wrkDetl.getMatnr(),
orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
+ "1", wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
wrkDetl.getAnfme())) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 9309423..c40aedd 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -94,14 +94,14 @@
and (d.standby3 IS NULL OR d.standby3 = '')
</otherwise>
</choose>
- <choose>
- <when test="boxType1 != null and boxType1 != ''">
- and d.box_type1 = #{boxType1}
- </when>
- <otherwise>
- and (d.box_type1 IS NULL OR d.box_type1 = '')
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="boxType1 != null and boxType1 != ''">-->
+<!-- and d.box_type1 = #{boxType1}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and (d.box_type1 IS NULL OR d.box_type1 = '')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<choose>
<when test="boxType2 != null and boxType2 != ''">
and d.box_type2 = #{boxType2}
@@ -226,14 +226,14 @@
and (standby3 IS NULL OR standby3 = '')
</otherwise>
</choose>
- <choose>
- <when test="boxType1 != null and boxType1 != ''">
- and box_type1 = #{boxType1}
- </when>
- <otherwise>
- and (box_type1 IS NULL OR box_type1 = '')
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="boxType1 != null and boxType1 != ''">-->
+<!-- and box_type1 = #{boxType1}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and (box_type1 IS NULL OR box_type1 = '')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<choose>
<when test="boxType2 != null and boxType2 != ''">
and box_type2 = #{boxType2}
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 3f3e522..d0b8de8 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -97,14 +97,14 @@
and (standby3 IS NULL OR standby3 = '')
</otherwise>
</choose>
- <choose>
- <when test="boxType1 != null and boxType1 != ''">
- and box_type1 = #{boxType1}
- </when>
- <otherwise>
- and (box_type1 IS NULL OR box_type1 = '')
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="boxType1 != null and boxType1 != ''">-->
+<!-- and box_type1 = #{boxType1}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and (box_type1 IS NULL OR box_type1 = '')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<choose>
<when test="boxType2 != null and boxType2 != ''">
and box_type2 = #{boxType2}
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index fcd4b25..bcbd878 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -61,7 +61,6 @@
and standby1 = #{standby1}
and standby2 = #{standby2}
and standby3 = #{standby3}
- and box_type1 = #{boxType1}
and box_type2 = #{boxType2}
and box_type3 = #{boxType3}
</sql>
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 15c2cef..864be33 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -23,6 +23,7 @@
}}
,{field: 'bookQty', align: 'center',title: '鍘熸暟閲�'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'boxType1', align: 'center',title: '鏍煎眰缂栫爜', width : 130}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index b367be3..ff16c7f 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -1,6 +1,6 @@
var pageCurr;
var wrkNo;
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -11,7 +11,7 @@
tableIns = table.render({
elem: '#wrkMast',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkMast/list/auth',
+ url: baseUrl + '/wrkMast/list/auth',
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -20,23 +20,23 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 95}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 170}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width: 120}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width: 140}
- ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
- ,{field: 'taskType$', align: 'center',title: '浠诲姟绫诲瀷'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', width: 120}
- ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
- ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
- ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', width: 120}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅', width: 120}
- ,{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:300}
+ , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 95}
+ , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', sort: true, width: 170}
+ , {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��', width: 120}
+ , {field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�', width: 140}
+ , {field: 'ioPri', align: 'center', title: '浼樺厛绾�'}
+ , {field: 'taskType$', align: 'center', title: '浠诲姟绫诲瀷', hide: true}
+ , {field: 'barcode', align: 'center', title: '鏉＄爜', width: 120}
+ , {field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�'}
+ , {field: 'sourceStaNo$', align: 'center', title: '婧愮珯'}
+ , {field: 'staNo$', align: 'center', title: '鐩爣绔�'}
+ , {field: 'sourceLocNo', align: 'center', title: '婧愬簱浣�', width: 120}
+ , {field: 'locNo', align: 'center', title: '鐩爣搴撲綅', width: 120}
+ , {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: 300}
]],
request: {
pageName: 'curr',
@@ -53,17 +53,17 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
res.data[_index][data.value] = 'Y';
- }else{
+ } else {
res.data[_index][data.value] = 'N';
}
});
@@ -73,7 +73,7 @@
// 鐩戝惉鎺掑簭浜嬩欢
table.on('sort(wrkMast)', function (obj) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
searchData['orderByField'] = obj.field;
@@ -85,9 +85,9 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
limit();
}
});
@@ -96,10 +96,10 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(wrkMast)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- switch(obj.event) {
+ switch (obj.event) {
// 澧炲姞浼樺厛绾�
case 'priAdd':
- var list=[];
+ var list = [];
checkStatus.data.map(function (track) {
list.push({
wrkNo: track.wrkNo,
@@ -108,19 +108,19 @@
});
});
$.ajax({
- url: baseUrl+"/wrkMast/add/pri/auth",
+ url: baseUrl + "/wrkMast/add/pri/auth",
headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(list),
method: 'POST',
- traditional:true,
+ traditional: true,
success: function (res) {
layer.closeAll();
- if (res.code === 200){
+ if (res.code === 200) {
$(".layui-laypage-btn")[0].click();
layer.msg(res.msg);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -129,7 +129,7 @@
break;
// 闄嶄綆浼樺厛绾�
case 'priRed':
- var list=[];
+ var list = [];
checkStatus.data.map(function (track) {
list.push({
wrkNo: track.wrkNo,
@@ -138,19 +138,19 @@
});
});
$.ajax({
- url: baseUrl+"/wrkMast/red/pri/auth",
+ url: baseUrl + "/wrkMast/red/pri/auth",
headers: {'token': localStorage.getItem('token')},
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(list),
method: 'POST',
- traditional:true,
+ traditional: true,
success: function (res) {
layer.closeAll();
- if (res.code === 200){
+ if (res.code === 200) {
$(".layui-laypage-btn")[0].click();
layer.msg(res.msg);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -165,31 +165,33 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
content: 'wrkMast_detail.html',
- success: function(layero, index){
+ success: function (layero, index) {
layer.getChildFrame('#data-detail-submit-edit', index).hide();
- clearFormVal(layer.getChildFrame('#detail', index));
- layer.getChildFrame('##dealDownLine', index).hide();layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.getChildFrame('##dealDownLine', index).hide();
+ layer.iframeAuto(index);
+ layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
}
});
break;
case 'deleteData':
var data = checkStatus.data;
- if (data.length === 0){
+ if (data.length === 0) {
layer.msg('璇烽�夋嫨鏁版嵁');
} else {
- layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ layer.confirm('纭畾鍒犻櫎' + (data.length === 1 ? '姝�' : data.length) + '鏉℃暟鎹悧', function () {
$.ajax({
- url: baseUrl+"/wrkMast/delete/auth",
+ url: baseUrl + "/wrkMast/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {param: JSON.stringify(data)},
method: 'POST',
- traditional:true,
+ traditional: true,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
layer.closeAll();
tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -199,9 +201,9 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function () {
+ var titles = [];
+ var fields = [];
obj.config.cols[0].map(function (col) {
if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
titles.push(col.title);
@@ -209,7 +211,7 @@
}
});
var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
exportData[this.name] = this.value;
});
var param = {
@@ -217,18 +219,18 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/wrkMast/export/auth",
+ url: baseUrl + "/wrkMast/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
+ 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');
+ table.exportFile(titles, res.data, 'xls');
} else if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
} else {
layer.msg(res.msg)
}
@@ -240,7 +242,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(wrkMast)', function(obj){
+ table.on('tool(wrkMast)', function (obj) {
let data = obj.data;
switch (obj.event) {
// 鏄庣粏灞曠ず
@@ -256,14 +258,14 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
content: 'wrkDetl.html',
- success: function(layero, index){
+ success: function (layero, index) {
}
});
break;
// 瀹屾垚
case 'complete':
- layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
+ layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () {
+ http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 1}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
@@ -274,16 +276,22 @@
// 鍙栨秷
case 'cancel':
if (data.pdcType === "Y") {
- layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
+ http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
layer.closeAll();
});
} else {
- layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
+ layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
+ http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
@@ -293,8 +301,8 @@
break;
// 鎷ｆ枡鍏ュ簱
case 'pick':
- layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
+ layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () {
+ http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 3}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
@@ -303,8 +311,11 @@
break;
// 鍏堝叆鍝�
case 'preHave':
- layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
+ layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
+ http.post(baseUrl + "/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg, {icon: 1});
})
@@ -313,7 +324,10 @@
break;
// 绌烘搷浣�
case 'takeNone':
- layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
+ layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {
+ title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ shadeClose: true
+ }, function () {
});
break;
case 'priWrkMast':
@@ -324,11 +338,12 @@
area: ['500px', top.detailHeight],
shadeClose: false,
content: 'wrkMast_detail2.html',
- success: function(layero, index){
+ success: function (layero, index) {
layer.getChildFrame('#data-detail-submit-save', index).hide();
setFormVal(layer.getChildFrame('#detail', index), data, false);
top.convertDisabled(layer.getChildFrame('#locNo', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layer.iframeAuto(index);
+ layer.style(index, {top: (($(window).height() - layer.getChildFrame('#data-detail', index).height()) / 3) + "px"});
layero.find('iframe')[0].contentWindow.layui.form.render('select');
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
}
@@ -339,7 +354,7 @@
// 鏁版嵁淇濆瓨鍔ㄤ綔
form.on('submit(save)', function () {
- if (banMsg != null){
+ if (banMsg != null) {
layer.msg(banMsg);
return;
}
@@ -351,9 +366,9 @@
method("update")
});
- function method(name){
+ function method(name) {
var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ shade: [0.5, '#000'] //0.1閫忔槑搴︾殑鑳屾櫙
});
var data = {
wrkNo: $('#wrkNo').val(),
@@ -414,20 +429,20 @@
};
$.ajax({
- url: baseUrl+"/wrkMast/"+name+"/auth",
+ url: baseUrl + "/wrkMast/" + name + "/auth",
headers: {'token': localStorage.getItem('token')},
data: top.reObject(data),
method: 'POST',
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
parent.layer.closeAll();
parent.$(".layui-laypage-btn")[0].click();
$("#data-detail :input").each(function () {
$(this).val("");
});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg)
}
layer.close(index);
@@ -511,12 +526,13 @@
});
layDate.render({
elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ , type: 'datetime'
+ , range: true
});
var pageCur;
- function locDetl(param){
+
+ function locDetl(param) {
$('#detlTable').css("display", 'block');
// 鏁版嵁娓叉煋
$('#wrkNo').val(param);
@@ -524,7 +540,7 @@
tableIns1 = table.render({
elem: '#wrkDetlByMap',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkDetl/list/auth',
+ url: baseUrl + '/wrkDetl/list/auth',
where: {wrk_no: param},
page: true,
limit: 16,
@@ -534,22 +550,22 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�'}
+ , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿'}
+ , {field: 'matnr', align: 'center', title: '鐗╂枡'}
+ , {field: 'lgnum', align: 'center', title: '浠撳簱鍙�'}
+ , {field: 'tbnum', align: 'center', title: '杞偍璇锋眰缂栧彿'}
+ , {field: 'tbpos', align: 'center', title: '琛岄」鐩�'}
+ , {field: 'zmatid', align: 'center', title: '鐗╂枡鏍囩ID'}
+ , {field: 'maktx', align: 'center', title: '鐗╂枡鎻忚堪'}
+ , {field: 'werks', align: 'center', title: '宸ュ巶'}
+ , {field: 'anfme', align: 'center', title: '鏁伴噺'}
+ , {field: 'altme', align: 'center', title: '鍗曚綅'}
+ , {field: 'zpallet', align: 'center', title: '鎵樼洏鏉＄爜'}
+ , {field: 'bname', align: 'center', title: '鐢ㄦ埛ID'}
+ , {field: 'memo', align: 'center', title: '澶囨敞'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:50}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 50}
]],
request: {
pageName: 'curr',
@@ -566,16 +582,16 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCur=curr;
+ pageCur = curr;
form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
+ var _index = $(data.elem).attr('table-index') || 0;
+ if (data.elem.checked) {
res.data[_index][data.value] = 'Y';
- }else{
+ } else {
res.data[_index][data.value] = 'N';
}
});
@@ -586,13 +602,13 @@
});
// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
+$(document).on('click', '#data-detail-close', function () {
parent.layer.closeAll();
});
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
+ $.each($('#search-box [name]').serializeArray(), function () {
searchData[this.name] = this.value;
});
(child ? parent.tableIns : tableIns).reload({
@@ -602,14 +618,14 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
+ pageCurr = curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
where: searchData,
page: {
- curr: pageCurr-1
+ curr: pageCurr - 1
}
});
pageCurr -= 1;
@@ -622,10 +638,10 @@
function setFormVal(el, data, showImg) {
for (var val in data) {
var find = el.find(":input[id='" + val + "']");
- if (find[0]!=null){
- if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
+ if (find[0] != null) {
+ if (find[0].type === 'checkbox') {
+ if (data[val] === 'Y') {
+ find.attr("checked", "checked");
find.val('Y');
} else {
find.remove("checked");
@@ -635,9 +651,9 @@
}
}
find.val(data[val]);
- if (showImg){
+ if (showImg) {
var next = find.next();
- if (next.get(0)){
+ if (next.get(0)) {
if (next.get(0).localName === "img") {
find.hide();
next.attr("src", data[val]);
@@ -657,13 +673,13 @@
function detailScreen(index) {
var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
+ var height = detail.height() + 60;
+ if (height > ($(window).height() * 0.9)) {
+ height = ($(window).height() * 0.8);
}
layer.style(index, {
// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
+ height: height + 'px'
});
}
--
Gitblit v1.9.1