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 | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html index 42f9189..f9b187d 100644 --- a/src/main/webapp/views/matCode/matCode.html +++ b/src/main/webapp/views/matCode/matCode.html @@ -158,8 +158,8 @@ <div id="template-preview-1" class="template-preview" style="display: inline-block"> <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;"> <tr style="height: 55px"> - <td colspan="1" align="center" scope="col">鐗╂枡缂栫爜</td> - <td class="barcode" colspan="3" align="center" scope="col"> + <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> @@ -167,10 +167,10 @@ </td> </tr> <tr style="height: 55px"> - <td align="center" width="25%">鍚嶇О</td> - <td align="center" width="35%">xxxxxx-xx/xx</td> - <td align="center" width="20%">鍗曚綅</td> - <td align="center" width="20%">xxxxxxx</td> + <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> @@ -247,8 +247,8 @@ {{#each data}} <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;"> <tr style="height: 55px"> - <td align="center" colspan="1" scope="col">鐗╂枡缂栫爜</td> - <td align="center" class="barcode" colspan="3" scope="col"> + <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: 1px; text-align: center"> <span>{{this.matNo}}</span> @@ -256,10 +256,10 @@ </td> </tr> <tr style="height: 55px"> - <td align="center" width="25%">鍚嶇О</td> - <td align="center" width="35%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matName}}</td> - <td align="center" width="20%">鍗曚綅</td> - <td align="center" width="20%">{{this.str1}}</td> + <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}} @@ -290,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> @@ -307,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