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

yusijie

2024-11-13 d82ef76c22fd9e44dea11067e7849f4ea893f4f5

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

 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_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) {//提交
                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) {
@@ -1865,6 +1907,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) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {

 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_FiveMenOneRingList.html

@@ -179,12 +179,18 @@
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                           
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RCL" id="btn_RCL"><i class="layui-icon layui-icon-export"></i>热处理曲线图</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_GZJ" id="btn_GZJ"><i class="layui-icon layui-icon-export"></i>干燥机曲线图</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                           
                        </script>
                    </form>
                </div>
@@ -209,7 +215,7 @@
                , util = layui.util
                , soulTable = layui.soulTable
            var sWhere = "";
            var option = "";  //人
            var option = "";  //主表格
            var option_Man = "";  //人
            var option_Machine = ""; //机
            var option_Material = ""; //料
@@ -253,6 +259,17 @@
                switch (obj.event) {                  
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                };
            });

            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //热处理曲线图
                    case 'btn_RCL': btn_RCL();
                        break;
                    //干燥机曲线图
                    case 'btn_GZJ': btn_GZJ();
                        break;
                };
            });
@@ -391,13 +408,7 @@
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [
                        [
                            { type: 'checkbox', fixed: 'left' }
                            , { field: '流转卡', title: '流转卡', sort: true, width: 200 }
                            , { field: '物料名称', title: '物料名称', sort: true, width: 200 }
                        ]
                    ]
                    , cols: []
                    ,data:[]
                };
            }
@@ -406,7 +417,7 @@
            function set_InitGrid_Man() {
                option_Man = {
                    elem: '#mainTable_Man'
                    , toolbar: '#toolbarDemo'                    
                    , toolbar: '#toolbarDemo2'                    
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
@@ -420,7 +431,7 @@
            function set_InitGrid_Machine() {
                option_Machine = {
                    elem: '#mainTable_Machine'
                    , toolbar: '#toolbarDemo'
                    , toolbar: '#toolbarDemo2'
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
@@ -434,7 +445,7 @@
            function set_InitGrid_Material() {
                option_Material = {
                    elem: '#mainTable_Material'
                    , toolbar: '#toolbarDemo'
                    , toolbar: '#toolbarDemo2'
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
@@ -448,7 +459,7 @@
            function set_InitGrid_Method() {
                option_Method = {
                    elem: '#mainTable_Method'
                    , toolbar: '#toolbarDemo'
                    , toolbar: '#toolbarDemo2'
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
@@ -462,6 +473,7 @@
            function set_InitGrid_Environments() {
                option_Environments = {
                    elem: '#mainTable_Environments'
                    , toolbar: '#toolbarDemo2'
                    , height: 600
                    , totalRow: true
                    , limit: Number.MAX_VALUE//默认显示全部
@@ -474,6 +486,7 @@
            function set_InitGrid_Measure() {
                option_Measure = {
                    elem: '#mainTable_Measure'            
                    , toolbar: '#toolbarDemo2'
                    , page: false
                    , height: 600
                    , totalRow: true
@@ -559,7 +572,7 @@

                            option_Man = {
                                elem: '#mainTable_Man'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                             
@@ -569,7 +582,7 @@

                            option_Machine = {
                                elem: '#mainTable_Machine'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                               
@@ -579,7 +592,7 @@

                            option_Material = {
                                elem: '#mainTable_Material'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                               
@@ -589,7 +602,7 @@

                            option_Method = {
                                elem: '#mainTable_Method'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                                
@@ -599,7 +612,7 @@

                            option_Environments = {
                                elem: '#mainTable_Environments'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                              
@@ -609,7 +622,7 @@

                            option_Measure = {
                                elem: '#mainTable_Measure'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                              
@@ -743,6 +756,52 @@
            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion

            //#region çƒ­å¤„理曲线图
            function btn_RCL() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].流转卡id;
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '热处理曲线图'
                        , shift: 0//弹出动画
                        , content: '../../车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html?OperationType=1&linterid=' + linterid+'&HSouceBillType='
                        , btn: [],
                        end: function (index, layero, that) {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }                
            }
            //#endregion

            //#region å¹²ç‡¥æœºæ›²çº¿å›¾
            function btn_GZJ() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].流转卡id;
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '干燥机曲线图'
                        , shift: 0//弹出动画
                        , content: '../../车间管理/报表分析/Cj_TemperatureCurveDryingMachine.html?OperationType=1&linterid=' + linterid+'&HSouceBillType='
                        , btn: [],
                        end: function (index, layero, that) {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }                
            }
            //#endregion
            
@@ -1428,7 +1487,7 @@
                            //人
                            option_Man = {
                                elem: '#mainTable_Man'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[0]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query
                                , height: 'full-80'
@@ -1440,7 +1499,7 @@
                            //机
                            option_Machine = {
                                elem: '#mainTable_Machine'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query1
                                , height: 'full-80'
@@ -1452,7 +1511,7 @@
                            //料
                            option_Material = {
                                elem: '#mainTable_Material'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[2]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query2
                                , height: 'full-80'
@@ -1464,7 +1523,7 @@
                            //法
                            option_Method = {
                                elem: '#mainTable_Method'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[3]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query3
                                , height: 'full-80'
@@ -1475,7 +1534,7 @@
                            //环
                            option_Environments = {
                                elem: '#mainTable_Environments'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[4]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query4
                                , height: 'full-80'
@@ -1486,7 +1545,7 @@
                            //测
                            option_Measure = {
                                elem: '#mainTable_Measure'
                                , toolbar: '#toolbarDemo'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[5]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query5
                                , height: 'full-80'
@@ -1507,6 +1566,27 @@
            }
           //#endregion  

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";

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

@@ -2425,7 +2425,7 @@
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";

                var data = getExportData();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
@@ -2433,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) {
@@ -2459,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_HeatTreatmentTemperatureCurveChart.html

@@ -111,6 +111,12 @@
            var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
            //#endregion

            var params = get_UrlVars();
            var OperationType = params[params[0]] == undefined ? "":params[params[0]];//操作类型
            var linterid = params[params[1]] == undefined ? "" : params[params[1]];//源单id
            var HSBillType = params[params[2]] == undefined ? "" : params[params[2]];//源单类型


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

            //初始化界面
@@ -151,6 +157,15 @@
                $("#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();
                } else {
                    get_FastQuery();
                }
                
            }

            //查询数据
@@ -347,6 +362,11 @@
                    set_Line();
                }
              
                var HEquipFileNo = $("#HEquipFileNo").val();
                sWhere = HEquipFileNo;
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
@@ -356,6 +376,28 @@
                sWhere = "";
            }

            //全程追溯报表传入流转卡id  èŽ·å–设备编号
            //function get_HProcHBillNoId(linterid) {
            //    var wait = layer.load();//遮罩
            //    $.ajax({
            //        url: GetWEBURL() + '/Cj_NoPassProc/GetHProcHBillNoId',
            //        type: "GET",
            //        async: false,
            //        data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
            //        success: function (data1) {
            //            if (data1.count == 1) {
                          
            //            } else {
            //                layer.close(wait);
            //                layer.alert(data1.Message, { icon: 5 });
            //            }
            //        }, error: function () {
            //            layer.close(wait);
            //            layer.alert("接口请求失败!", { icon: 5 });
            //        }
            //    });
            //}

            //#endregion
        });
</script>