#
luxiaotao1123
2020-07-01 e2d1545d46f3ed1c98a80d74561a31369901d632
#
2个文件已修改
63 ■■■■■ 已修改文件
src/main/java/com/zy/common/utils/QrCode.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/matCode/matCode.html 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/utils/QrCode.java
@@ -20,7 +20,7 @@
    private static final String CHARSET = "utf-8";
    private static final String FORMAT_NAME = "JPG";
    // 二维码尺寸
    private static final int QRCODE_SIZE = 100;
    private static final int QRCODE_SIZE = 150;
    public static BufferedImage createImg(String content) throws WriterException {
        ConcurrentHashMap hints = new ConcurrentHashMap();
src/main/webapp/views/matCode/matCode.html
@@ -201,33 +201,23 @@
                <!-- 预览图 3 -->
                <div id="template-preview-3" class="template-preview" style="display: none">
                    <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
                        <tr>
                            <td align="center" scope="col" width="50%" colspan="3">物料编码</td>
                            <td align="center" scope="col" width="50%" colspan="3">xxxxxx-xx/xx</td>
                        </tr>
                        <tr>
                            <td align="center" colspan="3">物料名称</td>
                            <td align="center" colspan="3">xxxxxxx</td>
                        </tr>
                        <tr>
                            <td align="center" width="50%" rowspan="1" colspan="3">物料规格</td>
                            <td align="center" width="50%" colspan="3" rowspan="4">
                                <img class="template-code template-qrcode" src="">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 74px">
                            <td align="center" scope="col" colspan="1">物料名称</td>
                            <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
                            <td align="center" scope="col" colspan="2" rowspan="2">
                                <img class="template-code template-qrcode" src="" width="80%">
                                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
                                    <span>xxxxxx</span>
                                </div>
                            </td>
                        </tr>
                        <tr>
                            <td align="center" colspan="3" rowspan="1">xxxxxx</td>
                        </tr>
                        <tr>
                            <td align="center" colspan="3" rowspan="1">物料单位</td>
                        </tr>
                        <tr>
                            <td align="center" colspan="3" rowspan="1">xxxxxxxx</td>
                        <tr style="height: 74px">
                            <td align="center" colspan="1">物料单位</td>
                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
                        </tr>
                    </table>
                </div>
            </div>
        </fieldset>
@@ -292,23 +282,20 @@
<!-- 模板3 -->
<script type="text/template" id="templatePreview3" class="template-qrcode">
    {{#each data}}
    <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <tr>
            <td align="center" scope="col" width="50%" colspan="3">物料编码</td>
            <td align="center" scope="col" width="50%" colspan="3">{{this.matNo}}</td>
        </tr>
        <tr>
            <td align="center" colspan="3">物料名称</td>
            <td align="center" colspan="3">{{this.matName}}</td>
        </tr>
        <tr>
            <td align="center" width="50%" rowspan="1" colspan="3">物料单位</td>
            <td align="center" width="50%" colspan="3" rowspan="4">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}">
    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <tr style="height: 74px">
            <td align="center" scope="col" colspan="1">物料名称</td>
            <td align="center" scope="col" colspan="1" style="">{{this.matName}}</td>
            <td align="center" scope="col" colspan="2" rowspan="2">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
                    <span>{{this.matNo}}</span>
                </div>
            </td>
        </tr>
        <tr>
            <td align="center" colspan="3" rowspan="1">{{this.str1}}</td>
        <tr style="height: 74px">
            <td align="center" colspan="1">物料单位</td>
            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.str1}}</td>
        </tr>
    </table>
    {{/each}}