From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index aac1566..c359044 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -3,8 +3,13 @@
var cols = [
{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
];
- arrRemove(detlCols, "field", "anfme")
- arrRemove(detlCols, "field", "zpallet")
+ arrRemove(detlCols, "field", "anfme");
+ arrRemove(detlCols,"field","suppCode");
+ arrRemove(detlCols, "field", "zpallet");
+ arrRemove(detlCols, "field", "orderNo");
+ arrRemove(detlCols, "field", "threeCode");
+ arrRemove(detlCols, "field", "deadTime");
+ arrRemove(detlCols, "field", "batch");
cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
@@ -24,8 +29,8 @@
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,
@@ -59,6 +64,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