yusijie
2024-06-19 0a5697a2348ce6de49da1f697f2ba41f9bcceac6
条码生成加字段(操作员,班组),选源单添加过滤字段
2个文件已修改
599 ■■■■ 已修改文件
WebTM/views/PublicPage/HSourceReportHtml.html 409 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 190 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/HSourceReportHtml.html
@@ -31,62 +31,91 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">部门</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
                                            <!--动态渲染车间-->
                                        </select>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
        <label class="layui-form-label">部门</label>
        <div class="layui-input-block">
            <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
        </div>
    </div>-->
                                    <label class="layui-form-label">部门</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
                                    </div>
                                </div>-->
                                <div class="layui-inline" id="HProcExchBillNoHidden" style="display:none;">
                                    <label class="layui-form-label">流转卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
                                    </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="PartName" id="PartName" style="width:190px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="PartNumber" id="PartNumber" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" 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">重置</button>
                                <!--显示当前过滤方案-->
                                <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">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <span>其他条件></span>
                                        </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="PartNumber" id="PartNumber" style="width:190px;">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="PartName" id="PartName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <label class="layui-form-label">状态</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                <select name="HBillStatus" id="HBillStatus" lay-verify="" lay-search class="layui-input ForFilteringSchemes">
                                                    <option value="">请选择</option>
                                                    <option value="计划">计划</option>
                                                    <option value="计划确认">计划确认</option>
                                                    <option value="下达">下达</option>
                                                    <option value="开工" selected>开工</option>
                                                    <option value="完工">完工</option>
                                                    <option value="结案">结案</option>
                                                    <option value="结算">结算</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                            <label class="layui-form-label">领料状态</label>
                                            <div class="layui-input-block">
                                                <select name="HPickMtrlStatus" id="HSPickMtrlStatus" lay-verify="" lay-search class="layui-input ForFilteringSchemes">
                                                    <option value="" selected>请选择</option>
                                                    <option value="未领料">未领料</option>
                                                    <option value="部分领料">部分领料</option>
                                                    <option value="全部领料">全部领料</option>
                                                    <option value="超额领料">超额领料</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
@@ -101,7 +130,7 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
@@ -111,6 +140,8 @@
                        <script type="text/html" id="toolbarDemo">
                            <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>
                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
@@ -133,6 +164,7 @@
    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../layuiadmin/PubCustom.js"></script>
    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        //获取参数
        var params = get_UrlVars();
@@ -169,24 +201,28 @@
            //#endregion
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
            //过滤条件的classç±»
            var HClassTag = "ForFilteringSchemes";
            //模块名称(中文版) æ¯ä¸ªæ¨¡å—页面都需要修改
            window.HModuleName = "条码选源单";
            //是否已经选择了过滤方案(全局变量)
            window.HDefaultFilter = "";
            //选择的过滤方案内码(全局变量)
            window.HInterID_Choose = 0;
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化表单插件
            //set_InitFrom();
            //判断操作类型
            if (OperationType == 1) {//无源单
            }
            else if (OperationType == 3) {//有源单
                set_ClearBill(sWhere, HSouceBillType);
            }
            else {
                layer.alert("未知操作类型!", { icon: 5 });
            }
            //获取部门列
            var HDeptName = '<option value="0" style="color:red;" selected>全部部门</option>';
            $.ajax({
                type: "get",
                async: false,
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                data: { "HOrgID": HOrgID },
                success: function (result) {
@@ -205,6 +241,20 @@
                    layer.closeAll("loading");
                }
            })
            //判断操作类型
            if (OperationType == 1) {//无源单
            }
            else if (OperationType == 3) {//有源单
                //get_FastQuery(HSouceBillType);
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
                set_ClearBill(sWhere, HSouceBillType);
            }
            else {
                layer.alert("未知操作类型!", { icon: 5 });
            }
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
@@ -225,6 +275,12 @@
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                    //保存方案
                    case 'set_SaveScheme': set_SaveScheme();
                        break;
                    //读取方案
                    case 'set_ReadScheme': set_ReadScheme();
                        break;
                };
            });
            //#endregion
@@ -241,6 +297,27 @@
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(layTable)', 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:#FDFD7E;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.layTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion
            //#endregion
@@ -412,7 +489,7 @@
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                switch (HSouceBillType) {
                    case '生产订单':
                        if (HBillNo) {
@@ -426,6 +503,12 @@
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        if ($("#HBillStatus").val() != "") {
                            sWhere += " and çŠ¶æ€ = '" + $("#HBillStatus").val() + "'";
                        }
                        if ($("#HSPickMtrlStatus").val() != "") {
                            sWhere += " and é¢†æ–™çŠ¶æ€ = '" + $("#HSPickMtrlStatus").val() + "'";
                        }
                        return sWhere;
                        break;
@@ -673,6 +756,8 @@
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#HBillStatus").val("开工");//状态
                $("#HSPickMtrlStatus").val("");//领料状态
                form.render('select');
                get_FastQuery(HSouceBillType);
                sWhere = "";
@@ -704,12 +789,278 @@
                }
                return vars;
            }
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
            //获取当前用户的默认过滤方案
            function get_DefaultModule() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
                    type: "GET",
                    async: false,
                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
                    success: function (data1) {
                        if (data1.count == 1) {
                            //当前用户设置有默认的过滤方案
                            var data = data1.data;
                            //当前选择的过滤方案
                            HInterID_Choose = data[0].hmainid;
                            //过滤方案内码
                            HInterID = data[0].hmainid
                            //过滤方案名称
                            HDefaultFilter = data[0].方案名称
                            //过滤方案的备注(方案信息描述)
                            var HRemark = data[0].备注
                            //显示出当前的默认过滤方案
                            document.getElementById("HFilterScheme_Now").style.display = "block";
                            document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
                            //把过滤条件值回写到页面上
                            for (let i = 0; i < data.length; i++) {
                                $("#" + data[i].过滤字段ID).val(data[i].过滤值);
                                if (data[i].过滤标签类型 == 'SELECT') {
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }
                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                            //若日期间隔不为 ä»»æ„é—´éš”,则禁用开始日期与结束日期的选择
                            if (HInitTimeCycle != -1) {
                                //$('#HDate').prop('disabled', true);
                                //$('#HDate1').prop('disabled', true);
                                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                                //执行查询方法
                                get_FastQuery(HSouceBillType);
                            } else {
                                //$('#HDate').prop('disabled', false);
                                //$('#HDate1').prop('disabled', false);
                            }
                            //执行查询方法
                            get_FastQuery(HSouceBillType);
                            form.render("select");
                        } else {
                            //当前用户没有设置默认的过滤方案
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery(HSouceBillType);
                            form.render("select");
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //保存方案
            function set_SaveScheme() {
                var index = layer.open()
                //判断用户是否点击了右上角的“叉号”关闭弹窗页面
                var HIsClose_Manual = false;
                //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)
                var Filter = document.getElementsByClassName(HClassTag);
                var HFilterIdList = "";//过滤条件
                var HFilterIdLists = "";//拼接多个过滤条件
                var HValue = "";//过滤值
                var HElement_type = "";//过滤标签类型
                for (var i = 0; i < Filter.length; i++) {
                    HFilterIdList = Filter[i].id; //过滤条件ID
                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)
                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值
                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型
                }
                //去除末尾逗号
                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                HValue = HValue.substring(0, HValue.length - 1);
                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
                //当前页面上没有选择过滤方案,进入新增方法
                if (HDefaultFilter == "") {
                    layer.open({
                        type: 2
                        , area: ['40%', '80%']
                        , title: '过滤方案'
                        , shift: 0//弹出动画
                        , content: '../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
                        , cancel: function () {
                            // å³ä¸Šè§’关闭事件的逻辑
                            HIsClose_Manual = true;
                        }
                        , end: function () {
                            if (HIsClose_Manual != true) {
                                get_FastQuery(HSouceBillType);
                                //显示当前的过滤方案
                                document.getElementById("HFilterScheme_Now").style.display = "block";
                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
                            }
                        }
                    })
                    layer.close(index)
                } else {
                    //当前页面已有过滤方案,用户选择 æ–°å¢žæˆ–者编辑
                    layer.confirm('当前已选择过滤方案,是否修改?请选择对应操作', {
                        title: "操作提示",
                        icon: 0,
                        btn: ['新增方案', '保存修改当前方案', '取消']
                    }, function (index, layero) {
                        //新增
                        layer.open({
                            type: 2
                            , area: ['40%', '80%']
                            , title: '过滤方案'
                            , shift: 0//弹出动画
                            , content: '../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
                            , end: function () {
                                get_FastQuery(HSouceBillType);
                                //显示当前的过滤方案
                                document.getElementById("HFilterScheme_Now").style.display = "block";
                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
                            }
                        })
                        layer.close(index)
                    }, function (index) {
                        //编辑
                        var Filter_Edit = document.getElementsByClassName(HClassTag); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)
                        HFilterIdList = "";
                        HFilterIdLists = "";
                        HValue = "";
                        HElement_type = "";
                        for (var i = 0; i < Filter_Edit.length; i++) {
                            HFilterIdList = Filter_Edit[i].id; //过滤条件ID
                            HFilterIdLists += Filter_Edit[i].id + ","; //过滤条件ID(拼接)
                            HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值
                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型
                        }
                        //去除末尾逗号
                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                        HValue = HValue.substring(0, HValue.length - 1);
                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
                        //修改
                        $.ajax({
                            type: "POST",
                            url: GetWEBURL() + "/Xt_FastICScheme/save", //方法所在页面和方法名
                            async: true,
                            data: { "oMain": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
                                }
                                else {
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {
                            }
                        });
                        layer.close(index)
                    }, function (index) {
                        //取消
                        layer.alert('取消')
                        layer.close(index)
                    });
                }
            }
            //读取方案
            function set_ReadScheme() {
                var HIsClose_Manual = false;
                var Filter = document.getElementsByClassName(HClassTag); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)
                var HFilterIdList = "";
                var HFilterIdLists = "";
                var HValue = "";
                var HElement_type = "";
                for (var i = 0; i < Filter.length; i++) {
                    HFilterIdList = Filter[i].id; //过滤条件ID
                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)
                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值
                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型
                }
                //去除末尾逗号
                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                HValue = HValue.substring(0, HValue.length - 1);
                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '过滤方案列表'
                    , shift: 0//弹出动画
                    , content: '../系统管理/过滤方案设置/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
                    , cancel: function () {
                        // å³ä¸Šè§’关闭事件的逻辑
                        HIsClose_Manual = true;
                    }
                    , end: function () {
                        if (HIsClose_Manual != true) {
                            get_FastQuery(HSouceBillType);
                            form.render("select");
                        }
                    }
                })
            }
            //#endregion
            //#endregion
            //以上是layui模块
        });
        //#region ã€è¿‡æ»¤æ–¹æ¡ˆè¿”回数据】
        function HFilterScheme(obj)  //返回过滤方案
        {
            var HInterID = obj[0].hmainid;
            HInterID_Choose = obj[0].hmainid;
            $.ajax({
                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
                type: "GET",
                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = data1.data;
                        //赋值过滤方案名称
                        HDefaultFilter = data[0].方案名称
                        var HRemark = data[0].备注
                        //显示当前的过滤方案
                        document.getElementById("HFilterScheme_Now").style.display = "block";
                        document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
                        HInterID = data[0].hmainid
                        //根据选择的过滤方案回填数据到列表过滤条件
                        for (let i = 0; i < data.length; i++) {
                            $("#" + data[i].过滤字段ID).val(data[i].过滤值);
                            if (data[i].过滤标签类型 == 'SELECT') {
                                $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                            }
                        }
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion
    </script>
</body>
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html
@@ -213,7 +213,7 @@
            var sWhere = "";
            var sBillType = "3801";
            var HModName = "Gy_BarCodeBill";
            var titleData = ["物料ID", "源单主内码", "源单子内码", "辅助属性ID", "计量单位ID", "客户ID", "HItemID", "hmainid", "hsubid", "HinterID", "车间ID", "供应商ID","HSTOCKORGID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["物料ID", "源单主内码", "源单子内码", "辅助属性ID", "计量单位ID", "客户ID", "HItemID", "hmainid", "hsubid", "HinterID", "车间ID", "供应商ID", "HSTOCKORGID","操作员ID","班组ID"];//不需要显示的字段 å¯æ‰©å±•
            var HMaterID = "";
            var HBatchNo = "";
@@ -223,7 +223,7 @@
            var HMaterInfo = "";  //存储物料信息
            var HBarInfo = ""; //存储条码信息
            var HFileList = "";  //存储档案列表
            //#endregion
            //#endregion
            //监听当前处于哪一个页签,传 HModName å€¼
            element.on('tab(tab-TabTest)', function (data) {
@@ -236,7 +236,7 @@
                    table.reload('mainTable', {
                        data: HMaterInfo // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });
                } else if (cur_title == "条码信息") {
                    HModName = "Gy_BarCodeBill_1";
                    //刷新表格数据
@@ -251,7 +251,7 @@
                    //加载档案列表
                    table.reload('mainTable2', {
                        data: HFileList // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });
                    });
                }
            })
@@ -263,11 +263,11 @@
            //加载工厂代码数据
            set_HWorksNumber();
            //加载条码类型数据
            set_HBarCodeType();
            set_HBarCodeType();
            var rowdata = [{
                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
            }];
            //初始化表格
            set_InitGrid();
@@ -288,19 +288,19 @@
            else {
                layer.alert("未知操作类型!", { icon: 5 });
            }
            //#endregion
            //#endregion
            //#region ç‚¹å‡»äº‹ä»¶ï¼ŒåŒ…括on和form事件
            //头工具栏
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var AddRow = table.cache['mainTable'];
                var NewRow = {
                    "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
                };
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
                };
                //console.log(NewRow);
                switch (obj.event) {
                    //新增一行
@@ -398,8 +398,7 @@
                                HBQty: 0,                                      //箱数=数量/最小包装数量
                            });
                        }
                        else
                        {
                        else {
                            //同步更新表格和缓存对应的值
                            obj.update({
                                HQty: value,                                   //数量
@@ -411,7 +410,7 @@
                        value = isNaN(value) ? 0 : value;
                        HMinQty2 = value;   //给批次按钮功能中的最小包装数赋值
                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
                        if (HQty == 0) //除数为0
                        if (HQty == 0) //除数为0
                        {
                            //同步更新表格和缓存对应的值
                            obj.update({
@@ -426,7 +425,7 @@
                                HBQty: Math.ceil(HQty / value),                //箱数=数量/最小包装数量
                            });
                        }
                        break;
                    default:
                }
@@ -490,7 +489,7 @@
                    title: '' + getSupType() + '列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['95%', '80%'],
                    area: ['95%', '95%'],
                    maxmin: true,
                    content: [url, 'yes'],
                    btn: ['确定', '取消']
@@ -533,16 +532,17 @@
                                    HBatchNo = result.list[0].HBatchNo;
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        for (let i = 0; i < result.list.length; i++) {
                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0]  //保留小数点后六位小数
                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0]  //保留小数点后六位小数
                                            if (result.list[i].HMinQty != 0) {
                                                result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
                                            }
                                                result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
                                            }
                                        }
                                        BatchNoArray = result.list;  //获取批号,用来给批次按钮功能中的批号赋值
                                        //for (let i = 0; i < result.list.length; i++) {
                                        //    result.list[i].HMinQty = '';//点击单元格的时候默认值0不会清除,客户看了会觉得很怪,所以先用空字符串取代;
                                        //}
                                        console.log(result.list[0]);
                                        table.reload('mainTable', {
                                            data: result.list // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                                        });
@@ -600,8 +600,7 @@
                var HOrgType = $("#HOrgID").find("option:selected").html();
                //获取选择的工厂代码
                var CampanyName = $("#HWorksNumber").find("option:selected").html();
                if (CampanyName == "" || CampanyName == null)
                {
                if (CampanyName == "" || CampanyName == null) {
                    CampanyName = "xxx";
                }
                //获取选择的源单类型
@@ -617,7 +616,7 @@
            //重置
            form.on('submit(ToolReset)', function (data) {
                layer.confirm('确定要清空当前界面信息,重置界面?',{
                layer.confirm('确定要清空当前界面信息,重置界面?', {
                    btn: ['确定', '取消'],
                    title: "提示",
                    icon: 3,
@@ -627,7 +626,7 @@
                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //单据日期
                    $("#HSourceBillType").val('1'); //选择下拉框默认第一个选项
                    $("#HBarCodeType").val('0');
                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0,HEmpNumber:'', HEmpName: '', HGroupID: 0,HGroupNumber:'', HGroupName: ''}]
                    table.reload('mainTable', {
                        data: arr // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });
@@ -635,6 +634,7 @@
                        "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                        , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                        , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
                    }]
                    table.reload('mainTable1', {
                        data: arr1 // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
@@ -646,7 +646,7 @@
                    table.reload('mainTable2', {
                        data: [] // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });
                        layer.close(index)
                    layer.close(index)
                })
            })
@@ -670,7 +670,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].物料代码, HMaterName: checkStatus.data[0].物料名称, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].计量单位代码, HUnitName: checkStatus.data[0].计量单位, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].数量.toString("#0.00"), HMinQty: checkStatus.data[0].最小包装数, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].物料代码, HMaterName: checkStatus.data[0].物料名称, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].计量单位代码, HUnitName: checkStatus.data[0].计量单位, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].数量.toString("#0.00"), HMinQty: checkStatus.data[0].最小包装数, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0,HEmpNumber:'', HEmpName: '', HGroupID: 0,HGroupNumber:'', HGroupName: '' }]
                        //同步更新表格和缓存对应的值
                        table.reload('mainTable', {
                            data: arr // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
@@ -696,7 +696,7 @@
                    success: function (data1) {
                        if (data1.code == 1) {
                            layer.alert(data1.Message)
                        }
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert(data1.Message, { icon: 5 });
@@ -826,22 +826,28 @@
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 75 }
                    , { field: 'HMainID', title: '源单主内码',  width: 100, hide: true }
                    , { field: 'HSubID', title: '源单子内码',  width: 100, hide: true }
                    , { field: 'HMainID', title: '源单主内码', width: 100, hide: true }
                    , { field: 'HSubID', title: '源单子内码', width: 100, hide: true }
                    , { field: 'HBillNo', title: '源单单号', width: 200 }
                    , { field: 'HMaterID', title: '物料ID',  width: 100, hide: true }
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                    , { field: 'HMaterNumber', title: '物料代码', edit: 'text', event: 'HMaterNumber', width: 200 }
                    , { field: 'HMaterName', title: '物料名称',  width: 200 }
                    , { field: 'HMaterName', title: '物料名称', width: 200 }
                    , { field: 'HMaterModel', title: '规格型号', width: 200 }
                    , { field: 'HEmpID', title: '操作员ID', width: 100, hide: true }
                    , { field: 'HEmpNumber', title: '操作员代码', edit: 'text', width: 200, event: 'HEmpNumber'}
                    , { field: 'HEmpName', title: '操作员', width: 200 }
                    , { field: 'HGroupID', title: '班组ID', width: 100, hide: true }
                    , { field: 'HGroupNumber', title: '班组代码', edit: 'text', width: 200, event: 'HGroupNumber' }
                    , { field: 'HGroupName', title: '班组名称', width: 200 }
                    , { field: 'HBatchNo', title: '批号', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '数量', edit: 'text', width: 100, totalRow: true}
                    , { field: 'HQty', title: '数量', edit: 'text', width: 100, totalRow: true }
                    , { field: 'HMinQty', title: '最小包装数', edit: 'text', totalRow: true, width: 100 }
                    , { field: 'HBQty', title: '箱数', width: 100, totalRow: true }
                    , { field: 'HPackQty', title: '外箱数', edit: 'text', width: 100, totalRow: true}
                    , { field: 'HPackQty', title: '外箱数', edit: 'text', width: 100, totalRow: true }
                    , { field: 'HCoilNO', title: '钢卷捆包号', edit: 'text', width: 100 }
                    , { field: 'HFurnaceNO', title: '炉号', edit: 'text', width: 100 }
                    , { field: 'HFactory', title: '厂商', edit: 'text', width: 100 }
                    , { field: 'HCusID', title: '客户ID',  width: 100, hide: true }
                    , { field: 'HCusID', title: '客户ID', width: 100, hide: true }
                    , { field: 'HCusNumber', title: '客户代码', edit: 'text', event: 'HCusNumber', width: 120 }
                    , { field: 'HCusName', title: '客户名称', width: 120 }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', width: 200 }
@@ -849,16 +855,16 @@
                    , { field: 'HProduceDate', title: '生产日期', event: 'HProduceDate', width: 100 }
                    , { field: 'HExpiryDate', title: '保质期至', event: 'HExpiryDate', width: 100 }
                    , { field: 'HheatNO', title: '热处理', edit: 'text', width: 100 }
                    , { field: 'HAuxPropID', title: '辅助属性ID',  width: 100, hide: true }
                    , { field: 'HAuxPropID', title: '辅助属性ID', width: 100, hide: true }
                    , { field: 'HAuxPropNumber', title: '辅助属性代码', edit: 'text', event: 'HAuxPropNumber', width: 100 }
                    , { field: 'HAuxPropName', title: '辅助属性名称',  width: 100 }
                    , { field: 'HAuxPropName', title: '辅助属性名称', width: 100 }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
                    , { field: 'HUnitNumber', title: '计量单位代码', edit: 'text', event: 'HUnitNumber', width: 100 }
                    , { field: 'HUnitName', title: '计量单位',width: 100 }
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HAuxQty', title: '辅单位数量', edit: 'text', width: 100, totalRow: true }
                    , { field: 'HExpirationDateFlag', title: '是否启用保质期', width: 100, templet: '#switchTp3', unresize: false }
                    , { field: 'HGiveAwayFlag', title: '是否赠品', width: 100, templet: '#switchTpl', unresize: false }
                    , { field: 'HDate', title: '进料日期',  width: 100 }
                    , { field: 'HDate', title: '进料日期', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ];
                option = {
@@ -875,7 +881,7 @@
                    }
                };
                option.data = rowdata;
                table.render(option);
                table.render(option);
            }
            //初始条码信息表格
            function set_CountGrid() {
@@ -906,7 +912,7 @@
                option1 = {
                    id: 'mainTable1'
                    , elem: '#mainTable1'
                    , toolbar: '#toolbarDemo1'
                    , toolbar: '#toolbarDemo1'
                    , page: false
                    , limit: 500
                    , cellMinWidth: 120
@@ -975,7 +981,7 @@
                option2 = {
                    id: 'mainTable2'
                    , elem: '#mainTable2'
                    , toolbar: '#toolbarDemo2'
                    , toolbar: '#toolbarDemo2'
                    , page: false
                    , limit: 500
                    , cellMinWidth: 120
@@ -992,7 +998,7 @@
                    , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
                    , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
                    , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
                }];
                table.render(option);
                //刷新表格数据
@@ -1006,7 +1012,7 @@
                    "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                    , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                    , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
                    , "HExpirationDateFlag": 0
                    , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
                }];
                table.render(option1);
                //刷新表格数据
@@ -1092,7 +1098,7 @@
                        colName += option2.cols[0][i]["title"] + ",";
                    }
                }
                var contentUrl = "";
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
@@ -1142,12 +1148,14 @@
                            var dataCol = [];//数据库查询出的列数据
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
@@ -1408,8 +1416,8 @@
            function set_GridCellCheck(obj) {
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        //模具信息  å¦‚果在模具代码列 æŒ‰F7
                        if (obj.event === 'HMaterNumber')  //模具信息  å¦‚果在模具代码列 æŒ‰F7
                        //物料信息  å¦‚果在物料代码列 æŒ‰F7
                        if (obj.event === 'HMaterNumber')  //物料信息  å¦‚果在模具代码列 æŒ‰F7
                        {
                            //页面层-自定义  //F7选择模具
                            layer.open({
@@ -1583,6 +1591,88 @@
                                }
                            });
                        }
                        //操作员代码
                        if (obj.event === 'HEmpNumber')  //操作员代码
                        {
                            //页面层-自定义
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '操作员列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HEmpID: checkStatus.data[0].HItemID,
                                        HEmpNumber: checkStatus.data[0].职员代码,
                                        HEmpName: checkStatus.data[0].职员名称,
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) {
                                    //按钮【按钮二】的回调
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {
                                }
                            });
                        }
                        //班组代码
                        if (obj.event === 'HGroupNumber')  //班组代码
                        {
                            //页面层-自定义
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '班组列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../基础资料/工资基础资料/Gy_Group.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
                                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        HGroupID: checkStatus.data[0].HItemID,
                                        HGroupNumber: checkStatus.data[0].班组代码,
                                        HGroupName: checkStatus.data[0].班组名称,
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) {
                                    //按钮【按钮二】的回调
                                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                                },
                                end: function () {
                                }
                            });
                        }
                        obj.event = "";
                        return false;
                    }
@@ -1610,12 +1700,12 @@
                                });
                                HBarInfo = result.list;
                                //生成成功跳转到条码信息标签页
                                element.tabChange('tab-TabTest', '3');
                                element.tabChange('tab-TabTest', '3');
                                //加载档案列表
                                table.reload('mainTable2', {
                                    data: result.data // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                                });
                                HFileList = result.data;
                                HFileList = result.data;
                            }
                            else {
                                $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//生成按钮启用
@@ -1635,7 +1725,7 @@
                    , dataArr = checkStatus.data;
                //由于条码信息列表中没有 HItemID å­—段,所以采取了用 æ¡ç ç¼–号 åŽ»èŽ·å– HItemID çš„æ–¹å¼
                if (checkStatus.data.length>0) {
                if (checkStatus.data.length > 0) {
                    var rows = [];
                    for (var i = 0; i < dataArr.length; i++) {
                        rows.push(dataArr[i].HItemID.toString());