From 1934fe348a93da3bd79f07a3b20b23b9db72c612 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 17:03:18 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 147 +++++++++++++++++++++++++++++++------------------
1 files changed, 93 insertions(+), 54 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 64d98ae..2bf2b84 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;
}
@@ -21,24 +34,16 @@
color: #333;
}
- /* ------------------------------------------------ */
+ /* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
.template-preview {
display: inline-block;
}
-
-
.contain {
- /*border: 1px solid #000;*/
- /*width: 100%;*/
}
.contain td {
border: 1px solid #000;
/*line-height: 46px;*/
- /*text-align: center;*/
}
- /*.qrcode {*/
- /* margin: 3px;*/
- /*}*/
</style>
</head>
<body>
@@ -46,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>
@@ -139,44 +153,14 @@
<fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
<legend>鎵撳嵃棰勮</legend>
<div id="template-container" style="margin: 20px;text-align: center">
+
<!-- 棰勮鍥� 1 -->
- <div id="template-preview-1" class="template-preview" style="display: none">
-<!-- <table class="contain" height="317" width="317" style="overflow: hidden">-->
-<!-- <tr>-->
-<!-- <td width="20%" align="right" scope="col">瀹㈡埛</td>-->
-<!-- <td class="customer" width="30%" align="left" scope="col">{{this.customer}}</td>-->
-<!-- <td width="80%" align="right" scope="col">棰滆壊</td>-->
-<!-- <td class="color" width="30%" align="left" scope="col">1</td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td align="right">鐢熶骇鏃ユ湡</td>-->
-<!-- <td class="createTime" align="left">{{this.createTime$}}</td>-->
-<!-- <td align="right">鏁伴噺</td>-->
-<!-- <td class="amount" align="left">{{this.amount}}</td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td align="right">鍨嬪彿鎵撳瓧</td>-->
-<!-- <td class="modelType" align="left" colspan="3">{{this.modelType}}</td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td align="right">浜у搧鎵瑰彿</td>-->
-<!-- <td class="seq" align="left">{{this.seq}}</td>-->
-<!-- <td colspan="2" rowspan="3" align="right"><img class="qrcode" src="" style="width: 80%"></td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td align="right">瑁呮楠屽彿</td>-->
-<!-- <td class="boxCheck" align="left">{{this.boxCheck}}</td>-->
-<!-- </tr>-->
-<!-- <tr>-->
-<!-- <td align="right">绠卞彿</td>-->
-<!-- <td class="boxNumber" align="left">{{this.boxNumber}}</td>-->
-<!-- </tr>-->
-<!-- </table>-->
+ <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>
@@ -198,7 +182,7 @@
</div>
<!-- 棰勮鍥� 2 -->
- <div id="template-preview-2" class="template-preview" style="display: inline-block">
+ <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>
@@ -218,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>
@@ -228,7 +212,34 @@
</div>
<!-- 棰勮鍥� 3 -->
- <div id="template-preview-3" class="template-preview"></div>
+ <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>
</fieldset>
@@ -240,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>
@@ -273,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>
@@ -294,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>
@@ -304,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