From 6329ea54346c6548518304c7a7cec865f2b7eaa4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 16:52:53 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 102 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 88 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 7642881..79c401c 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -10,6 +10,19 @@
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
+ #search-box {
+ padding: 30px 30px 10px 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+ #data-search-btn {
+ margin-top: 10px;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+
.btn-print {
display: none;
}
@@ -38,12 +51,21 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡缂栫爜" autocomplete="off">
</div>
</div>
-
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -133,12 +155,12 @@
<div id="template-container" style="margin: 20px;text-align: center">
<!-- 棰勮鍥� 1 -->
- <div id="template-preview-1" class="template-preview" style="display: none">
+ <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-qrcode" src="" width="80%">
+ <img class="template-code template-barcode" src="" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>xxxxxx</span>
</div>
@@ -180,7 +202,7 @@
</tr>
<tr>
<td align="center" colspan="6" style="border: none">
- <img class="template-qrcode" src="" width="80%">
+ <img class="template-code template-barcode" src="" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>xxxxxx</span>
</div>
@@ -190,8 +212,32 @@
</div>
<!-- 棰勮鍥� 3 -->
- <div id="template-preview-3" class="template-preview" style="display: inline-block">
-
+ <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="">
+ </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>
+ </table>
</div>
</div>
@@ -205,18 +251,19 @@
<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
<script type="text/javascript">
- $('.template-qrcode').attr("src", baseUrl+"/macCode/barcode/auth?param=123");
+ $('.template-barcode').attr("src", baseUrl+"/macCode/code/auth?type=1¶m=123");
+ $('.template-qrcode').attr("src", baseUrl+"/macCode/code/auth?type=2¶m=123");
</script>
<!-- 妯℃澘寮曟搸 -->
<!-- 妯℃澘1 -->
-<script type="text/template" id="templatePreview1">
+<script type="text/template" id="templatePreview1" class="template-barcode">
{{#each data}}
<table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
<tr>
<td align="center" colspan="1" scope="col">鏉＄爜</td>
<td align="center" class="barcode" colspan="3" scope="col">
- <img class="qrcode" src="{{this.barcodeUrl}}" width="80%">
+ <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>{{this.barcode}}</span>
</div>
@@ -238,7 +285,7 @@
{{/each}}
</script>
<!-- 妯℃澘2 -->
-<script type="text/template" id="templatePreview2">
+<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>
@@ -259,7 +306,7 @@
</tr>
<tr>
<td align="center" colspan="6" style="border: none">
- <img class="template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+ <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>{{this.matNo}}</span>
</div>
@@ -269,7 +316,34 @@
{{/each}}
</script>
<!-- 妯℃澘3 -->
-<script type="text/template" id="templatePreview3">
+<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}}">
+ </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>
+ </table>
+ {{/each}}
</script>
</body>
--
Gitblit v1.9.1