From e911448693edd1a49a6897b1240b2adbcfb9ae67 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 16:44:31 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 182 +++++++++++++++++---------------------------
1 files changed, 71 insertions(+), 111 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 415aac6..e648b31 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 {
@@ -79,16 +81,15 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
- <button class="layui-btn " id="btn-into" lay-event="intoData">瀵煎叆</button>
- <button class="layui-btn layui-btn-danger" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-sm" id="btn-into" lay-event="intoData">瀵煎叆</button>
+ <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
</div>
</script>
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
<button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
-<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -156,54 +157,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: 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>
- <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: 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>
<!-- 棰勮鍥� 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: 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>
- <td align="center" colspan="1">鐗╂枡鍚嶇О</td>
- <td align="center" colspan="5">xxxxxxx</td>
+ <tr style="height: 30px">
+ <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: 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: 3px; text-align: center">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
<span>xxxxxx</span>
</div>
</td>
@@ -213,33 +200,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>
@@ -259,21 +236,21 @@
<!-- 妯℃澘1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
{{#each data}}
- <table class="contain" width="296" style="overflow: hidden;font-size: xx-small">
- <tr style="height: 80px">
- <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%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <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: 80px">
- <td align="center" width="25%">鐗╂枡鍚嶇О</td>
- <td align="center" width="25%">{{this.matName}}</td>
- <td align="center" width="25%">鐗╂枡鍗曚綅</td>
- <td align="center" width="25%">{{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}}
@@ -281,27 +258,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: 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>
- <td align="center" colspan="1">鐗╂枡鍚嶇О</td>
- <td align="center" colspan="5">{{this.matName}}</td>
+ <tr style="height: 35px">
+ <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: 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: 3px; text-align: center">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
<span>{{this.matNo}}</span>
</div>
</td>
@@ -312,29 +281,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">
- <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>
- <tr>
- <td align="center" colspan="3" rowspan="1">鐗╂枡瑙勬牸</td>
- </tr>
- <tr>
- <td align="center" colspan="3" rowspan="1">{{this.str2}}</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