From d31f547c4d8556bb753b5d7f6e94b164c5037526 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:53:55 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 220 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 131 insertions(+), 89 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 1738de0..87666d6 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -9,7 +9,21 @@
<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;
+ }
+ #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;
}
@@ -23,6 +37,7 @@
/* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
.template-preview {
+ height: 200px;
display: inline-block;
}
.contain {
@@ -38,12 +53,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>
@@ -57,16 +81,17 @@
</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>
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</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>
@@ -133,55 +158,41 @@
<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="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" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <div id="template-preview-1" class="template-preview" style="display: inline-block">
+ <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">
- <img class="template-code" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <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: 1px; text-align: center">
<span>xxxxxx</span>
</div>
</td>
@@ -190,10 +201,24 @@
</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" 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 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>
@@ -205,62 +230,49 @@
<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
<script type="text/javascript">
- $('.template-code').attr("src", baseUrl+"/macCode/code/auth?type=1¶m=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%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
- <span>{{this.barcode}}</span>
+ <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>
- <td align="center" width="25%">鐗╂枡缂栫爜</td>
- <td align="center" width="25%">{{this.matNo}}</td>
- <td align="center" width="25%">鐗╂枡鍚嶇О</td>
- <td align="center" width="25%">{{this.matName}}</td>
- </tr>
- <tr>
- <td align="center" width="25%">鐗╂枡鍗曚綅</td>
- <td align="center" width="25%">{{this.str1}}</td>
- <td align="center" width="25%">鐗╂枡瑙勬牸</td>
- <td align="center" width="25%">{{this.str2}}</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}}
</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>
- <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>
@@ -269,8 +281,38 @@
{{/each}}
</script>
<!-- 妯℃澘3 -->
-<script type="text/template" id="templatePreview3">
-
+<script type="text/template" id="templatePreview3" class="template-qrcode">
+ {{#each data}}
+ <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 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}}
</script>
</body>
--
Gitblit v1.9.1