From 62f346794d27086f41f7ce901bdd11eead5249c8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 06 五月 2024 08:54:47 +0800
Subject: [PATCH] 1

---
 WebTM/views/ReportHtml.html |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/WebTM/views/ReportHtml.html b/WebTM/views/ReportHtml.html
index 08c741c..f845922 100644
--- a/WebTM/views/ReportHtml.html
+++ b/WebTM/views/ReportHtml.html
@@ -198,9 +198,10 @@
                     async: false,
                     dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
                     success: function (data1) {
+                        console.log(data1);
                         for (var key in data1.list)
                         {
-                            resultTableHead.push({ "id": data1.list[key], "name": data1.list[key] });
+                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                         }
                         set_InitGrid(sWhere);
                     }, error: function (err) {
@@ -217,26 +218,39 @@
                 //濉厖琛ㄦ牸澶存暟缁�
                 var data = resultTableHead;
                 cols_arr[0] = [];
-                cols_arr[0][0] = { checkbox: true, fixed: true };
+                cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
                 for (var i = 0; i < data.length; i++) {
                     if (data[i].name == 'HItemID') {
                         cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
                     }
                     else
                     {
-                        cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center'};
+                        switch (data[i].Type)
+                        {
+                            //int
+                            case 'Int32':
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true ,sort: true};
+                                break;
+                            //Decimal
+                            case 'Decimal': 
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true};
+                                break;
+                            default:
+                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center' ,sort: true};
+                        }
                     }
                 }
                 //濉厖琛ㄦ牸鏁版嵁
                 table.render({
                     elem: '#layTable',
                     url: GetWEBURL() + '/Sc_MESReportFrom/ReportFromBillList',
-                    toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    //toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
                     title: '鐢ㄦ埛鏁版嵁琛�',
                     cols: cols_arr,    //濉厖琛ㄦ牸澶存暟鎹�,
                     id: 'layTable', //琛ㄦ牸id
                     where: { sWhere: sWhere}, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
                     page: true,   //寮�鍚垎椤�
+                    totalRow: true, //寮�鍚悎璁�
                     limit: 10,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
                     limits: [10, 20, 40, 60,80,100], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
                     method: 'get',  //鎻愪氦鏂瑰紡

--
Gitblit v1.9.1