From 0b671b7cc0dbc97285df38adafbbaeb83ddd5ea8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 15:24:40 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 42f9189..89361d1 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <link rel="stylesheet" href="../../static/css/print.css" media="all">
<style>
#search-box {
padding: 30px 30px 10px 30px;
@@ -36,6 +37,7 @@
/* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
.template-preview {
+ height: 200px;
display: inline-block;
}
.contain {
@@ -157,20 +159,20 @@
<!-- 棰勮鍥� 1 -->
<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">
- <img class="template-code template-barcode" src="" width="80%;">
+ <tr style="height: 74px">
+ <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="90%;">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
<span>xxxxxx</span>
</div>
</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>
+ <tr style="height: 74px">
+ <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>
@@ -178,15 +180,15 @@
<!-- 棰勮鍥� 2 -->
<div id="template-preview-2" class="template-preview" style="display: none">
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 25px">
+ <tr style="height: 30px">
<td align="center" width="20%">鐗╂枡鍚嶇О</td>
<td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
- <tr style="height: 25px">
+ <tr style="height: 30px">
<td align="center" width="20%">鐗╂枡鍗曚綅</td>
<td align="center" width="80%">xxxxxxxx</td>
</tr>
- <tr style="height: 61px;">
+ <tr style="height: 75px;">
<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: 1px; text-align: center">
@@ -245,21 +247,21 @@
<!-- 妯℃澘1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
{{#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">
- <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
+ <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
+ <tr style="height: 74px">
+ <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="90%">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
<span>{{this.matNo}}</span>
</div>
</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>
+ <tr style="height: 74px">
+ <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}}
@@ -268,15 +270,15 @@
<script type="text/template" id="templatePreview2" class="template-barcode">
{{#each data}}
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 25px">
+ <tr style="height: 35px">
<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 style="height: 25px">
+ <tr style="height: 35px">
<td align="center" width="20%">鐗╂枡鍗曚綅</td>
<td align="center" width="80%">{{this.str1}}</td>
</tr>
- <tr style="height: 61px;">
+ <tr style="height: 79px;">
<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: 1px; text-align: center">
@@ -290,7 +292,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 +309,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