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

chenhaozhe

2025-08-20 eaecd04c94c0e8f91b1016dfba2411202cdd90f7

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

@@ -8,11 +8,11 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/MESLanguage.js"></script>
    <style>
        .layui-form-select .layui-input {
@@ -56,7 +56,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织名称</label>
                                    <label class="layui-form-label" style="width: 85px;" id="BT_HOrgName">组织名称</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
                                            <!--动态渲染组织-->
@@ -427,7 +427,7 @@

            function get_Display(sWhere) {
                $.ajax({
                    url: GetWEBURL1() + '/LEMS/MES_ProductionLinePackagingList_Json',
                    url: GetWEBURL() + '/LEMS/MES_ProductionLinePackagingList_Json',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere },
@@ -594,20 +594,18 @@
                }
            });


            //斯莫尔打印
            form.on('submit(Print)', function (obj) {//退出
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
                var linterid = checkStatus.data[0].HInterID;
                ////打开打印模板
                ////var linterid = $("#HInterID").val();
                ////var linterid = "28973";
                var HOrgID = $("#HOrgID").val();
                var Type = "HBarCodePrint";
                var OpenTmp = "白标打印15";
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "|" + HOrgID +  "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
            });

            //打印按钮
            //打印按钮  æ™®è²ç‰¹æ‰“印
            form.on('submit(Print1)', function (obj) {//退出
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
                var linterid = checkStatus.data[0].HInterID;
@@ -760,7 +758,7 @@
                $.ajax({
                    type: "get",
                    async: false,
                    url: GetWEBURlLanguage() + "/Web/GetOrganizations",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -784,7 +782,7 @@
                $.ajax({
                    type: "GET",
                    async: false,
                    url: GetWEBURlLanguage() + "/Xt_User/getOrgIDListByUser", //方法所在页面和方法名       ä¼ å‚ ç»„织必须是列表头部查询的组织  ä¸èƒ½ä½¿ç”¨ç”¨æˆ·é»˜è®¤
                    url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //方法所在页面和方法名       ä¼ å‚ ç»„织必须是列表头部查询的组织  ä¸èƒ½ä½¿ç”¨ç”¨æˆ·é»˜è®¤
                    data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
                    success: function (result) {
                        if (result.count == 1) {