From f13bcd917e1a02f6df9cb8b1eb2159b6665354f0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 09:11:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/mat/mat.html | 84 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index a0947c4..7103755 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -88,13 +88,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="padding: 8px 15px 8px 15px">鐗╂枡鍙�:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+ <input name="matnr" class="layui-input" placeholder="杈撳叆鐗╂枡鍙�"/>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鐗╂枡鍙�:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鐗╂枡鍚嶇О:</label>
<div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
+ <input name="maktx" class="layui-input" placeholder="杈撳叆鐗╂枡鍚嶇О"/>
</div>
</div>
<div class="layui-inline">
@@ -270,6 +270,7 @@
<input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="">
<input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">
<input type="radio" name="selectTemplate" value="3" title="妯℃澘涓�" lay-filter="selectTemplateRadio">
+ <input type="radio" name="selectTemplate" value="4" title="妯℃澘鍥�" lay-filter="selectTemplateRadio">
</div>
<fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
<legend>鎵撳嵃棰勮</legend>
@@ -337,6 +338,24 @@
</tr>
</table>
</div>
+
+ <!-- 棰勮鍥� 4 -->
+ <div id="template-preview-4" class="template-preview" style="display: none">
+ <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <tr style="height: 74px">
+ <td align="center" scope="col" >鍟嗗搧</td>
+ <td align="center" scope="col" style="">xxxxxx-xx/xx</td>
+ <td align="center" scope="col" colspan="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 style="height: 74px">
+ <td align="center" >瑙勬牸</td>
+ <td align="center" colspan="3" >xxxxxxx</td>
+ </tr>
+ </table>
+ </div>
</div>
</fieldset>
@@ -401,35 +420,54 @@
<!-- 妯℃澘3 -->
<script type="text/template" id="templatePreview3" class="template-qrcode">
{{#each data}}
- <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px;font-size: 18px" >
- <td width="50px" align="center" scope="col" colspan="1"><strong>鍟嗗搧</strong></td>
- <td width="150px" align="center" scope="col" colspan="1" style="
- border: none;
- border-top: 1px solid #000;
- overflow: hidden;
- text-overflow: ellipsis;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
- font-family: 瀹嬩綋;
- font-size: 18px">
- <strong>{{this.maktx}}</strong>
- </td>
- <td align="center" scope="col" colspan="2" rowspan="2">
+ <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed; color:#000;">
+ <tr style="height: 74px;font-size: 18px; font-weight: 400" >
+ <td width="50px" align="center" scope="col" colspan="1">鍟嗗搧</td>
+ <td width="170px" align="center" scope="col" colspan="1">{{this.maktx}}</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><strong>{{this.matnr}}</strong></span>
+ <div style="letter-spacing: 1px;margin-top: 1px; text-align: center; font-weight: 400">
+ <span>{{this.matnr}}</span>
</div>
</td>
</tr>
- <tr style="height: 74px; font-family: 瀹嬩綋; font-size: 18px">
- <td width="50px" align="center" colspan="1"><strong>瑙勬牸</strong></td>
+ <tr style="height: 74px; font-size: 18px;font-weight: 400">
+ <td width="50px" align="center" colspan="1">瑙勬牸</td>
<td align="center" colspan="1" style="
overflow:hidden;
text-overflow:ellipsis;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
- "><strong>{{this.specs}}</strong></td>
+ word-break: break-all;
+ ">{{this.specs}}</td>
+ </tr>
+ </table>
+ {{/each}}
+</script>
+
+<!-- 妯℃澘4 -->
+<script type="text/template" id="templatePreview4" class="template-qrcode">
+ {{#each data}}
+ <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed; color:#000;">
+ <tr style="height: 74px;font-size: 18px; font-weight: 400" >
+ <td width="50px" align="center" scope="col" colspan="1">鍟嗗搧</td>
+ <td width="170px" align="center" scope="col" colspan="1">{{this.maktx}}</td>
+ <td align="center" scope="col" colspan="2" >
+ <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+ <div style="letter-spacing: 1px;margin-top: 1px; text-align: center; font-weight: 400">
+ <span>{{this.matnr}}</span>
+ </div>
+ </td>
+ </tr>
+ <tr style="height: 50px; font-size: 18px;font-weight: 400">
+ <td width="50px" align="center" colspan="1">瑙勬牸</td>
+ <td align="center" colspan="3" style="
+ overflow:hidden;
+ text-overflow:ellipsis;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ word-break: break-all;
+ ">{{this.specs}}</td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1