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

zrg

2024-07-01 43c633b50bc7dca4d78855e57546fe16e2e44562

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopProcessWIPSumReport.html

@@ -221,6 +221,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , height: 'full-70'
                };
@@ -236,6 +237,7 @@
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var totalArray = ["计划数量", "合格数", "不合格数", "在制数"];
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
@@ -246,6 +248,9 @@
                            for (var i = 0; i < data.length; i++) {
                                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) {
@@ -401,13 +406,17 @@
                            if (option.data.length != 0) {
                                var dataPrint = [];
                                for (var i = 0; i < option.data.length; i++) {
                                    option.data[i]["日期"] = "2320-12-11";
                                    option.data[i]["染料总量"] = "11237";
                                    option.data[i]["助剂总量"] = "1321414";
                                    dataPrint.push(option.data[i])
                                }

                                var Customer = {
                                    "Table": dataPrint
                                    "Table": dataPrint,
                                }


                                var args = {
                                    type: "preview",
                                    //showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可