From 7bea8428d74527993cb4ae47d01c79850b5f34bc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 20 三月 2023 08:09:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/webapp/views/mat/mat.html | 77 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f4035a4..31b2fda 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -97,8 +97,14 @@
<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>
@@ -191,20 +197,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">SKC</label>
+ <label class="layui-form-label">搴撳瓨涓婇檺</label>
<div class="layui-input-block">
- <input name="barcode" 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="price" type="number" placeholder="璇疯緭鍏ュ崟浠�" class="layui-input">
- </div>
- </div>
</div>
@@ -224,11 +238,12 @@
</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="storeMin" placeholder="搴撳瓨涓嬮檺" type="number" class="layui-input">
</div>
</div>
+
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞</label>
@@ -236,17 +251,6 @@
<input name="memo" 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>
</div>
@@ -287,7 +291,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 +305,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 +333,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>
@@ -366,8 +370,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 +385,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 +406,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 +423,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