From ec8120682339a7b9feb64748320781e99fa0cb77 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期五, 13 九月 2024 16:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index aac1566..d262edf 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -1,15 +1,15 @@
var pageCurr;
-function getCol() {
- var cols = [
- {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
- ];
- arrRemove(detlCols, "field", "anfme")
- arrRemove(detlCols, "field", "zpallet")
- cols.push.apply(cols, detlCols);
- // cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
- // )
- return cols;
-}
+// function getCol() {
+// var cols = [
+// {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
+// ];
+// arrRemove(detlCols, "field", "anfme")
+// arrRemove(detlCols, "field", "zpallet")
+// cols.push.apply(cols, detlCols);
+// // cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
+// // )
+// return cols;
+// }
layui.use(['table','laydate', 'form'], function(){
var table = layui.table;
@@ -24,12 +24,22 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/locDetl/statis/auth',
page: true,
- limit: 16,
- limits: [16, 30, 50, 100, 200, 500],
+ limit: 20,
+ limits: [20, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
- cols: [getCol()],
+ cols: [[
+ {field: 'lkQty', title:'绔嬪簱鏁伴噺', align: 'center', width:150},
+ {field: 'erpQty', title:'ERP鏁伴噺', align: 'center', width:150},
+ {field: 'matnr', title:'浜у搧缂栫爜', align: 'center'},
+ {field: 'model', title:'浜у搧浠ｇ爜', align: 'center'},
+ {field: 'specs', title:'浜у搧瑙勬牸', align: 'center'},
+ {field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'},
+ {field: 'pgNo', title:'娲惧伐鍗曞彿', align: 'center'},
+ {field: 'outOrderNo', title:'璁㈠崟鍙�', align: 'center'},
+ {field: 'batch', title:'鎵规', align: 'center'}
+ ]],
request: {
pageName: 'curr',
pageSize: 'limit'
@@ -59,6 +69,19 @@
res.data[_index][data.value] = 'N';
}
});
+ /**
+ * 鏄剧ず搴撳瓨鎬绘暟閲�
+ */
+ $.ajax({
+ url: baseUrl+"/locDetl/count",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ $("#countNum").text(res.data + '涓�');
+ }
+ });
+
}
});
--
Gitblit v1.9.1