From 787601a6a35581f930c304cc5052a2ad4e716a16 Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期三, 16 十月 2024 00:27:10 +0800
Subject: [PATCH] #update 根据客户需求更改wms相关功能
---
src/main/webapp/views/mat/mat.html | 136 ++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 64 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 2b12919..0ba7749 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,15 +86,15 @@
<!-- 琛ㄦ牸宸ュ叿鏍�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="杈撳叆鍟嗗搧缂栧彿"/>
+ <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="杈撳叆鍟嗗搧鍚嶇О"/>
+ <input name="maktx" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
</div>
</div>
<div class="layui-inline"> 
@@ -123,19 +123,19 @@
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
- <div class="dropdown-menu" style="float: right">
- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
- <ul class="dropdown-menu-nav dark">
- <div class="dropdown-anchor"></div>
- <li class="title">1st menu</li>
- <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>
- <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>
- <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>
- <hr>
- <li class="title">2nd menu</li>
- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>
- </ul>
- </div>
+<!-- <div class="dropdown-menu" style="float: right">-->
+<!-- <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
+<!-- <ul class="dropdown-menu-nav dark">-->
+<!-- <div class="dropdown-anchor"></div>-->
+<!-- <li class="title">1st menu</li>-->
+<!-- <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>-->
+<!-- <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆 Excel</a></li>-->
+<!-- <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>-->
+<!-- <hr>-->
+<!-- <li class="title">2nd menu</li>-->
+<!-- <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a></li>-->
+<!-- </ul>-->
+<!-- </div>-->
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">鍏ㄩ噺瀵煎嚭</button>
</div>
</script>
@@ -186,47 +186,16 @@
</div>
<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 name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="maktx" placeholder="璇疯緭鍏ュ搧鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</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="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠鍑�閲�</label>
- <div class="layui-input-block">
- <input 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="volume" 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>
- <div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸</label>
- <div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
+ <input name="unit" placeholder="璇疯緭鍏ュ崟浣�" class="layui-input">
</div>
</div>
@@ -237,19 +206,58 @@
</div>
</div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鍗曠鍑�閲�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input 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="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+
+ </div>
+
+ <div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠姣涢噸</label>
+ <label class="layui-form-label layui-form-required">鐗╂枡鍙�</label>
<div class="layui-input-block">
- <input name="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+ <input id="matnr" name="matnr" placeholder="璇疯緭鍏ョ墿鏂欏彿" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</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="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+ <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
</div>
</div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">绫诲瀷</label>
+ <div class="layui-input-block">
+ <input name="brand" placeholder="璇疯緭鍏ョ被鍨�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-block">
+ <input name="supp" placeholder="璇疯緭鍏ヤ緵搴斿晢" class="layui-input">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">绠卞瓙灏哄</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
@@ -279,7 +287,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;">
@@ -288,7 +296,7 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
+ <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>
@@ -300,7 +308,7 @@
<div id="template-preview-2" class="template-preview" style="display: none">
<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="20%">鍝佸彿</td>
<td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
<tr style="height: 30px">
@@ -322,7 +330,7 @@
<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">鍝佸彿</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%">
@@ -358,7 +366,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">
@@ -367,7 +375,7 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
+ <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>
@@ -380,7 +388,7 @@
{{#each data}}
<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="20%">鍝佸彿</td>
<td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
</tr>
<tr style="height: 35px">
@@ -403,7 +411,7 @@
{{#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">鍝佸彿</td>
<td align="center" scope="col" colspan="1" style="
display: inline-block;
line-height: 20px;
--
Gitblit v1.9.1