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

yusijie

2023-09-25 f0bf3a9c74a87438d5c32e9f0bc6a23d294fbc72

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

@@ -219,7 +219,7 @@
            //初始化界面
            function set_ClearBill() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));

                //加载数据到网格
@@ -248,7 +248,7 @@
                    url: GetWEBURL() + "/MaterOutEntryReport/sc_ICOMReportList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "HBeginDate": $("#HBeginDate").val(), "HEndDate": $("#HEndDate").val()},
                    success: function (data1) {

                        if (data1.count == 1) {
@@ -368,7 +368,7 @@
            //重置过滤条件
            function set_ClearQuery() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));
                $("#HMaterNumber").val("");
                $("#HBillNo").val("");