1

duhe

2023-12-25 dfc1961f8c3cd1bdaf7fa83843c14b0540705cf4

1

 WebTM/views/index.html

@@ -606,8 +606,8 @@
                                        <dd><a lay-href="车间管理/单品过站/Cj_ProcessItemBGA.html">工序单品返修台</a></dd>
                                        <!--<dd><a lay-href="车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html">工序单品返修台(配件更换)</a></dd>-->
                                        <dd><a lay-href="车间管理/单品过站/Sc_SourceLineRepairBillList.html">返修记录列表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/RetrospectiveQueryReport.html">合格追溯查询报表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/BadQueryReport.html">不良追溯查询报表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/RetrospectiveQueryReport.html">质量追溯查询</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/BadQueryReport.html">逆向追溯查询报表</a></dd>
                                    </dl>
                                </dd>
                            </dl>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldConkBookBillList.html

@@ -728,7 +728,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../PublicPage/UserInformation.html', 'yes'],
                                content: ['../../Baseset/基础资料/Gy_EmployeeList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {


 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html

@@ -883,18 +883,29 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {

                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {
                            //    if (data.Verify == "Y") //自动审核
                            //    {
                            //        layer.close(index);
                            //        SaveVerify(); //审核
                            //    }
                            //    else {
                            //        layer.close(index);
                            //    }
                            //});
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html

@@ -184,6 +184,25 @@

            //#endregion

            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;
                    }
                });
            })

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //初始化表格
@@ -193,9 +212,12 @@
                    elem: '#mainTable'
                    , height: 'full-50'
                    , page: true
                    , limit:500
                    , totalRow: true
                    , limits: [100, 500, 1000, 2000]
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
                        , { field: 'HDate', title: '日期', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: 'HBillNo', title: '单据号', width: 200 }
@@ -212,7 +234,7 @@
                        , { field: 'HMaterCode', title: '产品代码', width: 200 }
                        , { field: 'HMaterName', title: '产品名称', width: 200 }
                        , { field: 'HMaterSpec', title: '产品规格', width: 200 }
                        , { field: 'HQty', title: '汇报数量', width: 200 }
                        , { field: 'HQty', title: '汇报数量', width: 200, totalRow: true }
                        , { field: 'HSourceID', title: '生产资源ID', width: 200, hide: true }
                        , { field: 'HSourceCode', title: '生产资源代码', width: 200 }
                        , { field: 'HSourceName', title: '生产资源', width: 200 }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ICMOBillQualityStatus_TmpList.html

@@ -297,10 +297,10 @@
            }

            if (HDate) {
                sWhere += " and åˆ¶å•æ—¥æœŸ >= '" + HDate + "'";
                sWhere += " and CONVERT(varchar(100), åˆ¶å•æ—¥æœŸ, 23) >= '" + HDate + "'";
            }
            if (HDate1) {
                sWhere += " and åˆ¶å•æ—¥æœŸ <= '" + HDate1 + "'";
                sWhere += " and CONVERT(varchar(100), åˆ¶å•æ—¥æœŸ, 23) <= '" + HDate1 + "'";
            }

            if (HICMOBillNo) {

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ICMOBillWorkQtyStatus_TmpList.html

@@ -297,10 +297,10 @@
            }

            if (HDate) {
                sWhere += " and é‡‡é›†æ—¶é—´ >= '" + HDate + "'";
                sWhere += " and CONVERT(varchar(100), é‡‡é›†æ—¶é—´, 23) >= '" + HDate + "'";
            }
            if (HDate1) {
                sWhere += " and é‡‡é›†æ—¶é—´ <= '" + HDate1 + "'";
                sWhere += " and CONVERT(varchar(100), é‡‡é›†æ—¶é—´, 23) <= '" + HDate1 + "'";
            }

            if (HICMOBillNo) {

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ깤µ¥/Sc_Add_MESEndWorkBillList.html

@@ -793,18 +793,29 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                if (data.Verify == "Y") //自动审核
                                {
                                    layer.close(index);
                                    SaveVerify(); //审核
                                }
                                else {
                                    layer.close(index);
                                }
                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {

                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {
                            //    if (data.Verify == "Y") //自动审核
                            //    {
                            //        layer.close(index);
                            //        SaveVerify(); //审核
                            //    }
                            //    else {
                            //        layer.close(index);
                            //    }
                            //});
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -634,18 +634,30 @@
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            $("#HInterID").val(data.HInterID);//获取提交成功返回的单据主ID
                            layer.confirm(data.Message, {
                                btn: ['确认']
                            }, function (index) {
                                    if (data.Verify == "Y") //自动审核
                                    {
                                        layer.close(index);
                                        SaveVerify(); //审核
                                    }
                                    else {
                                        layer.close(index);
                                    }
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                            });
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                            }
                            else {
                                layer.close(index);
                            }
                            //layer.confirm(data.Message, {
                            //    btn: ['确认']
                            //}, function (index) {
                            //        if (data.Verify == "Y") //自动审核
                            //        {
                            //            layer.close(index);
                            //            SaveVerify(); //审核
                            //        }
                            //        else {
                            //            layer.close(index);
                            //        }
                            //});
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -569,7 +569,7 @@

            //#region å®¡æ ¸
            form.on('submit(set_CheckBill)', function (data) {

                set_CheckBill()
            });
            //#endregion

@@ -647,6 +647,35 @@
                        }
                    });
                }
            }
            //#endregion

            //#region å®¡æ ¸
            function set_CheckBill() {
                var InterID = $("#HInterID").val();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ICMOReportBill/AuditProcessReportList", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 10000, 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 });
                    }
                });              
            }
            //#endregion

@@ -911,7 +940,7 @@
                    success: function (d) {
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMaker").val(sessionStorage["HUserName"]);

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

@@ -181,7 +181,40 @@
                            </div>
                        </div>
                        <div id="HProgressBar"></div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-row" style="padding:10px 0">
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                        </div>
                        <div class="layui-tab layui-tab-card" style="margin-top:40px;">
                            <ul class="layui-tab-title">
                                <li class="layui-this">生产订单</li>                                
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <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="HMaterName" id="HMaterName">
                                        </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="HMaterName" id="HMaterName">
                                        </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="HMaterName" id="HMaterName">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">查询</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                                    <!--待排订单-->
                                    <table class="layui-hide" id="mainTable_ICMO" lay-filter="mainTable_ICMO"></table>
                                </div>                               
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
@@ -194,6 +227,13 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>准备排序</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>选产线</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>排产</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layuiiconform"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
@@ -227,9 +267,13 @@
            , element = layui.element;

        var sWhere = "";
        var sWhere_ICMO = "";
        var option = [];
        var option2 = [];
        var option_columns = [];
        var HModName = "JIT_DayPlanPlatForm";

        //不需要显示的字段 å¯æ‰©å±•
        var titleData = [];
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -413,9 +457,28 @@
                case 'set_Souce':
                    set_Souce(data);
                    break;
                    


            }
        });


        table.on('toolbar(mainTable_ICMO)', function (obj) {
            var checkStatus = table.checkStatus(obj.config.id);
            switch (obj.event) {
                //排产
                case 'set_Arrangement':
                    set_Arrangement();
                    break;
                //退出按钮
                case 'btn-Close':
                    parent.layui.admin.events.closeThisTabs();
                    break;
                //列设置
                case 'set_HideColumn2':
                    get_HideColumn2();
                    break;
            };
        });

        //导入
@@ -562,6 +625,7 @@
            get_FastQuery(1);
            //隐藏勾选字段
            DisPlay_HideColumn();
            get_Display2(sWhere_ICMO);
        }
         //#endregion

@@ -614,6 +678,7 @@
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150, edit: 'text' });
            columns.push({ field: '昨日数量', title: '昨日数量'});
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '拆单汇报数量', title: '拆单汇报数量', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID" });

            columns.push({
@@ -768,12 +833,12 @@
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
            columns.push({ field: '生产资源代码', title: '生产资源代码', width: 150, hide: true });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
          

            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });

            option_columns = columns;
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
@@ -1142,6 +1207,70 @@
            sWhere = ""//调用接口后清空sWhere缓存
        }

        
        //快速过滤
        function get_FastQuery_ICMO(number) {
            var HWorkShopID = 0;
            var HProdORGID = 0;
            HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (number == 2) {
                if (HWorkShopID == 0) {
                    return layer.msg("生产车间不能为空!");
                }

                HProdORGID = $("#HProdORGID").val();//生产订单组织
            }
            if (number == 1) {
                HProdORGID = sessionStorage["OrganizationID"];//生产订单组织
            }
            var HPlanBeginDate = $("#HPlanBeginDate").val();//开工起始日期
            var HPlanEndDate = $("#HPlanEndDate").val();//开工截止日期
            var HMastersDate = $("#HMastersDate").val();//排产日期
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HMaterID = $("#HMaterID").val();//物料编码id
            var HICMOBillNo = $("#HICMOBillNo").val();//生产订单号
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var sWhere_ICMO = "";

            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_ICMO += " and [" + ColName + "] " + com;
            }

            sWhere_ICMO = {
                HPlanBeginDate: HPlanBeginDate
                , HProdORGID: HProdORGID
                , HSeOrderBillNo: HSeOrderBillNo
                , HPlanEndDate: HPlanEndDate
                , HMaterID: HMaterID
                , HICMOBillNo: HICMOBillNo
                , HWorkShopID: HWorkShopID
                , HMastersDate: HMastersDate
                , sWheres: sWheres
            }
            get_Display2(JSON.stringify(sWhere_ICMO));
            sWhere_ICMO = ""//调用接口后清空sWhere缓存
        }

        //双击跳转齐套分析明细表
        function btnrowDouble(obj) {

@@ -1183,6 +1312,27 @@
            $("#Comparator").val("0");
            form.render('select');
            sWhere = "";
        }
        
        //重置
        function set_ClearQuery_ICMO() {
            $("#HPlanBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开工起始日期
            $("#HSeOrderBillNo").val("");//销售订单号
            $("#HPlanEndDate").val(Format(new Date(), "yyyy-MM-dd"));//开工截止日期
            $("#HMastersDate").val("");//排产日期
            $("#HMaterID").val("0");//物料编码id
            $("#HMaterNumber").val("");//物料编码
            $("#HMaterName").val("");//物料名称
            $("#HMaterModel").val("");//规格型号
            $("#HICMOBillNo").val("");//生产订单号
            $("#HWorkShopID").val("0");//生产车间id
            $("#HWorkShopIDName").val("");//生产车间
            $("#HProdORGID").val(sessionStorage["OrganizationID"])//生产订单组织
            $("#ColContent").val("");
            $("#ColName").val("0");
            $("#Comparator").val("0");
            form.render('select');
            sWhere_ICMO = "";
        }

        //齐套分析
@@ -2211,13 +2361,13 @@
                    }
                })

              

            }
            else {
                return layer.msg("请选择数据!")
            }
        }
        

        //保存
        function set_AddNew() {

@@ -2228,7 +2378,7 @@
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) == 0) {
                        return layer.msg("第" + (i + 1) + "行,拆产数量有误,请重新输入!");
                    }
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) < parseFloat(table.cache["mainTable"][i]["日计划数量总量"]) + parseFloat(table.cache["mainTable"][i]["今日之前日计划数量"])) { // - å·²æ±‡æŠ¥æ•°é‡
                    if (parseFloat(table.cache["mainTable"][i]["拆单数量"]) - parseFloat(table.cache["mainTable"][i]["拆单汇报数量"]) < parseFloat(table.cache["mainTable"][i]["日计划数量总量"])) { // - å·²æ±‡æŠ¥æ•°é‡
                        return layer.msg("第" + (i + 1) + "行,排产数量超出订单数量!");
                    }
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
@@ -2404,6 +2554,177 @@
            }
        }


        //查询未排产的生产订单
        function get_Display2(sWhere_ICMO) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                type: "GET",
                data: { "sWhere": sWhere_ICMO, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                }
                            }
                        }

                        //动态显示列名
                        option2 = {
                            elem: '#mainTable_ICMO'
                            , toolbar: '#toolbarDemo2'
                            , cols: [col]
                            , data: data1.data
                            , height: 400
                            , page: true
                            , limits: [50, 500, 5000, 50000]
                            , limit: 200
                            , cellMinWidth: 90
                        }
                        table.render(option2);

                        //刷新表格数据
                        DisPlay_HideColumn2();

                        layer.close(ajaxLoad);
                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                        //    ColFilter();
                        //}
                        //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 });
                }
            });
        }

        //排产功能
        function set_Arrangement() {
            var checkStatus = table.checkStatus('mainTable_ICMO')
                , data = checkStatus.data;
            if (checkStatus.data.length > 0) {
                console.log(option.data);
                var arr_field = [];
                //获取已排订单列表字段
                for (let i = 0; i < option_columns.length; i++) {
                    if (option_columns[i].field != undefined && option_columns[i].field != null) {
                        arr_field.push(option_columns[i].field);
                    }
                }
                //把已排订单列表字段存入obj对象中，以便给字段赋值
                var obj = {};
                for (let i = 0; i < arr_field.length; i++) {
                    var key = arr_field[i];
                    var value = '';
                    obj[key] = value;
                }
                //获取勾选上的待排生产订单
                for (var i = 0; i < checkStatus.data.length; i++) {
                    obj.HMaterID = data[i].HMaterID;
                    obj.HProdORGID = data[i].HPRDORGID;
                    obj.HUnitID = data[i].HUnitID;
                    obj.HWorkShopID = data[i].HDeptID;
                    obj.拆单数量 = data[i].生产任务单数量;
                    obj.源单主内码 = data[i].hmainid;
                    obj.源单子内码 = data[i].HEntryID;
                    obj.物料代码 = data[i].产品代码;
                    obj.物料名称 = data[i].产品名称;
                    obj.生产组织 = "智云迈思";
                    obj.生产订单单据类型 = data[i].单据类型;
                    obj.生产订单号 = data[i].单据号;
                    obj.生产订单明细行号 = data[i].HEntryID;
                    obj.生产车间 = data[i].生产车间;
                    obj.规格型号 = data[i].规格型号;
                    obj.计划开始日期 = data[i].计划开工日期;
                    obj.计划数量 = data[i].生产任务单数量;
                    obj.计划结束日期 = data[i].计划完工日期;
                    obj.计量单位 = data[i].计量单位;
                    obj.订单可排数量 = data[i].生产任务单数量;
                    obj.订单等级 = data[i].订单等级;
                    obj.订单类型 = data[i].单据类型;
                    obj.销售订单号 = data[i].销售订单号;
                    obj.销售订单数量 = data[i].销售数量;

                    option.data.push(obj);
                    table.render(option)
                }

                //获取上方排产列表数据,用于对比下方生产订单列表，将下方生产订单列表相同的数据不显示
                var compareList = [];
                for (var i = 0; i < option.data.length; i++) {
                    var temp = option.data[i]["源单主内码"] + "|" + option.data[i]["源单子内码"];
                    compareList.push(temp);
                }

                //剔除上方排产列表中已经加入的生产订单
                var tables = [];
                for (var i = 0; i < option2.data.length; i++) {
                    var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
                    if ($.inArray(temp, compareList) == -1) {
                        tables.push(option2.data[i]);
                    }
                }
                option2.data = tables;

                //重新渲染子表2
                table.render(option2);

                //var wait = layer.load();
                ////逻辑方法
                //$.ajax({
                //    url: GetWEBURL() + '/LEMS/ProcessExchangeArrangement_Add',
                //    type: "GET",
                //    data: { "HInterID_S": HInterID_S.toString(), "HSourceID": DataSourceID, "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                //    success: function (result) {
                //        if (result.count == 1) {
                //            layer.msg(result.Message, { icon: 1 }, function () {
                //                // å¾—到frame索引
                //                var index = layer.getFrameIndex(window.name);
                //                //关闭当前frame
                //                layer.close(wait);
                //                get_Display("  and HSourceID=" + DataSourceID);
                //                //修改为功后刷新界面
                //                get_FastQuery();
                //            });
                //        } else {
                //            layer.alert(result.code + result.Message, { icon: 5 });
                //            layer.close(wait);
                //        }
                //    }, error: function () {
                //        layer.alert("接口请求失败!", { icon: 5 });
                //        layer.close(wait);
                //    }
                //});
            }
            else {
                layer.msg('请选择数据！');
            }
        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
@@ -2522,6 +2843,124 @@
            })
        }

        function get_HideColumn2() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option2.cols[0].length; i++) {
                colName += option2.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + "Main" + '&colName=' + colName;

            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn2();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

        function DisPlay_HideColumn2() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName + "Main", "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {


                        var dataCol = [];//数据库查询出的列数据
                        /* var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option2.cols[0].length - 1; i++) {
                            if (dataCol[i]) {
                                var dataCols = dataCol[i].split('|');
                            }
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option2.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option2.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option2.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                                option2.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option2.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option2.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option2.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }

                        //取消冻结列
                        for (var i = 1; i < option2.cols[0].length - 1; i++) {
                            if (option2.cols[0][i]["fixed"] != null) {
                                option2.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option2.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option2);
                    } else {
                        table.render(option2);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }

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

 WebTM/views/É豸¹ÜÀí/Sb_Add_EqpConkBookBillList.html

@@ -107,7 +107,7 @@
                                                <label class="layui-form-label">故障类别</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HConkTypeName" id="HConkTypeName" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HConkTypeID" id="HConkTypeID" class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HConkTypeList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -378,7 +378,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../PublicPage/RepairItemInformation.html', 'yes'],
                                content: ['../Baseset/基础资料/Gy_EmployeeList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {


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

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>不良追溯查询报表</title>
    <title>逆向追溯查询报表</title>
    <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>
@@ -26,21 +26,27 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产订单号</label>
                                    <label class="layui-form-label">物料编码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" value="">
                                        <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 76px;">产品条码</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBardCode" id="HBardCode" value="">
                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="" style="background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <label class="layui-form-label" style="width: 76px;">规格型号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" value="">
                                        <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" value="" style="background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">批次号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -81,10 +87,41 @@
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                        <div class="layui-tab layui-tab-card">
                            <ul class="layui-tab-title">
                                <li class="layui-this">流转卡清单</li>
                                <li>产品码绑定清单</li>
                                <li>出入库记录</li>
                                <!--<li>相关库存清单</li>-->
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--流转卡清单-->
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--产品码绑定清单-->
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--出入库记录-->
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--相关库存清单-->
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                </div>
                            </div>
                        </div>

                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo5">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn5"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
@@ -112,8 +149,14 @@
            , laydate = layui.laydate
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var HModName = "BadQueryReport";
        var option1 = [];
        var option2 = [];
        var option3 = [];
        var option4 = [];
        var option5 = [];
        var option6 = [];
        var option7 = [];
        var HModName = "RetrospectiveQueryReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

        //#endregion
@@ -130,7 +173,7 @@
        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        // å¤´å·¥å…·æ äº‹ä»¶
        table.on('toolbar(mainTable)', function (obj) {
        table.on('toolbar(mainTable1)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
@@ -152,15 +195,15 @@
            //查询
            get_FastQuery();
        }

        // æŸ¥è¯¢
        function get_Display(sWhere) {
        // æµè½¬å¡æ¸…单
        function get_Display1(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BadQueryReport',
                url: GetWEBURL() + '/Cj_SingleStation/Sc_ProcessExchangeBillMainList',
                type: "GET",
                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                async: false,
                data: { "HMaterNumber": $("#HMaterNumber").val(), "HBatchNo": $("#HBatchNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
@@ -189,9 +232,9 @@
                        }

                        //动态显示列名
                        option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                        option1 = {
                            elem: '#mainTable1'
                            , toolbar: '#toolbarDemo1'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
@@ -204,7 +247,12 @@
                                soulTable.render(this);
                            }
                        }
                        table.render(option);
                        table.render(option1);
                        if ($("#HBardCode").val() != "" && data1.data.length != 0) {
                            $("#HICMOBillNo").val(data1.data[0]["生产订单号"]);
                            $("#HProcExchBillNo").val(data1.data[0]["流转卡"]);
                        }


                        //刷新表格数据
                        DisPlay_HideColumn();
@@ -225,8 +273,203 @@
            });
        }

        // äº§å“ç ç»‘定清单
        function get_Display2(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/HBardcodeList',
                type: "GET",
                async: false,
                data: { "HMaterNumber": $("#HMaterNumber").val(), "HBatchNo": $("#HBatchNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }

                        //动态显示列名
                        option2 = {
                            elem: '#mainTable2'
                            , toolbar: '#toolbarDemo1'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option2);
                        if ($("#HBardCode").val() != "" && data1.data.length != 0) {
                            $("#HICMOBillNo").val(data1.data[0]["生产订单号"]);
                            $("#HProcExchBillNo").val(data1.data[0]["流转卡"]);
                        }


                        //刷新表格数据
                        DisPlay_HideColumn();

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }

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

        //出入库记录
        function get_Display3(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BardCodeOutInList',
                type: "GET",
                async: false,
                data: { "HMaterNumber": $("#HMaterNumber").val(), "HBatchNo": $("#HBatchNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }

                        //动态显示列名
                        option3 = {
                            elem: '#mainTable3'
                            , toolbar: '#toolbarDemo3'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option3);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //相关库存清单
        function get_Display4(sWhere) {
            var sWhere = " and HMaterSN='" + HBardcode + "'";

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        //动态显示列名
                        option4 = {
                            elem: '#mainTable4'
                            , toolbar: '#toolbarDemo4'
                            , cols: [[
                                { type: 'checkbox', fixed: 'left' }
                                , { type: 'numbers', title: '序号' }
                                , { field: 'HICMOBillNo', title: '生产订单' }
                                , { field: 'HDate', title: '日期' }
                                , { field: 'HMaterNumber', title: '配件物料编码' }
                                , { field: 'HMaterName', title: '配件物料名称' }
                                , { field: 'HBarCode', title: '配件SN码' }
                                , { field: 'HMaterSN', title: '产品SN码' }

                            ]]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option4);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
@@ -253,7 +496,13 @@
                com = " and (" + ColName + " " + com + ")";
            }

            get_Display(sWhere);
            sWhere += com;

            get_Display1(sWhere);//流转卡清单
            get_Display2(sWhere);//产品码绑定清单
            get_Display3(sWhere);//出入库记录
            //get_Display4(HBardCode);//相关库存清单

            sWhere = "";//调用接口后清空sWhere缓存
        }

@@ -261,8 +510,8 @@
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            for (var i = 1; i < option1.cols[0].length - 1; i++) {
                colName += option1.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
@@ -307,50 +556,50 @@

                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                        for (var i = 0; i < option1.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                                option1.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                                option1.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                option1.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //    option1.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //    option1.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData) == -1) {
                                option1.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    option1.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    option1.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    option1.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }

                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                        for (var i = 1; i < option1.cols[0].length - 1; i++) {
                            if (option1.cols[0][i]["fixed"] != null) {
                                option1.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
@@ -359,15 +608,15 @@
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                                option1.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                        table.render(option1);
                    } else {
                        table.render(option);
                        table.render(option1);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
@@ -378,9 +627,9 @@
        // åˆ—明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
            for (var i = 1; i < option1.cols[0].length; i++) {
                if (option1.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option1.cols[0][i].field + '">' + option1.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();

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

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>合格追溯查询报表</title>
    <title>质量追溯查询报表</title>
    <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>
@@ -28,7 +28,7 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产订单号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo"  value="">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" value="">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -40,7 +40,7 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo"  value="">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -49,7 +49,7 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                       

                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
@@ -81,10 +81,56 @@
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                        <div class="layui-tab layui-tab-card">
                            <ul class="layui-tab-title">
                                <li class="layui-this">进出站记录</li>
                                <li>不良汇报记录</li>
                                <li>工艺参数记录</li>
                                <li>配件清单</li>
                                <li>返修记录</li>
                                <li>配件变更记录</li>
                                <!--<li>出入库记录</li>-->
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--进出站记录-->
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--不良汇报记录-->
                                    <table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--工艺参数记录-->
                                    <table class="layui-hide" id="mainTable7" lay-filter="mainTable7"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--配件清单-->
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--返修记录-->
                                    <table class="layui-hide" id="mainTable6" lay-filter="mainTable6"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--配件变更记录-->
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--出入库记录-->
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                            </div>
                        </div>

                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo5">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn5"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
@@ -112,7 +158,13 @@
            , laydate = layui.laydate
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var option1 = [];
        var option2 = [];
        var option3 = [];
        var option4 = [];
        var option5 = [];
        var option6 = [];
        var option7 = [];
        var HModName = "RetrospectiveQueryReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•

@@ -130,7 +182,7 @@
        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        // å¤´å·¥å…·æ äº‹ä»¶
        table.on('toolbar(mainTable)', function (obj) {
        table.on('toolbar(mainTable2)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
@@ -138,6 +190,34 @@
            };
        });

        table.on('row(mainTable2)', function (obj) {
            var HBardcode = obj.data["条码"];
            get_Display3(HBardcode);//配件清单
            get_Display6(HBardcode);//返修记录
            get_Display7(HBardcode);//工艺参数
        })

        table.on('row(mainTable5)', function (obj) {
            var HBardcode = obj.data["条码"];
            get_Display3(HBardcode);//配件清单
            get_Display6(HBardcode);//返修记录
            get_Display7(HBardcode);//工艺参数
        })

        table.on('row(mainTable6)', function (obj) {
            var HBardcode = obj.data["SN码"];
            get_Display4(HBardcode);//配件变更记录
        })


        table.on('toolbar(mainTable5)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn5': get_HideColumn5();
                    break;
            };
        });
    
        //查询按钮
        form.on('submit(btnSearch)', function (data) {//选择仓位
            get_FastQuery();
@@ -153,13 +233,210 @@
            get_FastQuery();
        }

        // æŸ¥è¯¢
        function get_Display(sWhere) {
        // è¿›å‡ºç«™æŸ¥è¯¢
        function get_Display2(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/RetrospectiveQueryReport',
                url: GetWEBURL() + '/Cj_SingleStation/EntryAndExitRecords',
                type: "GET",
                async: false,
                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }

                        //动态显示列名
                        option2 = {
                            elem: '#mainTable2'
                            , toolbar: '#toolbarDemo1'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option2);
                        //if ($("#HBardCode").val() != "" && data1.data.length != 0) {
                        //    $("#HICMOBillNo").val(data1.data[0]["生产订单号"]);
                        //    $("#HProcExchBillNo").val(data1.data[0]["流转卡"]);
                        //}
                     

                        //刷新表格数据
                        DisPlay_HideColumn();

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }

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

        //配件清单
        function get_Display3(HBardcode) {

            var sWhere = " and äº§å“æ¡ç ='" + HBardcode + "'";

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_AssemblyBill/list1',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }

                        //动态显示列名
                        option3 = {
                            elem: '#mainTable3'
                            , toolbar: '#toolbarDemo3'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option3);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //配件变更记录
        function get_Display4(HBardcode) {
            var sWhere = " and HMaterSN='" + HBardcode + "'";

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        //动态显示列名
                        option4 = {
                            elem: '#mainTable4'
                            , toolbar: '#toolbarDemo4'
                            , cols: [[
                                { type: 'checkbox', fixed: 'left' }
                                , { type: 'numbers', title: '序号' }
                                , { field: 'HICMOBillNo', title: '生产订单' }
                                , { field: 'HDate', title: '日期' }
                                , { field: 'HMaterNumber', title: '配件物料编码' }
                                , { field: 'HMaterName', title: '配件物料名称' }
                                , { field: 'HBarCode', title: '配件SN码' }
                                , { field: 'HMaterSN', title: '产品SN码' }

                            ]]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option4);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //不良汇报记录
        function get_Display5(sWhere) {

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BadQueryReport',
                type: "GET",
                async: false,
                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -190,8 +467,8 @@

                        //动态显示列名
                        option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                            elem: '#mainTable5'
                            , toolbar: '#toolbarDemo5'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
@@ -206,13 +483,147 @@
                        }
                        table.render(option);

                        //刷新表格数据
                        DisPlay_HideColumn();
                        ////刷新表格数据
                        //DisPlay_HideColumn();

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                        //    ColFilter();
                        //}

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

        //返修记录
        function get_Display6(HBardcode) {

            var sWhere = " and SN码='" + HBardcode + "'";

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/ProcessItemRepair',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }

                        //动态显示列名
                        option6 = {
                            elem: '#mainTable6'
                            , toolbar: '#toolbarDemo6'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option6);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //工艺参数
        function get_Display7(HBardcode) {

            var sWhere = " and æ¡ç ='" + HBardcode + "'";

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/ProcessParameters',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }

                        //动态显示列名
                        option7 = {
                            elem: '#mainTable7'
                            , toolbar: '#toolbarDemo7'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option7);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
@@ -227,10 +638,12 @@

        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HBardCode = $("#HBardCode").val();
        
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();

          
            var com = "";
            if (ColName != 0 && Comparator != 0) {
                switch (Comparator) {
@@ -253,7 +666,15 @@
                com = " and (" + ColName + " " + com + ")";
            }

            get_Display(sWhere);
            get_Display2(sWhere);
            get_Display5(sWhere);
            if (HBardCode != "") {
                get_Display3(HBardCode);//配件清单
                get_Display6(HBardCode);//返修记录
                get_Display7(HBardCode);//工艺参数
                get_Display4(HBardCode);//配件变更记录
            }
         
            sWhere = "";//调用接口后清空sWhere缓存
        }

@@ -261,8 +682,8 @@
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            for (var i = 1; i < option2.cols[0].length - 1; i++) {
                colName += option2.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
@@ -307,50 +728,50 @@

                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                        for (var i = 0; i < option2.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                                option2.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                                option2.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                option2.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //    option2.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //    option2.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                                option2.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    option2.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    option2.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    option2.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }

                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                        for (var i = 1; i < option2.cols[0].length - 1; i++) {
                            if (option2.cols[0][i]["fixed"] != null) {
                                option2.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
@@ -359,15 +780,15 @@
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                                option2.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                        table.render(option2);
                    } else {
                        table.render(option);
                        table.render(option2);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
@@ -378,9 +799,9 @@
        // åˆ—明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
            for (var i = 1; i < option2.cols[0].length; i++) {
                if (option2.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option2.cols[0][i].field + '">' + option2.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();