From 592f175ea0ad02c4e22cb62e77ea9e1e9cfbe516 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 14:45:34 +0800
Subject: [PATCH] #
---
src/main/webapp/views/mat/mat.html | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f4035a4..128f3c5 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,19 +86,25 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<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="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="杈撳叆鍟嗗搧鍚嶇О"/>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">瑙勬牸:</label>
+ <div class="layui-input-inline">
+ <input name="specs" class="layui-input" placeholder="杈撳叆瑙勬牸"/>
+ </div>
+ </div>
<div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <button class="layui-btn icon-btn" id="search" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
<button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -161,8 +167,6 @@
<input name="uuid" type="hidden">
<input name="nodeId" type="hidden">
<input name="tag_id" type="hidden">
- <input name="model" type="hidden">
- <input name="name" type="hidden">
<input name="batch" type="hidden">
<input name="docId" type="hidden">
<input name="docNum" type="hidden">
@@ -186,33 +190,47 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍙�</label>
<div class="layui-input-block">
- <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="maktx" placeholder="璇疯緭鍏ョ墿鏂欏彿" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">SKC</label>
+ <label class="layui-form-label">绉诲姩绫诲瀷</label>
<div class="layui-input-block">
- <input name="barcode" placeholder="璇疯緭鍏ユ潯鐮�" class="layui-input">
+ <input name="name" placeholder="璇疯緭鍏ョЩ鍔ㄧ被鍨�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曚环</label>
+ <label class="layui-form-label">閲嶉噺</label>
<div class="layui-input-block">
- <input name="price" type="number" placeholder="璇疯緭鍏ュ崟浠�" class="layui-input">
+ <input type="number" name="weight" placeholder="璇疯緭鍏ラ噸閲�" class="layui-input">
</div>
</div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <input name="origin" placeholder="璇疯緭鍏ョ姸鎬�" class="layui-input">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">澶囨敞</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
+ <label class="layui-form-label layui-form-required">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ崟鎹彿" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
@@ -224,29 +242,25 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曚綅</label>
+ <label class="layui-form-label">鎵规</label>
<div class="layui-input-block">
- <input name="unit" placeholder="璇疯緭鍏ュ崟浣�" class="layui-input">
+ <input name="model" placeholder="璇疯緭鍏ユ壒娆�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞</label>
+ <label class="layui-form-label">鍗曟嵁鏃堕棿</label>
<div class="layui-input-block">
- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ <input name="manuDate" placeholder="璇疯緭鍏ュ崟鎹椂闂�" class="layui-input">
</div>
</div>
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label layui-form-required">鐘舵��</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <select name="status" lay-vertype="tips" lay-verify="required" required="">-->
- <!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
- <!-- <option value="1">姝ｅ父</option>-->
- <!-- <option value="0">绂佺敤</option>-->
- <!-- </select>-->
- <!-- </div>-->
- <!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呮暟</label>
+ <div class="layui-input-block">
+ <input type="number" name="units" placeholder="璇疯緭鍏ュ寘鏁�" class="layui-input">
+ </div>
+ </div>
</div>
</div>
@@ -276,7 +290,7 @@
<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 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;">
@@ -287,7 +301,7 @@
<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">瑙勬牸</td>
<td align="center" colspan="2">xx</td>
</tr>
</table>
@@ -301,7 +315,7 @@
<td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
<tr style="height: 30px">
- <td align="center" width="20%">澶囨敞</td>
+ <td align="center" width="20%">瑙勬牸</td>
<td align="center" width="80%">xxxxxxxx</td>
</tr>
<tr style="height: 75px;">
@@ -329,7 +343,7 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="1">澶囨敞</td>
+ <td align="center" colspan="1">瑙勬牸</td>
<td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
</table>
@@ -355,7 +369,7 @@
{{#each data}}
<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" 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">
@@ -366,8 +380,8 @@
<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.maktx}}</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">{{this.memo}}</td>
+ <td align="center" colspan="2">瑙勬牸</td>
+ <td align="center" colspan="2">{{this.specs}}</td>
</tr>
</table>
{{/each}}
@@ -381,8 +395,8 @@
<td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
</tr>
<tr style="height: 35px">
- <td align="center" width="20%">澶囨敞</td>
- <td align="center" width="80%">{{this.memo}}</td>
+ <td align="center" width="20%">瑙勬牸</td>
+ <td align="center" width="80%">{{this.specs}}</td>
</tr>
<tr style="height: 79px;">
<td align="center" colspan="2" width="100%" style="border: none">
@@ -402,14 +416,10 @@
<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;
">
@@ -423,8 +433,13 @@
</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.memo}}</td>
+ <td align="center" colspan="1">瑙勬牸</td>
+ <td align="center" colspan="1" style="
+ overflow:hidden;
+ text-overflow:ellipsis;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+ ">{{this.specs}}</td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1