hwh
2024-06-12 cae008d8286b7ee846eb91e79350a9c57166882d
打印
7个文件已修改
178 ■■■■■ 已修改文件
HTML_09/js/hiprint/plugins/print-data-list.js 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML_09/js/public.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML_09/views/ASNSetting/ArrivalNotice.html 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML_09/views/SOSetting/ExportNotice.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML_09/views/SystemSettings/PrintModule.html 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML_09/views/SystemSettings/PrintSetting.html 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML_09/views/SystemSettings/PrintTemplateFrom.html 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML_09/js/hiprint/plugins/print-data-list.js
@@ -556,19 +556,6 @@
                },
                {
                    "type": "text",
                    "title": "生产日期",
                    "field": "ProductionDate",
                    "tid": "configModule.ProductionDate",
                    "editable": true,
                    "columndisplayeditable": true,
                    "columndisplayindexeditable": true,
                    "columntitleeditable": true,
                    "columnresizable": true,
                    "columnaligneditable": true,
                    "columns": null
                },
                {
                    "type": "text",
                    "title": "总件数",
                    "field": "Count",
                    "tid": "configModule.Count",
@@ -595,7 +582,7 @@
                },
                {
                    "type": "text",
                    "title": "整件数",
                    "title": "零头数量",
                    "field": "ZeroCount",
                    "tid": "configModule.ZeroCount",
                    "editable": true,
@@ -650,19 +637,6 @@
                    "title": "请验时间",
                    "field": "QTTime",
                    "tid": "configModule.QTTime",
                    "editable": true,
                    "columndisplayeditable": true,
                    "columndisplayindexeditable": true,
                    "columntitleeditable": true,
                    "columnresizable": true,
                    "columnaligneditable": true,
                    "columns": null
                },
                {
                    "type": "text",
                    "title": "请验部门",
                    "field": "QTDepartment",
                    "tid": "configModule.QTDepartment",
                    "editable": true,
                    "columndisplayeditable": true,
                    "columndisplayindexeditable": true,
HTML_09/js/public.js
@@ -284,10 +284,11 @@
//调用打印
function openPrintDialog(printData){
function openPrintDialog(printData, printType){
  layer.open({
    type: 2,
    title: '打印',
    // content: '../../js/hiprint/custom.html',
    content: '/views/SystemSettings/PrintModule.html',
    maxmin: true,
    area: ['100%', '100%'],
@@ -295,6 +296,7 @@
    success: function (layero, index) {
      var body = layer.getChildFrame('body',index);
      body.find('#printData').val(JSON.stringify(printData));
      body.find('#printType').val(printType);
    }
  });
}
HTML_09/views/ASNSetting/ArrivalNotice.html
@@ -17,13 +17,16 @@
            height: auto;
            line-height: 23px;
        }
        .layui-table-tool-panel{
            top: auto;
            bottom: 29px;
        }
        .layui-table-tool{
            padding-left: 5px;
        }
        /* 表格下拉小箭头隐藏 */
        .layui-table-grid-down {
            display: none;
@@ -49,8 +52,8 @@
                    <div class="layui-inline">
                        <label class="layui-form-label">入库单号</label>
                        <div class="layui-input-inline">
                            <input type="text" id="ASNNo" name="ASNNo" placeholder="入库单号"
                                autocomplete="off" class="layui-input">
                            <input type="text" id="ASNNo" name="ASNNo" placeholder="入库单号" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -104,8 +107,8 @@
                    <div class="layui-inline">
                        <label class="layui-form-label">客户名称</label>
                        <div class="layui-input-inline">
                            <input type="text" id="CustomerName" name="CustomerName" placeholder="客户名称" autocomplete="off"
                            class="layui-input">
                            <input type="text" id="CustomerName" name="CustomerName" placeholder="客户名称"
                                autocomplete="off" class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -140,7 +143,8 @@
                    <div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
                        <label class="layui-form-label">备注</label>
                        <div class="layui-input-inline" style="width: 300px;height: 100%;">
                            <textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo" class="layui-textarea"></textarea>
                            <textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo"
                                class="layui-textarea"></textarea>
                        </div>
                    </div>
                </div>
@@ -183,6 +187,8 @@
                                default : 
                                break; 
                            }
                            html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Print">
                                <i class="layui-icon layui-icon-print"></i>打印</a>`;
                            html += `<a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
                                <i class="layui-icon layui-icon-edit"></i>备注</a>`;
                            return html;
@@ -276,6 +282,8 @@
                                    html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del"> 
                                        <i class="layui-icon layui-icon-delete"></i>删除</a>`; 
                                }
                                html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Print">
                                    <i class="layui-icon layui-icon-print"></i>打印</a>`;
                                return html;
                            } 
                        }}
@@ -842,8 +850,7 @@
                //#endregion
            }
            function setRight()
            {
            function setRight() {
                $(function() {
                    $(".addClass").hide();
                    $(".editClass").hide();
@@ -917,8 +924,7 @@
            var ImportId = 0;
            table.on('tool(LAY-app-content-list)', function (obj) {
                var data = obj.data;
                switch(obj.event)
                {
                switch (obj.event) {
                    case "edit" :
                        // 代码区域
                        var id = data.ASNNo;
@@ -1068,14 +1074,32 @@
                            }
                        }); 
                        break;
                    case "Print":
                        console.log(data);
                        var param = {
                            limit: 1000,
                            page: 1,
                            ASNNo: data.ASNNo
                        };
                        sendData(IP + "/BllAsn/GetArrivalNoticeDetailList", param, 'post', function (res) {
                            if (res.code == 0) { //成功
                                data.ArrivalNoticeDetail = res.data;
                                openPrintDialog(data, 'ArrivalNotice');
                            } else { //不成功
                                layer.msg(res.msg, {
                                    icon: 2,
                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }, function () { doing = true });
                            }
                        });
                        break;
                    default:break;
                }
            });
            //明细表操作栏事件
            table.on('tool(LAY-app-content-list2)', function (obj) {
                var data = obj.data;
                switch(obj.event)
                {
                switch (obj.event) {
                    case "del" :
                        layer.confirm('确定删除入库单明细吗?', function(index) {     
                            // 代码区域
@@ -1103,6 +1127,10 @@
                        });    
                        break;
                    case "Print":
                        console.log(data);
                        openPrintDialog(data, 'MaterialLabel');
                        break;
                    default:break;
                }
            });
HTML_09/views/SOSetting/ExportNotice.html
@@ -313,6 +313,8 @@
                                html += `<a class="layui-btn layui-btn-normal layui-btn-xs shangClass" lay-event="xml"> 
                                    <i class="layui-icon layui-icon-ok"></i>XML
                                </a>`;
                                html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Print">
                                    <i class="layui-icon layui-icon-print"></i>打印</a>`;
                                html += `<a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
                                    <i class="layui-icon layui-icon-edit"></i>备注</a>`;
                                return html;
@@ -1283,6 +1285,25 @@
                            }
                        }); 
                    }
                    else if(obj.event === 'Print'){
                        console.log(data);
                        var param = {
                            limit: 1000,
                            page: 1,
                            SONo: data.SONo
                        };
                        sendData(IP + "/BllSo/GetExportNoticeDetailList", param, 'post', function (res) {
                            if (res.code == 0) { //成功
                                data.ExportNoticeDetail = res.data;
                                openPrintDialog(data, 'ExportNotice');
                            } else { //不成功
                                layer.msg(res.msg, {
                                    icon: 2,
                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }, function () { doing = true });
                            }
                        });
                    }
                });
                
                table.on('tool(LAY-app-content-list2)', function(obj) {
HTML_09/views/SystemSettings/PrintModule.html
@@ -11,6 +11,7 @@
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" type="text/css" href="../../js/HiPrint/css/hiprint.css?t=' + Math.random() + '" />
    <link rel="stylesheet" type="text/css" href="../../js/HiPrint/css/print-lock.css" />
    <link rel="stylesheet" media="print" href="../../js/HiPrint/css/print-lock.css" />
    <!-- <link rel="stylesheet" type="text/css" href="../../js/HiPrint/css/bootstrap.min.css" > -->
    <style>
        .layui-form-label {
@@ -27,6 +28,7 @@
<body>
    <div class="layui-card">
        <input type="hidden" id="printData" name="printData">
        <input type="hidden" id="printType" name="printType">
        <div class="row">
            <!--左侧div-->
@@ -74,33 +76,43 @@
    <script src="../../js/jquery-3.5.1.min.js"></script>
    <script src="../../js/jquery.cookie.js"></script>
    <script src="../../js/hiprint/content/bootstrap.min.js"></script>
    <script src="../../js/HiPrint/hiprint.bundle.js?t=' + Math.random() + '"></script>
    <script src="../../js/HiPrint/polyfill.min.js"></script>
    <script src="../../js/HiPrint/plugins/jquery.minicolors.min.js"></script>
    <script src="../../js/HiPrint/plugins/JsBarcode.all.min.js"></script>
    <script src="../../js/HiPrint/plugins/qrcode.js"></script>
    <script src="../../js/HiPrint/hiprint.bundle.js"></script>
    <script src="../../js/HiPrint/plugins/jquery.hiwprint.js"></script>
    <script src="../../js/HiPrint/plugins/socket.io.js"></script>
    <!-- <script src="../../js/HiPrint/plugins/socket.io.js"></script> -->
    <script src="../../js/HiPrint/plugins/config-etype-provider.js"></script>
    <script src="../../js/HiPrint/plugins/jspdf/canvas2image.js"></script>
    <script src="../../js/HiPrint/plugins/jspdf/canvg.min.js"></script>
    <script src="../../js/HiPrint/plugins/jspdf/html2canvas.min.js"></script>
    <script src="../../js/HiPrint/plugins/jspdf/jspdf.min.js"></script>
    <script src="../../js/HiPrint/plugins/print-data-list.js"></script>
    <script src="../../js/HiPrint/hiprint.config.js"></script>
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../js/public.js"></script>
    <script>
        var configPrintJson;
        var datalist = [];
        //初始化打印插件渲染
        $(".hiprintEpContainer").html(""); //清除div内容
        var hiprintTemplate;
        // var JsonData = JSON.parse('{"panels":[{"index":0,"height":50,"width":50,"paperHeader":0,"paperFooter":141.73228346456693,"printElements":[{"tid":"configModule.SkuName","options":{"left":9,"top":12,"height":9.75,"width":120}},{"tid":"configModule.SkuNo","options":{"left":9,"top":37.5,"height":78,"width":120,"textType":"qrcode"}}],"paperNumberLeft":178.5,"paperNumberTop":123}]}')
        var JsonData = {};
        setTimeout(function () {
            var printType = $("#printType").val();
            datalist = getPrintDataList()(printType);
            synData(IP + "/sys/GetDefaultPrintTemplate?Type=" + printType, {}, 'get', function (res) {
                if (res.code == 0) { //成功
        hiprint.init({
            providers: [new configElementTypeProvider()]
        });
        //设置左侧拖拽事件
        hiprint.PrintElementTypeManager.build('.hiprintEpContainer', 'testModule');
        var hiprintTemplate;
        // var JsonData = JSON.parse('{"panels":[{"index":0,"height":50,"width":50,"paperHeader":0,"paperFooter":141.73228346456693,"printElements":[{"tid":"configModule.SkuName","options":{"left":9,"top":12,"height":9.75,"width":120}},{"tid":"configModule.SkuNo","options":{"left":9,"top":37.5,"height":78,"width":120,"textType":"qrcode"}}],"paperNumberLeft":178.5,"paperNumberTop":123}]}')
        var JsonData = {};
        synData(IP + "/sys/GetDefaultPrintTemplate", {}, 'get', function (res) {
            if (res.code == 0) { //成功
                JsonData = JSON.parse(res.data.PositionJson);
                $("#customWidth").val(JsonData.panels[0].width);
                $("#customHeight").val(JsonData.panels[0].height);
@@ -114,13 +126,11 @@
                hiprintTemplate.design('#hiprint-printTemplate');
                //打印
                setTimeout(function () {
                    //这里获取上级页面的printData数据打印
                    // var printData = deepClone(parent.printData);
                    var printData = JSON.parse($("#printData").val());
                    hiprintTemplate.print(printData,'打印');
                    parent.layer.closeAll();
                }, 100);
            }
            else //不成功
            {
@@ -130,13 +140,13 @@
                }, function () { parent.layer.closeAll(); });
            }
        });
        }, 100);
        $('#directPrint').click(function () {
            hiprintTemplate.print(printData);
        });
        var datalist = [];
    </script>
</body>
HTML_09/views/SystemSettings/PrintSetting.html
@@ -364,20 +364,19 @@
            });
            // //测试打印
            // printData = [{
            //     SkuNo: '000001',
            //     SkuName: '测试物料1',
            //     Standard: 'xxxxxx',
            //     LotNo: '20230801',
            //     Qty: 100
            // }, {
            //     SkuNo: '000002',
            //     SkuName: '测试物料2',
            //     Standard: 'xxxxxx',
            //     LotNo: '20230801',
            //     Qty: 100
            // }];
            // openPrintDialog(printData)
            // printData = {
            //     Id: 4052,
            //     ASNNo: "ASN2024052800005",
            //     ArrivalNoticeDetail: [
            //         { SkuNo: '000001' }
            //     ],
            //     // workExperience: [
            //     //     { position: '数据分析师', company: '某宝', address: '北京', date: '四月-2010-八月-2011', work: '专题分析/模型,根据业务分析分析各类专题,例如:商品等级,会员消费行为营销活动,重要产品数据等。' },
            //     //     { position: '数据分析师', company: '某东', address: '北京', date: '九月-2011-三月-2016', work: '数据指标监控,根据产品,运营以及管理的需求,针对产品数据,运营,业务进展及KPI指标的监控,经营分析,对口BU的经营报告,分析KPI进度,交易产品异动原因,分析市场动态,汇报对象为BU经理。' },
            //     //     { position: '数据产品经理', company: '大米', address: '北京', date: '四月-2016-至今', work: '负责具体分析项目,例如实时监控,数据后台管理,协调开发资源,控制项目进度。' }
            //     // ],
            // };
            // openPrintDialog(printData, 'ArrivalNotice');
        });
    </script>
</body>
HTML_09/views/SystemSettings/PrintTemplateFrom.html
@@ -73,7 +73,7 @@
                <!--打印部分-->
                <div class="layui-col-xs8" style="overflow: hidden;outline: none;">
                    <!--打印头部分-->
                    <div class="hiprint-toolbar" style="margin-top:15px;">
                    <div class="hiprint-toolbar" style="margin-top:15px;margin-left:10px;">
                        <ul>
                            <!-- <li><a class="hiprint-tizee-btn" onclick="setPaper('A3')">A3</a></li> -->
                            <li><a class="hiprint-tizee-btn" onclick="setPaper('A4')">A4</a></li>
@@ -109,8 +109,10 @@
                        <div style="clear:both;"></div>
                    </div>
                    <!--打印主体部分-->
                    <div style="overflow-x: scroll; overflow-y: hidden;">
                    <div id="hiprint-printTemplate" class="hiprint-printTemplate"
                        style="margin-top:20px; overflow-x: scroll; overflow-y: hidden;">
                            style="margin-top:20px;margin-left:20px;">
                        </div>
                    </div>
                    <textarea class="form-control" rows="10" id="A4_textarea_json" style="display: none;"></textarea>
                </div>
@@ -242,7 +244,9 @@
        //初始化打印插件渲染
        // $(".hiprintEpContainer").html(""); //清除div内容
        if (parent.objRowsData.Type) {
            datalist = getPrintDataList()(parent.objRowsData.Type);
        }
        hiprint.init({
            providers: [new configElementTypeProvider()]
        });
@@ -251,8 +255,8 @@
            'testModule');
        let hiprintTemplate;
        if (window.parent.objRowsData.PositionJson)
            var JsonData = JSON.parse(window.parent.objRowsData.PositionJson)
        if (parent.objRowsData.PositionJson)
            var JsonData = JSON.parse(parent.objRowsData.PositionJson)
        if (JsonData) {
            $("#customWidth").val(JsonData.panels[0].width);
            $("#customHeight").val(JsonData.panels[0].height);