增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序

zrg

2025-01-17 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5

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

@@ -55,21 +55,17 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="WorkCenter" id="WorkCenter">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <!--其他条件-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 76px;">物料名称</label>
@@ -106,7 +102,10 @@
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">重置</button>
                                </div>

                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
@@ -219,14 +218,16 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>反审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>批改小时产能</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>产线产能</button>
                            </div>
                        </script>
                    </form>
@@ -390,6 +391,12 @@
                    //读取方案
                    case 'btn_ReadScheme': set_ReadScheme();
                        break;
                    //批改小时产能
                    case 'btn_BulkEditWorkTime': set_BulkEditWorkTime();
                        break;
                    //产线产能
                    case 'btn_SourceWorkQty': set_SourceWorkQty();
                        break;
                };
            });

@@ -485,7 +492,7 @@
                set_InitGrid();
                Organ();
                //查询
                get_FastQuery(1);
                //get_FastQuery(1);
                //获取项目号
                Get_HProject();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
@@ -614,6 +621,32 @@
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //#region åŒå‡»è¡Œå¼¹å‡ºå¼¹æ¡†ï¼Œç»´æŠ¤ä¸åŒç”Ÿäº§èµ„源的小时产能
            table.on('rowDouble(mainTable)', function (obj) {
                var HMaterNumber = obj.data.物料代码;
                var HMaterName = obj.data.物料名称;
                var HMaterModel = obj.data.规格型号;
                var HProcName = obj.data.工序;
                var HBillInterID = obj.data.hmainid;
                var HBillEntryID = obj.data.hsubid;
                var HSortProcFlag = obj.data.排产工序标记;

                if (HSortProcFlag == "true" || HSortProcFlag == "1" || HSortProcFlag == "是" || HSortProcFlag == true) {
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '生产资源产能设置'
                        , shade: 0.6 //遮罩透明度
                        //, maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../计划管理/工艺路线/Gy_RoutingBillWorkQty.html?HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel + '&HProcName=' + HProcName + '&HBillInterID=' + HBillInterID + '&HBillEntryID=' + HBillEntryID, 'yes']
                    })
                } else {
                    layer.msg('所选工序：' + HProcName + '，不为排产工序！');
                }
            })
            //#endregion

@@ -1362,7 +1395,7 @@
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                    

                                }
                            });
                            //更新表格缓存的数据
@@ -1448,7 +1481,7 @@
                                        layer.close(index);
                                    }
                                    //layer.closeAll('dialog');
                                    

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -1665,7 +1698,7 @@
                if (HProject != '0') {
                    sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                }
                

                sWhere += " and å·¥åºä»£ç  != '9999' and HBillSubType<>'SUB'"
                //查询语句
                $.ajax({
@@ -1823,7 +1856,7 @@
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                    

                                });

                            } else {
@@ -1997,7 +2030,7 @@
            //                    if (dataCol[i]) {
            //                        var dataCols = dataCol[i].split('|');
            //                    }
                                

            //                    //隐藏列
            //                    if (dataCols[1] == 1) {
            //                        option.cols[0][i + 1]["hide"] = true;
@@ -2417,6 +2450,53 @@

            //#endregion

            //#region æ‰¹æ”¹å°æ—¶äº§èƒ½
            function set_BulkEditWorkTime() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "批改小时产能"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "80%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['./Gy_BulkEditWorkQty.html', "yes"]
                })
            }
            //#endregion

            //#region äº§çº¿äº§èƒ½
            function set_SourceWorkQty() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HMaterNumber = data[0].物料代码;
                    var HMaterName = data[0].物料名称;
                    var HMaterModel = data[0].规格型号;
                    var HProcName = data[0].工序;
                    var HBillInterID = data[0].hmainid;
                    var HBillEntryID = data[0].hsubid;
                    var HSortProcFlag = data[0].排产工序标记;

                    if (HSortProcFlag == "true" || HSortProcFlag == "1" || HSortProcFlag == "是" || HSortProcFlag == true) {
                        layer.open({
                            type: 2
                            , area: ['80%', '80%']
                            , title: '生产资源产能设置'
                            , shade: 0.6 //遮罩透明度
                            //, maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: ['../../计划管理/工艺路线/Gy_RoutingBillWorkQty.html?HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel + '&HProcName=' + HProcName + '&HBillInterID=' + HBillInterID + '&HBillEntryID=' + HBillEntryID, 'yes']
                        })
                    } else {
                        layer.msg('所选工序：' + HProcName + '，不为排产工序！');
                    }
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //#endregion

            //#endregion

            //以上是layui模块