From 3d4a572565eadba1c9b32b5d9425c504a262fd7a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 17 一月 2024 11:28:59 +0800
Subject: [PATCH] # 配置属性修改
---
src/main/webapp/static/js/pla/plaDetl.js | 120 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 91 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 2bae082..92a6405 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -11,48 +11,56 @@
var cols = [
{field: 'id', title: 'id', align: 'center',hide:true}
,{type: 'checkbox'}
- ,{field: 'pakinTime$', title: '鍏ュ簱鏃堕棿', align: 'center'}
+ ,{field: 'pakinTime$', title: '鍏ュ簱鏃堕棿', align: 'center' , sort:true}
,{field: 'owner', align: 'center',title: '涓讳綋',edit:true}
,{field: 'type', align: 'center',title: '鐗╄祫绫诲埆',hide:true,edit:true}
- ,{field: 'proOrderNo', align: 'center',title: '鍗曞彿',hide:true,edit:true}
- ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide:true,edit:true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿',edit:true}
- ,{field: 'packageNo', align: 'center',title: '鍖呭彿',edit:true}
- ,{field: 'brand', align: 'center',title: '鐗屽彿',edit:true}
- ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�',edit:true}
+ ,{field: 'proOrderNo', align: 'center',title: '鐢熶骇璁㈠崟缂栧彿',hide:true,edit:true}
,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿',hide:true,edit:true}
,{field: 'line', align: 'center',title: '鐢熶骇绾�',hide:true,edit:true}
- ,{field: 'proDate', align: 'center',title: '鐢熶骇鏃ユ湡',edit:true}
+ ,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide:true,edit:true}
+ ,{field: 'brand', align: 'center',title: '鐗屽彿',edit:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',edit:true, width: 150, sort:true}
+ ,{field: 'packageNo', align: 'center',title: '鍖呰鍙�',edit:true, sort:true}
+ ,{field: 'proDate', align: 'center',title: '鐢熶骇鏃ユ湡',edit:true, width: 100}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺KG',edit:true}
,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true}
,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true}
,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true}
- ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�',edit:true}
- ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�',edit:true}
- ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', hide:true,edit:true}
- ,{field: 'vadf2', align: 'center',title: '鎸ュ彂浠�2锛�%锛�', hide:true,edit:true}
+ ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚,g/10min',edit:true}
+ ,{field: 'water', align: 'center',title: '姘村垎,ppm', hide:true,edit:true}
+ ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣,鈩�',edit:true}
+ ,{field: 'vadf1', align: 'center',title: '鎸ュ彂娈�,%', hide:true,edit:true}
+ ,{field: 'vadf2', align: 'center',title: '鍒嗚В娈�,%', hide:true,edit:true}
,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true}
- ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�',edit:true}
- ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', hide:true,edit:true}
- ,{field: 'l', align: 'center',title: 'l鍊�', hide:true,edit:true}
- ,{field: 'a', align: 'center',title: 'a鍊�', hide:true,edit:true}
- ,{field: 'b', align: 'center',title: 'b鍊�', hide:true,edit:true}
- ,{field: 'fillIn', align: 'center',title: '濉厖(%)',hide:true,edit:true}
+ ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴�,%',edit:true}
+ ,{field: 'l', align: 'center',title: 'L*', hide:true,edit:true}
+ ,{field: 'a', align: 'center',title: 'a*', hide:true,edit:true}
+ ,{field: 'b', align: 'center',title: 'b*', hide:true,edit:true}
+ ,{field: 'fillIn', align: 'center',title: '濉厖,%',hide:true,edit:true}
+ ,{field: 'str1', align: 'center',title: '鎷変几寮哄害,MPa',hide:true,edit:true}
+ ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜�,%',hide:true,edit:true}
+ ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮,KJ/m2',hide:true,edit:true}
+ ,{field: 'str4', align: 'center',title: '缁村崱,鈩�',hide:true,edit:true}
+ ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂�,min',hide:true,edit:true}
+ ,{field: 'str6', align: 'center',title: '缁撴櫠搴�.%',hide:true,edit:true}
,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true}
,{field: 'problem', align: 'center',title: '澶囨敞',edit:true}
+ ,{field: 'direction', align: 'center',title: '搴旂敤鏂瑰悜',edit:true}
+ ,{field: 'position', align: 'center',title: '瀛樻斁浣嶇疆',edit:true}
,{field: 'stash', align: 'center',title: '浠撳簱',edit:true}
,{field: 'locNo', align: 'center',title: '搴撲綅',edit:true}
,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�',edit:true}
,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true}
,{field: 'status', align: 'center',title: '鐘舵��', templet: setState ,edit:true}
,{align: 'center', title: '娴佽浆鏄庣粏', toolbar: '#tbLook'}
- ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
- ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
- ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
- ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
- ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
- ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
- ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
+ // ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
+ // ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
+ // ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
+ // ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
+ // ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
+ // ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
+ // ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
];
return cols;
}
@@ -68,6 +76,8 @@
return "<span style='color: black'>閮ㄥ垎鍑哄簱</span>"
}else if(data.status === "鍏ㄩ儴鍑哄簱"){
return "<span style='color: gray'>鍏ㄩ儴鍑哄簱</span>"
+ }else if(data.status === "鏆傚叆搴�"){
+ return "<span style='color: purple'>鏆傚叆搴�</span>"
}
}
@@ -226,7 +236,59 @@
});
}
break;
-
+ case "deleteData":
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case "viladate":
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鏍￠獙'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/viladate/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
}
})
@@ -435,7 +497,7 @@
for(var i=0; i<data.length; i++){
if(data[i].LAY_CHECKED){
- if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme <= data[i].qtyAnfme){
+ if(data[i].status === "鏆傚叆搴�" || data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"|| data[i].weightAnfme <= data[i].qtyAnfme){
layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱鎴栬�呮病鏈夊墿浣欏彲鍑洪噸閲忥紝璇烽噸鏂伴�夋嫨");
return;
}
@@ -483,7 +545,7 @@
let dataOld = [];
for(var i=0; i<data.length; i++){
if(data[i].LAY_CHECKED){
- if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"){
+ if(data[i].status === "鏆傚叆搴�" || data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"){
layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱锛岃閲嶆柊閫夋嫨");
return;
}
--
Gitblit v1.9.1