Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-02-23 d5f8c5ea1acfe1fc08f8ddf69dff6f5164eea683

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/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':