From e2d1545d46f3ed1c98a80d74561a31369901d632 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 15:50:51 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 61 ++++++++++++------------------
src/main/java/com/zy/common/utils/QrCode.java | 2
2 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/QrCode.java b/src/main/java/com/zy/common/utils/QrCode.java
index 5f5f63a..d2e86c6 100644
--- a/src/main/java/com/zy/common/utils/QrCode.java
+++ b/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();
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 89361d1..34f7dd3 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/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}}
--
Gitblit v1.9.1