From 0b671b7cc0dbc97285df38adafbbaeb83ddd5ea8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 15:24:40 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 152 +++++++++++++++++++++++---------------------------
1 files changed, 71 insertions(+), 81 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 2c85ddf..89361d1 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>
@@ -134,54 +158,40 @@
<!-- 棰勮鍥� 1 -->
<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-code template-barcode" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <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">
+ <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: 3px; text-align: center">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
<span>xxxxxx</span>
</div>
</td>
@@ -237,27 +247,21 @@
<!-- 妯℃澘1 -->
<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="template-code" 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}}
@@ -265,27 +269,19 @@
<!-- 妯℃澘2 -->
<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>
@@ -296,7 +292,7 @@
<!-- 妯℃澘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 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>
@@ -313,12 +309,6 @@
</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}}
--
Gitblit v1.9.1