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

yangle

2025-04-24 76824fbc74817dc6a87cef54c2ab18705490356e

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

@@ -80,6 +80,12 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
                                        </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 ForFilteringSchemes" name="HBenchmarkValue" id="HBenchmarkValue">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
@@ -101,7 +107,7 @@
                                    <button class="layui-btn layuiadmin-btn-order" style="" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">重置</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">重置</button>
                                </div>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
@@ -199,6 +205,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <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_Excel"><i class="layui-icon layui-icon-delete"></i>Excel导入</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>
@@ -384,6 +391,9 @@
                    case 'get_export':
                        get_Export();
                        break;
                    //导入
                    case 'set_Excel': set_Excel();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                        break;
@@ -503,6 +513,7 @@
                Get_HProject();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
                $("#HBenchmarkValue").val(localStorage["HBenchmarkValue"])
            }
            //#endregion

@@ -1630,6 +1641,22 @@
            }
            //#endregion

            //导入
            function set_Excel() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '工艺路线列表-导入'
                    , shift: 0//弹出动画
                    , content: '../工艺路线/Gy_RoutingBillimport.html'
                    , end: function () {
                        //刷新页面,
                        get_FastQuery();
                    }
                })
            }

            //#region èŽ·å–导出数据
            function getExportData() {
                var data;//导出的数据
@@ -2033,6 +2060,10 @@
            }
            //#endregion

            $("#HBenchmarkValue").on("input", function (e) {
                localStorage["HBenchmarkValue"] = e.delegateTarget.value;//基准值，用于添康计算约当系数：基准值/小时产能
            });

            //#endregion
            ////隐藏列设置
            //function get_HideColumn() {