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

yangle

2022-05-18 5e5bef3f5b55a7e052f0d271328b1d670b5f9384

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú×°Ïäµ¥/QK_PackingBill.html

@@ -111,6 +111,13 @@
            form.on('submit(btnPack)', function (data) {
                var flag = "ZZ";
                var sSubStr = table.checkStatus('mainTable');
                if (sSubStr.data.length > 0) {
                    SavePack(flag, sSubStr);
                }
                else {
                    layer.msg('请最少选择1行数据！');
                    return;
                }
                SavePack(flag, sSubStr);
            });
            //拼箱生成
@@ -158,6 +165,7 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', edit: 'text', width: 100, hide: true }
                    , { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HEntryID', title: 'HEntryID', edit: 'text', width: 100, hide: true }
                    , { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterNumber', title: 'HMaterNumber', edit: 'text', width: 100, hide: true }
@@ -221,16 +229,16 @@
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var PrintIds = data.code;
                                PrintIds = PrintIds.substring(0, PrintIds.length - 1);
                                layer.open({
                                    type: 2
                                    , area: ['50%', '50%']
                                    , title: '打印模版选择'
                                    , shade: 0.6 //遮罩透明度
                                    , maxmin: false //允许全屏最小化
                                    , anim: 0 //0-6的动画形式，-1不开启
                                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + PrintIds + '&MyMsg=' + PrintIds + '&Type=HQKPackBill', 'yes']
                                    , resize: false
                                })
                                var Type = "HQKPackBill";
                                var OpenTmp = "";
                                if (sSubStr.data[0].FBZFS == "" && (sSubStr.data[0].FHX != "" || sSubStr.data[0].FMaterName != "")) {
                                    OpenTmp = "花型条码";
                                }
                                else {
                                    OpenTmp = "包装方式条码";
                                }
                                window.open("../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + PrintIds.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                              
                            }
                            else {
                                f_alert(data.Message);