From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/webapp/static/js/report/workCountOut.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index 1603a81..fa4124d 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -4,6 +4,7 @@
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'model', align: 'center',title: '浜у搧浠ｇ爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
@@ -34,11 +35,12 @@
limitName: 'pageSize'
},
parseData: function (res) {
+ $('#countNum').text(res.data.sum + '涓�');
return {
'code': res.code,
'msg': res.msg,
- 'count': res.data.total,
- 'data': res.data.records
+ 'count': res.data.page.total,
+ 'data': res.data.page.records
}
},
response: {
--
Gitblit v1.9.1