From e26a8c78b542980df3d4fae3a4d097cd29258b04 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 07 九月 2020 13:36:04 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 718bfeb..16ed851 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -37,6 +37,7 @@
/* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
.template-preview {
+ height: 200px;
display: inline-block;
}
.contain {
@@ -80,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>
+<!-- <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>
@@ -200,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>
@@ -291,23 +281,33 @@
<!-- 妯℃澘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="
+ display: inline-block;
+ line-height: 20px;
+ vertical-align: middle;
+ border: none;
+ border-top: 1px solid #000;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ ">
+ {{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