From 6c3d4d0530fd8f64e6fc92b996ec724eba316e94 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 14 五月 2024 09:08:10 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pla/plaDetl.js | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 4e9c560..5e25d4e 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -21,8 +21,6 @@
,{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,totalRow:true}
- ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true}
- ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true}
,{field: 'filmWrap', align: 'center',title: '缂犺啘',edit:true,hide:true}
,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛実/10min',edit:true}
,{field: 'water', align: 'center',title: '姘村垎锛宲pm', hide:true,edit:true}
@@ -41,6 +39,8 @@
,{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: 'packageType', align: 'center',title: '鍖呰绫诲瀷',edit:true}
+ ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷',edit:true}
,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true}
,{field: 'problem', align: 'center',title: '澶囨敞',edit:true,hide:true}
,{field: 'direction', align: 'center',title: '搴旂敤鏂瑰悜',edit:true,hide:true}
@@ -60,6 +60,9 @@
,{field: 'stockFreezeDate$', align: 'center',title: '鎿嶄綔鏃ユ湡',hide:true}
,{align: 'center', title: '娴佽浆鏄庣粏', toolbar: '#tbLook'}
,{field: 'createTime$', title: '鍒涘缓鏃堕棿', align: 'center' , sort:true}
+ ,{field: 'newBrand', align: 'center',title: '鍏宠仈鐗屽彿',edit:true}
+ ,{field: 'newBatch', align: 'center',title: '鍏宠仈鎵瑰彿',edit:true, width: 150, sort:true}
+ ,{field: 'newPackageNo', align: 'center',title: '鍏宠仈鍖呰鍙�',edit:true, sort:true}
// ,{field: 'orderNo', align: 'center',title: '鍗曞彿', hide:true}
// ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
// ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
@@ -91,6 +94,7 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin', 'dropdown'], function() {
+ var dropdown = layui.dropdown;
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -136,12 +140,18 @@
});
return arr;
}() ],
+ where:{
+ type: function() {
+ const tabPosition = JSON.parse(sessionStorage.getItem('easyweb-iframe_tempData')).tabPosition
+ return tabPosition.match(/\d+$/)[0] === '90646' ? '鏀规�ф爲鑴�' :
+ (tabPosition.match(/\d+$/)[0] === '90657' ? '绾爲鑴�' : '')
+ }
+ },
request: {
pageName: 'curr',
pageSize: 'limit'
},
parseData: function (res) {
- console.log(res)
return {
'code': res.code,
'msg': res.msg,
@@ -520,8 +530,11 @@
tableReload(false);
});
+ // 鐢ㄦ潵鏍囪瘑鎼滅储閲嶇疆鏃讹紝鏀规�ф爲鑴傚拰绾爲鑴備粠鐐瑰嚮浜嬩欢浼犺繃鏉ュ悕绉帮紝杩涜鐗╄川绫诲埆闄愬畾
+ let customValue = undefined
// 閲嶇疆浜嬩欢
form.on('submit(reset)', function (data) {
+ customValue = $(this).attr('data-value');
reset();
});
@@ -529,7 +542,8 @@
clearFormVal($('#search-box'));
matCodeData = [];
tableReload();
- locTips(false);
+
+ // locTips(false);
}
// 閲嶈浇琛ㄦ牸
@@ -542,6 +556,9 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+ if(customValue !== undefined){
+ searchData['type'] = customValue
+ }
(child ? parent.tableIns : tableIns).reload({
where: searchData,
page: {
--
Gitblit v1.9.1