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

yxj

2024-01-18 5ebd6758ee61497b0d485c2145c2d49b33951ed3

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

@@ -250,7 +250,7 @@
                    url: GetWEBURL() + "/MaterOutEntryReport/sc_ICOMReportList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "HBeginDate": $("#HBeginDate").val(), "HEndDate": $("#HEndDate").val()},
                    data: { "sWhere": sWhere, "HBeginDate": $("#HBeginDate").val(), "HEndDate": $("#HEndDate").val(), "user": sessionStorage["HUserName"] },
                    success: function (data1) {

                        if (data1.count == 1) {
@@ -263,7 +263,7 @@
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'  });
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
@@ -293,6 +293,13 @@
                                , data: data1.data
                            };
                            table.render(option);
                        } else {
                            layer.msg(data1.Message, {
                                icon: 5,
                                time: 2000
                            }, function () {
                                //do something
                            });
                        }
                    },
                    error: function (err) {