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

wtt

2025-03-03 9cf69741daafee74e41020205ef631cf5ba264bc

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

@@ -21,7 +21,7 @@
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group"  >
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
@@ -185,32 +185,32 @@
                                        </div>
                                    </div>
                                </div>
                           

                                <!--<div class="layui-colla-content">
        <div class="layui-inline">
            <div class="layui-inline">
                <span>其他条件></span>
            </div>
        </div>
        <div class="layui-inline">
            <label class="layui-form-label">产品名称</label>
            <div class="layui-input-block">
                <input type="text" class="layui-input" name="hname" id="hname">
            </div>
        </div>
        <div class="layui-inline">
            <label class="layui-form-label">产品代码</label>
            <div class="layui-input-block">
                <input type="text" class="layui-input" name="hnumber" id="hnumber">
            </div>
        </div>
        <div class="layui-inline">
            <label class="layui-form-label">规格型号</label>
            <div class="layui-input-block">
                <input type="text" class="layui-input" name="hmodel" id="hmodel">
            </div>
        </div>
    </div>-->
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">产品名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="hname" id="hname">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">产品代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="hnumber" id="hnumber">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="hmodel" id="hmodel">
                                        </div>
                                    </div>
                                </div>-->
                            </div>
                        </div>
                        <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
@@ -227,6 +227,9 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
                                    <i class="layui-icon layui-icon-file"></i>删除
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnGX" id="BtnGX">
                                    <i class="layui-icon layui-icon-file"></i>数据更新
                                </button>
                            </div>
                        </script>
@@ -260,7 +263,7 @@
            var option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                ,height: 'full-50' 
                ,height: 'full-50'
                , page: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
@@ -323,7 +326,7 @@
                        if ($("#HInitTimeCycle").val() == 0 && $("#HInitTimeCycle").val() == "") {
                            setSelect_HInitTimeCycle();
                        }
                    

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
@@ -517,7 +520,7 @@
                //标注选中样式
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
            });
 

            //打印
            //form.on('submit(Print)', function (obj) {//退出
            //    var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
@@ -584,13 +587,13 @@
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
                if (checkStatus.data.length == 1) {
                    var HBarCode_Pack = checkStatus.data[0].唯一条码;
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                    layer.open({                //使用 layer的open打开弹出 å±‚
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '白标打印'  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化                       
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../车间管理/产线/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小
@@ -609,7 +612,7 @@
                ////var linterid = $("#HInterID").val();
                ////var linterid = "28973";
                var Type = "HBarCodePrint";
                var OpenTmp = "白标打印1";
                var OpenTmp = "白标打印15";
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
            });
@@ -694,6 +697,33 @@
                    layer.msg('请选择一行数据删除！');
                }
            });


            //更新
            form.on('submit(BtnGX)', function (data) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HRemark = "无";
                    $.ajax({
                        url: GetWEBURL1() + '/LEMS/SaveToSc_PackUnionBillSub_Back',
                        type: "GET",
                        data: { "HInterID": HInterID, "HRemark": HRemark },
                        success: function (data1) {
                            if (data1.count == 1) {
                                layer.msg(data1.Message);
                            } else {
                                layer.alert(data1.code + data1.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口失效!", { icon: 5 });
                        }
                    });
                } else {
                    layer.msg('请选择一行数据更新！');
                }
            });
            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist数组包含与时间相关的整数值
@@ -705,7 +735,7 @@
                }

                $("#HInitTimeCycle").empty();           //使用jquery的empty方法清空HInitTimeCycle_ArrayList <select>元素的值
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //使用append方法构建之前HInitTimeCycle_ArrayList字符串 çš„内容传入HInitTimeCycle  
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //使用append方法构建之前HInitTimeCycle_ArrayList字符串 çš„内容传入HInitTimeCycle
                form.render('select');       //调用 é‡æ–°æ¸²æŸ“select元素

                $("#HInitTimeCycle").val("29");   //使用jQuery的val()方法将下拉列表的选中值设置为"29   ï¼Œä¸”显示《近三時天》