From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/webapp/views/mat/mat.html | 102 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 45 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index b6ed0b9..151aa87 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -60,7 +60,7 @@
<div class="layui-fluid">
<!-- 宸� -->
<div class="layui-row layui-col-space15">
- <div class="layui-col-md3">
+ <div class="layui-col-md2">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 鏍戝伐鍏锋爮 -->
@@ -80,7 +80,7 @@
</div>
</div>
<!-- 鍙� -->
- <div class="layui-col-md9">
+ <div class="layui-col-md10">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
@@ -104,7 +104,7 @@
</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>
@@ -127,7 +127,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
<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>
+<!-- <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>
@@ -137,9 +137,14 @@
<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>
+ <li><a onclick="importNewMatnr()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>鍚屾鏂板晢鍝佺紪鍙�</a></li>
+ <li style="display: none"><input id="importNewMatnr" type="file" onchange="uploadNewMatnr(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>
+ <li>
+ <a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭 Excel</a>
+ <a href="#" id="downloadLink" style="display: none;"></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>-->
@@ -197,27 +202,28 @@
<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">
+ <input name="storeMax" placeholder="搴撳瓨涓婇檺" type="number" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撻緞涓婇檺(澶�)</label>
+ <div class="layui-input-block">
+ <input name="storeMaxDate" placeholder="搴撻緞涓婇檺(澶�)" type="number" 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="inoutEveryday" lay-vertype="tips" lay-verify="required" required="">
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
</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>
@@ -230,11 +236,19 @@
</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="model" type="number" 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="storeMin" placeholder="搴撳瓨涓嬮檺" type="number" class="layui-input">
+ </div>
+ </div>
+
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞</label>
@@ -244,16 +258,13 @@
</div>
<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">
- </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">
+ <select name="matType" lay-vertype="tips" lay-verify="required" required="">
+ <option value="1">鍗曞搧鍖�</option>
+ <option value="2">楂橀娣锋斁鍖�</option>
+ <option value="3">浣庨娣锋斁鍖�</option>
+ </select>
</div>
</div>
@@ -296,7 +307,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>
@@ -310,7 +321,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;">
@@ -338,7 +349,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>
@@ -375,8 +386,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}}
@@ -390,8 +401,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">
@@ -411,14 +422,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;
">
@@ -432,8 +439,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