1

zrg

2024-11-13 c12dbf26b4ee983595a85492f779184e92497ea8

1

 WebTM/WebTM.csproj

@@ -600,6 +600,7 @@
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_BatchSplit.html" />
    <Content Include="views\车间管理\报表分析\Cj_HeatTreatmentTemperatureCurveChart.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
    <Content Include="views\车间管理\报表分析\Cj_TemperatureCurveDryingMachine.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />

 WebTM/views/index.html

@@ -588,6 +588,7 @@
                                        <dd><a lay-href="车间管理/报表分析/Kf_MateOutSumReport_QiaoYi.html">领料统计报表</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Cj_SPCOscillationCurve.html">SPC震荡曲线图</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html">热处理温度曲线图</a></dd>
                                        <dd><a lay-href="车间管理/报表分析/Cj_TemperatureCurveDryingMachine.html">干燥机温度曲线图</a></dd>
                                    </dl>
                                </dd>
                                <dd>

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html

@@ -1190,7 +1190,7 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var HOrgID = params[params[1]];
                if (typeof (openType) != "undefined") {
                    return  " and æ˜Žç»†æ ‡è®° = 'Y' and ç¦ç”¨æ ‡è®° = 'Y'";
                    return  " and æ˜Žç»†æ ‡è®° = 'Y' and ç¦ç”¨æ ‡è®° != 'Y'";
                }
                return "";
            }

 WebTM/views/¹¤×ʹÜÀí/°à×éÖ°Ô±Çåµ¥/Gy_GroupEmpBillEdit.html

@@ -339,7 +339,7 @@
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            //obj.del();

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatFormImport.html

@@ -244,33 +244,41 @@
                    num.push(table.cache["mainTable"][i])
                }
            }
            data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
            var index = layer.load();
           
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
                async: true,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {

            var HDataSub = [];

            //JIT导入计划，每次导入100行数据,可修改i的自增值决定每次循环导入的行数
            for (var i = 0; i < num.length; i += 100) {
                HDataSub = num.slice(i, i + 100)

                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(HDataSub);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
                var index = layer.load();

                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("提交成功");
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
                });
            }            
        }

        //行内删除

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -72,6 +72,11 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">关闭</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">反关闭</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Copy" id="set_Copy">复制</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckFlowInfo" id="set_CheckFlowInfo">查看审批进度</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">多级审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">多级反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">驳回</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -787,6 +792,7 @@
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                        $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
            }
@@ -988,6 +994,29 @@
                set_CancelCloseBill(data);
            });

            //查看审批进度
            form.on('submit(set_CheckFlowInfo)', function (data) {
                set_CheckFlowInfo();
            });

            //多级审核
            form.on('submit(set_CheckBill_Flow)', function (data) {
                set_CheckBill_Flow(0);
            });

            //多级反审核
            form.on('submit(set_AbandonCheck_Flow)', function (data) {
                set_CheckBill_Flow(1);
            });
            //驳回
            form.on('submit(set_RejectCheck_Flow)', function (data) {
                set_RejectCheck_Flow();
            });

            //复制
            form.on('submit(set_Copy)', function (data) {
                set_Copy();
            });

            //是否默认工艺
            form.on('checkbox(checkboxHStandard)', function (data) {
@@ -1342,11 +1371,24 @@

            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                const procNos = table.cache["mainTable"].map(item => item.HProcNo);
                if (isSortedAscending(procNos)) {
                    if (AllowLoadData(data)) {
                        set_AddNew(data);
                    }
                } else {
                    layer.msg('请注意流水号次序');
                }
            });

            // å‡½æ•°ï¼šåˆ¤æ–­æ•°ç»„是否从小到大排序
            function isSortedAscending(arr) {
                for (let i = 0; i < arr.length - 1; i++) {
                    if (arr[i] > arr[i + 1]) {
                        return false;
                    }
                }
                return true;
            }
            //退出
            form.on('submit(btnEdit)', function (data) {
                if (params[1] != null) {
@@ -1864,6 +1906,128 @@
                    });
                })
            }

            //#region å¤šçº§ åå®¡æ ¸/审核数据
            function set_CheckBill_Flow(num) {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择请选择在审批流的单据审核！');
                }
            }
            //#endregion

            //#region é©³å›ž
            function set_RejectCheck_Flow() {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择在审批流的单据驳回！');
                }
            }
            //#endregion

            //#region å¤åˆ¶
            function set_Copy() {
                //制单人
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#hmakers").val(sessionStorage["HUserName"]);
                $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                //设置hinterid
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": '3301' },
                    success: function (d) {
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                    }
                });
                OperationType = 2;
            }
            //#endregion

            //#region æŸ¥çœ‹å®¡æ‰¹è¿›åº¦
            function set_CheckFlowInfo() {
                var InterID = $("#HInterID").val();
                if (InterID != 0) {
                    layer.open({
                        type: 2
                        , area: ['70%', '70%']
                        , title: '单据审批进度'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../系统管理/多级审批/审批进度/Xt_CheckFlowProgressList.html?linterid=' + InterID + '&HSouceBillType=3301'
                        , resize: false,
                        end: function () {
                            ////修改为功后刷新界面
                            //if (get_needClose_Bar == 0) {
                            //    $("#btnSearch").trigger('click');
                            //} else if (get_needClose_Bar == 1) {
                            //    $("#get_needClose").trigger('click');
                            //}
                        }
                        , cancel: function () {

                        }
                    })
                } else {
                    layer.msg('请选择正确数据查看！');
                }
            }
            //#endregion

            //行内删除快捷键
            function set_GridCellCheck(obj) {
@@ -2766,8 +2930,10 @@
                                if (i >= dataCol.length) {
                                    continue;
                                }

                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html

@@ -944,13 +944,14 @@
            function set_RejectCheck_Flow(tableName) {
                var checkStatus = table.checkStatus(tableName)
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length !=0 ) {
                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//将对象数组id提取去重
                    var queryString = uniqueIds.join(",");//将ids变成数组
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
                        url: GetWEBURL() + "/Gy_Routing/RejectAllCheckFlow", //方法所在页面和方法名
                        data: { "HInterIDS": queryString, "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -1594,7 +1594,7 @@
                return data;

            }
            //#endregin
            //#endregion

            //#region å‘起审批
            function set_startCheckBill() {

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_PatrolProcCheckOtherBillList.html

@@ -498,7 +498,7 @@
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 50000]
                    , limits: [50, 500, 2000, 5000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                    }
@@ -586,8 +586,8 @@
                                , totalRow: true
                                , height: 'full-50'
                                , page: true //开启分页
                                , limit: 500
                                , limits: [500, 2000, 5000, 20000]
                                , limit: 50
                                , limits: [50, 2000, 5000]
                                , cols: [col]
                                , data: data1.data
                                , done: function (res, curr, count) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList2.html

@@ -569,8 +569,8 @@
                                , totalRow: true
                                , height: 'full-50'
                                , page: true //开启分页
                                , limit: 500
                                , limits: [500, 2000, 5000, 20000]
                                , limit: 50
                                , limits: [50, 2000, 5000 ]
                                , cols: [col]
                                , data: data1.data
                                , done: function (res, curr, count) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList2.html

@@ -506,8 +506,8 @@
                                , totalRow: true
                                , height: 'full-50'
                                , page: true //开启分页
                                , limit: 500
                                , limits: [500, 2000, 5000, 20000]
                                , limit: 50 
                                , limits: [50,500, 2000, 5000]
                                , cols: [col]
                                , data: data1.data
                                , done: function (res, curr, count) {

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackaging.html

@@ -707,6 +707,7 @@
                        a = 0;
                        return false;
                    }

                    var HProcExchBillNo = $("#HProcExchBillNo").val();
                    //判断条码之前的工序是否出站
                    $.ajax({
@@ -728,6 +729,28 @@
                        a = 0;
                        return false;
                    }

                    //判断条码的配件是否符合模具 ç©´å·è¦æ±‚
                    $.ajax({
                        url: GetWEBURL() + "/LEMS/h_p_CJ_SNBarCodeBillMouldBathSelect",
                        type: "GET",
                        async: false,
                        data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HBillType": "BZ" },
                        success: function (result) {
                            if (result.count == 0) {
                                a = 1;
                                playSound();
                                layer.alert(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                return false;
                            }
                        }
                    })

                    if (a == 1) {
                        a = 0;
                        return false;
                    }


                    $.ajax({//判断总的包装数量是否超过流转卡数量
                        url: GetWEBURL() + "/LEMS/h_p_Sc_ProductionLinePackaging_Checkqty",
@@ -1157,11 +1180,7 @@
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

                if (LDM == "DU3" && BBM == "1099081-00-E") {

                } else {
                    $("#Print2").click();
                }
                $("#Print2").click();
            });

            //监听表格中行工具事件

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html

@@ -941,11 +941,12 @@
        var KNum = 0;
        function get_Accessory(HBarCode) {
            var index = layer.load();
            var HProcExchBillNo = $("#HProcExchBillNo").val();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"],"HBillType":"DPGZ"},
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -2127,6 +2127,7 @@
                                        for (let i = 0; i < option.cols[0].length; i++) {
                                            if (option.cols[0][i].field == '工序工价') {
                                                option.cols[0][i].hide = true; //隐藏工价字段
                                                titleData.push("工序工价");
                                            }
                                        }
                                    }
@@ -2424,7 +2425,7 @@
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";

                var data = getExportData();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
@@ -2432,7 +2433,6 @@
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = option.data
                            data.forEach((item) => {
                                for (let itemobj in item) {
                                    if (item[itemobj] == null) {
@@ -2458,6 +2458,156 @@
            }
            //#endregion

            //#region èŽ·å–导出数据
            function getExportData() {
                var data;;//导出的数据
                var ajaxLoad = layer.load();
                if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
                    $("#HProcExchBillNo").val(params[params[0]]);
                    $("#HBeginDate").val("1990-01-01");
                    $("#HEndDate").val("2200-12-30");
                    lookDownBar = 1;
                }
                var HStatus = $("select[name='HStatus']").val();//状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HWorkBillNo = $("#HWorkBillNo").val();
                var HBillNo = $("#HBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//复选框
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val();
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val();
                var ColContent1 = $("#ColContent1").val();
                var HNumber = $("#HNumber").val(); //产品代码 å³ç‰©æ–™ç¼–码
                var HName = $("#HName").val(); //当前工序
                var HEmpNumber = $("#HEmpNumber").val(); //操作员代码
                var HEmpName = $("#HEmpName").val(); //操作员名称

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (ColName1 != 0 && Comparator1 != 0) {
                    var com = "";
                    switch (Comparator1) {
                        case "7":
                            com = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com;
                }

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),出站时间, 23) <= '" + HEndDate + "'";
                }
                if (HWorkBillNo) {
                    sWhere += " and ä»»åŠ¡å• like '%" + HWorkBillNo + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (checkHWasterQty) {
                    sWhere += "  and æŠ¥åºŸæ•°é‡>0 ";
                }
                if (HNumber) {
                    sWhere += " and äº§å“ä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å½“前工序 like '%" + HName + "%'";
                }
                if (HEmpNumber) {
                    sWhere += " and æ“ä½œå‘˜ä»£ç  like '%" + HEmpNumber + "%'";
                }
                if (HEmpName) {
                    sWhere += " and æ“ä½œå‘˜ like '%" + HEmpName + "%'";
                }

                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //全部
                            sWhere += "";
                            break;
                        case '0':    //未审核
                            sWhere += " and å®¡æ ¸äºº='";
                            break;
                        case '1':    //已审核
                            sWhere += " and å®¡æ ¸äºº<>'";
                            break;
                        case '2':    //已关闭
                            sWhere += " and å…³é—­äºº<>'";
                        default:
                    }
                }
                sWhere += "  and HBillSubType<>'SUB'";
                //查询语句
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
                    success: function (data1) {
                        if (data1.count == 1) {
                            data = data1.data;//列字段数据
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";
                return data;

            }
            //#endregion


            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html

@@ -205,8 +205,20 @@
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">穴号</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;">
                                            <div class="layui-input-block" style="margin-left: 95px; width: 150px">
                                                <select name="HMouldNum" id="HMouldNum" lay-verify="required"  lay-search class="layui-input" >
                                                    <option value="0#" selected>0#</option>
                                                    <option value="1#">1#</option>
                                                    <option value="2#">2#</option>
                                                    <option value="3#">3#</option>
                                                    <option value="4#">4#</option>
                                                    <option value="5#">5#</option>
                                                    <option value="6#">6#</option>
                                                    <option value="7#">7#</option>
                                                    <option value="8#">8#</option>
                                                    <option value="9#">9#</option>
                                                    <option value="10#">10#</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA.html

@@ -615,7 +615,7 @@
            //#region æ–°å¢žæŒ‰é’®
            form.on('submit(Add)', function () {//提交
                layer.confirm('新增后页面数据将消失？', { icon: 3, title: '提示' }, function (index) {
                    location.replace('MES_StationInBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                    location.replace('MES_StationInBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2&HMaterToSourceInterID=0');
                });
            })
            //#endregion

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

@@ -33,22 +33,49 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">设备</label>
                                    <div class="layui-input-block">
                                        <select name="HEquipFileNo" id="HEquipFileNo" lay-verify="required" lay-search class="layui-input">
                                            <!--动态渲染车间-->
                                        </select>
                                    <label class="layui-form-label" style="width: 85px;">设备编码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" style="background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">ID号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" value="">
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">结束日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                            </div>
                        </div>
                        <div>
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                            <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(100vh);margin-top:5px;"> </div>
                            <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(85vh);"></div>
                        </div>
                    </form>
                </div>
@@ -107,6 +134,16 @@
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HEquipNumber = $("#HEquipNumber").val();
                if (HEquipNumber == "") {
                    layer.msg("设备编号不能为空");
                    return false;
                }
                if (HProcExchBillNo == "") {
                    layer.msg("ID号不能为空");
                    return false;
                }
                get_FastQuery();
            });

@@ -117,6 +154,11 @@

            //初始化界面
            function set_ClearBill() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                get_FastQuery();
            }

                if (OperationType == 1) {
                    //get_HProcHBillNoId(linterid);
                    get_FastQuery();
@@ -145,6 +187,8 @@
                            }
                            option = data1;
                            set_Line();
                            ColNameData = [];
                            DateData = [];

                        } else {
                            layer.close(wait);
@@ -157,6 +201,44 @@
                });
            }

            //设备弹窗
            form.on('submit(btnHEquip)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '设备档案列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/设备管理/设备档案/Gy_EquipFileMainList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEquipNumber").val(checkStatus.data[0].设备编码);
                        $("#HEquipName").val(checkStatus.data[0].设备名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //折线图
            function set_Line() {
                //#region【折线图】
@@ -167,17 +249,52 @@

                var Data_series = [];

                for (var i = 0; i < ColNameData.length; i++) {
                    var optionData = [];//值数据
                    for (var j = 0; j < DateData.length; j++) {
                        optionData.push(option.data[j][ColNameData[i]]);
                if (ColNameData.length == 0) {
                    var ColNameData_s = ["电流", "上区实际温度", "中区实际温度", "下区实际温度", "设定温度"];
                    for (var i = 0; i < ColNameData_s.length; i++) {
                        var optionData = [];//值数据
                        for (var j = 0; j < DateData.length; j++) {
                            optionData.push(option.data[j][ColNameData_s[i]]);
                        }
                        Data_series.push({
                            name: ColNameData_s[i],
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            //stack: 'Total',  //表示折线堆叠 
                            data: []
                        })
                    }
                    Data_series.push({
                        name: ColNameData[i],
                        type: 'line',
                        //stack: 'Total',  //表示折线堆叠 
                        data: optionData
                    })
                }
                else {
                    for (var i = 0; i < ColNameData.length; i++) {
                        var optionData = [];//值数据
                        for (var j = 0; j < DateData.length; j++) {
                            optionData.push(option.data[j][ColNameData[i]]);
                        }
                        Data_series.push({
                            name: ColNameData[i],
                            type: 'line',
                            label: {
                                show: true,
                                formatter: '{c}'
                            },
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }
                            },
                            //stack: 'Total',  //表示折线堆叠 
                            data: optionData
                        })
                    }
                }

                option_Data = {
@@ -187,7 +304,9 @@
                        left: 'center'
                    },
                    legend: {
                        data: ColNameData
                        data: (ColNameData.length == 0 ? ["电流", "上区实际温度", "中区实际温度", "下区实际温度", "设定温度"] : ColNameData),
                        top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                        left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                    },
                    grid: {
                        top:"13%",
@@ -205,8 +324,13 @@
                    },
                    yAxis: {
                        type: 'value',
                        min: 0,
                        max:1000
                        min: function(value) {
                            return value.min;
                        },
                        max:function(value) {
                            return value.max+10;
                        },
                        interval: 30
                    },
                    series: Data_series
                };
@@ -218,6 +342,26 @@

            //快速过滤
            function get_FastQuery() {
                var HEquipNumber = $("#HEquipNumber").val();
                var HEquipName = $("#HEquipName").val();
                var HBeginDate = $("#HBeginDate").val(); //开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HProcExchBillNo = $("#HProcExchBillNo").val();

             
                if (HEquipNumber != "" && HProcExchBillNo != "") {
                    sWhere = {
                        HEquipNumber: HEquipNumber
                        , HBeginDate: HBeginDate
                        , HEndDate: HEndDate
                        , HProcExchBillNo: HProcExchBillNo
                    }
                    get_Display(JSON.stringify(sWhere));
                    sWhere = "";//调用接口后清空sWhere缓存
                } else {
                    set_Line();
                }
              
                var HEquipFileNo = $("#HEquipFileNo").val();
                sWhere = HEquipFileNo;
                get_Display(sWhere);

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

New file
@@ -0,0 +1,369 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>干燥机温度曲线图</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">设备编码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HEquipNumber" id="HEquipNumber" value="" style="background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">设备名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">流转卡号</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <select name="HProcExchBillNo" id="HProcExchBillNo" lay-search class="layui-input">
                                            <option value=""></option>
                                            <!--动态渲染-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">结束日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                            </div>
                        </div>
                        <div>
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                            <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(85vh);"></div>
                        </div>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>

<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {

        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , util = layui.util
            , soulTable = layui.soulTable
        //查询条件
        var sWhere = "";
        var option = [];
        var ColNameData = [];//列名数据
        var DateData = [];//日期数据
        var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
        //#endregion

        //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

        //初始化界面
        set_ClearBill();

        //#endregion



        //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等

        //重置按钮
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });
        //查询按钮
        form.on('submit(btnSearch)', function (data) {
            var HProcExchBillNo = $("#HProcExchBillNo").val();
            var HEquipNumber = $("#HEquipNumber").val();
            if (HEquipNumber == "") {
                layer.msg("设备编号不能为空");
                return false;
            }
            get_FastQuery();
        });


        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        //初始化界面
        function set_ClearBill() {
            $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            get_FastQuery();
        }

        //查询数据
        function get_Display(sWhere) {
            var wait = layer.load();//遮罩
            $.ajax({
                url: GetWEBURL() + '/Cj_NoPassProc/Cj_TemperatureCurveDryingMachine',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(wait);
                        for (var i = 1; i < data1.list.length; i++) {
                            ColNameData.push(data1.list[i]["ColmCols"]);
                        }
                        var data = data1.data.h_p_Cj_TemperatureCurveDryingMachine;
                        var data_No = data1.data.h_p_Cj_TemperatureCurveDryingMachine1;
                        for (var i = 0; i < data.length; i++) {
                            DateData.push(data[i]["HDate"]);
                        }
                        $("#HProcExchBillNo").empty();
                        var HProcExchBillNo = "<option value=''></option>";
                        for (var i = 0; i < data_No.length; i++) {
                            HProcExchBillNo += '<option  style="color:blue;"  value="' + data_No[i].HProcExchBillNo + '" >' + data_No[i].HProcExchBillNo + '</option>';
                        }
                        $("#HProcExchBillNo").append(HProcExchBillNo);
                        form.render('select');
                        option = data1;
                        set_Line();
                        ColNameData = [];
                        DateData = [];

                    } else {
                        layer.close(wait);
                        layer.alert(data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(wait);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //设备弹窗
        form.on('submit(btnHEquip)', function () {
            //页面层-自定义
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '设备档案列表',
                closeBtn: 1,
                shift: 2,
                area: ['90%', '90%'],
                maxmin: true,
                content: ['../../../views/设备管理/设备档案/Gy_EquipFileMainList.html', 'yes'],
                btn: ['确定', '取消']
                , btn1: function (index, layero) {

                    //按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    $("#HEquipNumber").val(checkStatus.data[0].设备编码);
                    $("#HEquipName").val(checkStatus.data[0].设备名称);
                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) {
                    //按钮【按钮二】的回调
                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                },
                end: function () {

                },
                success: function (layero, index) {

                }
            });
        });

        //折线图
        function set_Line() {
            //#region【折线图】
            //平均值
            var chartDom = document.getElementById('HeatTreatmentTemperatureCurveChart');
            var myChart = echarts.init(chartDom);
            var option_Data;

            var Data_series = [];

            if (ColNameData.length == 0) {
                var ColNameData_s = ["温度"];
                for (var i = 0; i < ColNameData_s.length; i++) {
                    var optionData = [];//值数据
                    for (var j = 0; j < DateData.length; j++) {
                        optionData.push(option.data[j][ColNameData_s[i]]);
                    }
                    Data_series.push({
                        name: ColNameData_s[i],
                        type: 'line',
                        label: {
                            show: true,
                            formatter: '{c}'
                        },
                        tooltip: {
                            valueFormatter: function (value) {
                                return value;
                            }
                        },
                        //stack: 'Total',  //表示折线堆叠
                        data: []
                    })
                }
            }
            else {
                for (var i = 0; i < ColNameData.length; i++) {
                    var optionData = [];//值数据
                    for (var j = 0; j < DateData.length; j++) {
                        optionData.push(option.data.h_p_Cj_TemperatureCurveDryingMachine[j][ColNameData[i]]);
                    }
                    Data_series.push({
                        name: ColNameData[i],
                        type: 'line',
                        label: {
                            show: true,
                            formatter: '{c}'
                        },
                        tooltip: {
                            valueFormatter: function (value) {
                                return value;
                            }
                        },
                        //stack: 'Total',  //表示折线堆叠
                        data: optionData
                    })
                }
            }

            option_Data = {
                title: {
                    text: '干燥机温度曲线图',
                    top: '3%',
                    left: 'center'
                },
                legend: {
                    data: (ColNameData.length == 0 ? ["温度"] : ColNameData),
                    top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                    left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                },
                grid: {
                    top: "13%",
                    x: '3%', //相当于距离左边效果:padding-left
                    //y: '5%',  //相当于距离上边效果:padding-top
                    //bottom: '5%',
                    containLabel: true
                },
                xAxis: {
                    type: 'category',
                    data: DateData,
                    axisLabel: {
                        interval: 1 // è®¾ç½®ä¸º0以显示所有坐标点
                    }
                },
                yAxis: {
                    type: 'value',
                    min: function (value) {
                        return value.min - 2;
                    },
                    max: function (value) {
                        return value.max + 2;
                    },
                    interval: 1
                },
                series: Data_series
            };
            option_Data && myChart.setOption(option_Data);

            //#endregion

        }

        //快速过滤
        function get_FastQuery() {
            var HEquipNumber = $("#HEquipNumber").val();
            var HEquipName = $("#HEquipName").val();
            var HBeginDate = $("#HBeginDate").val(); //开始日期
            var HEndDate = $("#HEndDate").val();//结束日期
            var HProcExchBillNo = $("#HProcExchBillNo").val();


            if (HEquipNumber != "") {
                sWhere = {
                    HEquipNumber: HEquipNumber
                    , HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , HProcExchBillNo: HProcExchBillNo
                }
                get_Display(JSON.stringify(sWhere));
                sWhere = "";//调用接口后清空sWhere缓存
            } else {
                set_Line();
            }

        }

        //重置过滤条件
        function set_ClearQuery() {
            $("#HEquipFileNo").val("0");
            form.render()
            sWhere = "";
        }

        //#endregion
    });
</script>

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

@@ -449,7 +449,9 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }                                
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

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

@@ -104,7 +104,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Mes_OrderProcFlowAllReport";
            var HModName = "Mes_OrderProcFlowAllReport_ICMO";
            var ins;
            //#endregion


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

@@ -87,6 +87,7 @@
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_export" id="get_export" style="padding:0 5px">导出</button>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">
@@ -217,6 +218,7 @@
        var option = [];
        var HModName = "Sc_PlanAchievementRateReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•
        var ins;  //用于导出excel

        //#endregion

@@ -249,6 +251,23 @@
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //导出
        form.on('submit(get_export)', function (data) {
            var data = option.data
            data.forEach((item) => {
                for (let itemobj in item) {
                    if (item[itemobj] == null) {
                        item[itemobj] = "";
                    }
                    if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',','，');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                    }
                }
            });

            table.exportFile(ins.config.id, option.data, "xls");
        });        

        //日期间隔下拉列表监听
        form.on('select(HInitTimeCycle)', function (data) {
@@ -416,7 +435,7 @@
                                });
                            }
                        }
                        table.render(option);
                        ins = table.render(option);
                       
                        //刷新表格数据
                        DisPlay_HideColumn();