From c8886bebd31e323d337273024223e4df8f0fc258 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 14:28:20 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 120 +++++++++++++++++++++--------------------------------------
1 files changed, 43 insertions(+), 77 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 79c401c..f9b187d 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -156,54 +156,40 @@
<!-- 棰勮鍥� 1 -->
<div id="template-preview-1" class="template-preview" style="display: inline-block">
- <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
- <tr>
- <td colspan="1" align="center" scope="col">鏉＄爜</td>
- <td class="barcode" colspan="3" align="center" scope="col">
- <img class="template-code template-barcode" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <tr style="height: 55px">
+ <td colspan="3" align="center" scope="col">鐗╂枡缂栫爜</td>
+ <td class="barcode" colspan="9" align="center" scope="col">
+ <img class="template-code template-barcode" src="" width="80%;">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
<span>xxxxxx</span>
</div>
</td>
</tr>
- <tr>
- <td align="center" width="25%">鐗╂枡缂栫爜</td>
- <td align="center" width="25%">xxxxxx-xx/xx</td>
- <td align="center" width="25%">鐗╂枡鍚嶇О</td>
- <td align="center" width="25%">xxxxxxx</td>
- </tr>
- <tr>
- <td align="center" width="25%">鐗╂枡鍗曚綅</td>
- <td align="center" width="25%">xxxxxxxx</td>
- <td align="center" width="25%">鐗╂枡瑙勬牸</td>
- <td align="center" width="25%">xxxxxxx</td>
+ <tr style="height: 55px">
+ <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+ <td align="center" colspan="5">xxxxxx-xx/xx</td>
+ <td align="center" colspan="2">鍗曚綅</td>
+ <td align="center" colspan="2">xx</td>
</tr>
</table>
</div>
<!-- 棰勮鍥� 2 -->
<div id="template-preview-2" 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="20%" colspan="1">鐗╂枡缂栫爜</td>
- <td align="center" scope="col" width="80%" colspan="5">xxxxxx-xx/xx</td>
+ <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <tr style="height: 25px">
+ <td align="center" width="20%">鐗╂枡鍚嶇О</td>
+ <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
- <tr>
- <td align="center" colspan="1">鐗╂枡鍚嶇О</td>
- <td align="center" colspan="5">xxxxxxx</td>
+ <tr style="height: 25px">
+ <td align="center" width="20%">鐗╂枡鍗曚綅</td>
+ <td align="center" width="80%">xxxxxxxx</td>
</tr>
- <tr>
- <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
- <td align="center" colspan="5">xxxxxxxx</td>
- </tr>
- <tr>
- <td align="center" colspan="1">鐗╂枡瑙勬牸</td>
- <td align="center" colspan="5">xxxxxxx</td>
- </tr>
- <tr>
- <td align="center" colspan="6" style="border: none">
+ <tr style="height: 61px;">
+ <td align="center" colspan="2" width="100%" style="border: none">
<img class="template-code template-barcode" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
<span>xxxxxx</span>
</div>
</td>
@@ -259,27 +245,21 @@
<!-- 妯℃澘1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
{{#each data}}
- <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
- <tr>
- <td align="center" colspan="1" scope="col">鏉＄爜</td>
- <td align="center" class="barcode" colspan="3" scope="col">
+ <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <tr style="height: 55px">
+ <td align="center" colspan="3" scope="col">鐗╂枡缂栫爜</td>
+ <td align="center" class="barcode" colspan="9" scope="col">
<img class="template-code" src="{{this.barcodeUrl}}" width="80%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
- <span>{{this.barcode}}</span>
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
+ <span>{{this.matNo}}</span>
</div>
</td>
</tr>
- <tr>
- <td align="center" width="25%">鐗╂枡缂栫爜</td>
- <td align="center" width="25%">{{this.matNo}}</td>
- <td align="center" width="25%">鐗╂枡鍚嶇О</td>
- <td align="center" width="25%">{{this.matName}}</td>
- </tr>
- <tr>
- <td align="center" width="25%">鐗╂枡鍗曚綅</td>
- <td align="center" width="25%">{{this.str1}}</td>
- <td align="center" width="25%">鐗╂枡瑙勬牸</td>
- <td align="center" width="25%">{{this.str2}}</td>
+ <tr style="height: 55px">
+ <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+ <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.matName}}</td>
+ <td align="center" colspan="2">鍗曚綅</td>
+ <td align="center" colspan="2">{{this.str1}}</td>
</tr>
</table>
{{/each}}
@@ -287,27 +267,19 @@
<!-- 妯℃澘2 -->
<script type="text/template" id="templatePreview2" class="template-barcode">
{{#each data}}
- <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
- <tr>
- <td align="center" scope="col" width="20%" colspan="1">鐗╂枡缂栫爜</td>
- <td align="center" scope="col" width="80%" colspan="5">{{this.matNo}}</td>
+ <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <tr style="height: 25px">
+ <td align="center" width="20%">鐗╂枡鍚嶇О</td>
+ <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matName}}</td>
</tr>
- <tr>
- <td align="center" colspan="1">鐗╂枡鍚嶇О</td>
- <td align="center" colspan="5">{{this.matName}}</td>
+ <tr style="height: 25px">
+ <td align="center" width="20%">鐗╂枡鍗曚綅</td>
+ <td align="center" width="80%">{{this.str1}}</td>
</tr>
- <tr>
- <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
- <td align="center" colspan="5">{{this.str1}}</td>
- </tr>
- <tr>
- <td align="center" colspan="1">鐗╂枡瑙勬牸</td>
- <td align="center" colspan="5">{{this.str2}}</td>
- </tr>
- <tr>
- <td align="center" colspan="6" style="border: none">
+ <tr style="height: 61px;">
+ <td align="center" colspan="2" width="100%" style="border: none">
<img class="template-code" src="{{this.barcodeUrl}}" width="80%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
<span>{{this.matNo}}</span>
</div>
</td>
@@ -318,7 +290,7 @@
<!-- 妯℃澘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 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>
@@ -335,12 +307,6 @@
</tr>
<tr>
<td align="center" colspan="3" rowspan="1">{{this.str1}}</td>
- </tr>
- <tr>
- <td align="center" colspan="3" rowspan="1">鐗╂枡瑙勬牸</td>
- </tr>
- <tr>
- <td align="center" colspan="3" rowspan="1">{{this.str2}}</td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1