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

yangle

2023-10-16 be8b558b89a89deb3aa871fc2ddaacb7fb2197bd

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -218,26 +218,39 @@
            var HBatchNo = "";
            var BatchNoArray; //用来存储获取到的批号，在批次按钮功能中用到
            var HMinQty2 = 0; //用来存储输入的最小包装数，在批次按钮功能中用到

            var HMaterInfo = "";  //存储物料信息
            var HBarInfo = ""; //存储条码信息
            var HFileList = "";  //存储档案列表
            //#endregion           

            //监听当前处于哪一个页签，传 HModName å€¼
            element.on('tab(tab-TabTest)', function (data) {
                HMaterInfo = table.cache['mainTable'];
                var cur_title = data.elem.context.innerText;
                if (cur_title == "物料信息") {
                    HModName = "Gy_BarCodeBill";
                    //刷新表格数据
                    DisPlay_HideColumn();
                    table.reload('mainTable', {
                        data: HMaterInfo // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });
                    
                } else if (cur_title == "条码信息") {
                    HModName = "Gy_BarCodeBill_1";
                    //刷新表格数据
                    DisPlay_HideColumn1();
                    
                    table.reload('mainTable1', {
                        data: HBarInfo // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });
                } else if (cur_title == "档案列表") {
                    HModName = "Gy_BarCodeBill_2";
                    //刷新表格数据
                    DisPlay_HideColumn2();
                    
                    //加载档案列表
                    table.reload('mainTable2', {
                        data: HFileList // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });    
                }
            })

@@ -464,7 +477,7 @@
                //获取组织ID
                var SetHOrgID = $("#HOrgID").find("option:selected").val();
                //页面层-自定义
                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&linterid=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&HOrgID=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
                url = encodeURI(url);
                //alert(url);
                layer.open({
@@ -572,6 +585,7 @@
            form.on('submit(ToolCreate)', function (data) {
                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//生成按钮禁用
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                HMaterInfo = table.cache['mainTable'];
                //物料明细信息不为空判断
                if (!AllowLoadData(sSubStr))//数据验证
                {
@@ -591,8 +605,8 @@
                //获取选择的条码类型
                var HSelectBarCodeType = $("#HBarCodeType").find("option:selected").html();
                //获取当前登录人员
                //var UserName = sessionStorage["HUserName"];
                var UserName = "Admin";
                var UserName = sessionStorage["HUserName"];
                //var UserName = "Admin";
                var sMainSub = sSubStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName;
                SaveBarCodeCreate(sMainSub);
            })
@@ -1401,7 +1415,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../Baseset/基础资料/Gy_MaterialList_LSQP.html', 'yes'],
                                content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -1423,6 +1437,13 @@
                                        HUnitName: checkStatus.data[0].HUnitName
                                    });

                                    if ($("#HBarCodeType").find("option:selected").html() == '托盘条码') {
                                        obj.update({
                                            HQty: 1,    //数量
                                            HMinQty: 1, //最小包装数量
                                            HBQty: 1    //箱数
                                        });
                                    }
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                }
                                , btn2: function (index, layero) {
@@ -1582,12 +1603,14 @@
                                table.reload('mainTable1', {
                                    data: result.list // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                                });
                                HBarInfo = result.list;
                                //生成成功跳转到条码信息标签页
                                element.tabChange('tab-TabTest', '3'); 
                                //加载档案列表
                                table.reload('mainTable2', {
                                    data: result.data // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                                });                               
                                });
                                HFileList = result.data; 
                            }
                            else {
                                $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//生成按钮启用