From d5f8c5ea1acfe1fc08f8ddf69dff6f5164eea683 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 23 二月 2024 13:18:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/报表分析/Mes_WIPProcReport.html | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPProcReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPProcReport.html"
index eebda96..4cc191e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPProcReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_WIPProcReport.html"
@@ -178,6 +178,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cellMinWidth: 120
+ , totalRow: true
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, height: 'full-70'
};
@@ -193,6 +194,7 @@
success: function (data1) {
var col = [];
if (data1.count == 1) {
+ var totalArray = ["鏁伴噺"];
var data = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -204,6 +206,10 @@
if (!patrn.test(data[i].name)) {
col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
}
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+
else {
switch (data[i].Type) {
case 'DateTime':
--
Gitblit v1.9.1