From b76c09d2c5f16de0e3777350b8d7ab48ea55aaa8 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 24 五月 2022 10:37:56 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

---
 src/main/webapp/views/mat/mat.html |   49 ++++++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f4035a4..da02f1f 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -193,16 +193,23 @@
                 </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="specs" 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 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>
 
@@ -217,16 +224,9 @@
                 </div>
 
                 <div class="layui-form-item">
-                    <label class="layui-form-label">瑙勬牸</label>
+                    <label class="layui-form-label">浠g爜</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="unit" placeholder="璇疯緭鍏ュ崟浣�" class="layui-input">
+                        <input name="model" type="number" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
                     </div>
                 </div>
 
@@ -237,16 +237,19 @@
                     </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">姝e父</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 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">
+                    </div>
+                </div>
 
             </div>
         </div>

--
Gitblit v1.9.1