From 307a04b33d1054c89e1acae24ed2913e394635b8 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 01 十二月 2025 09:07:31 +0800
Subject: [PATCH] #1

---
 src/main/webapp/views/mat/mat.html |  182 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 153 insertions(+), 29 deletions(-)

diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 9b97c49..b955df0 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -92,9 +92,9 @@
                             </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="name" class="layui-input" placeholder="杈撳叆濂楀彿"/>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -128,6 +128,8 @@
         <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"><a onclick="importImage()" style="font-size: 15px"><i class="layui-icon layui-icon-upload"></i>涓婁紶绠�鍥�</a></button>-->
+<!--        <li style="display: none"><input id="importImage" type="file" onchange="uploadImage(this)" ></li>-->
         <!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
         <div class="dropdown-menu" style="float: right">
             <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm">&nbsp;鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
@@ -138,16 +140,17 @@
                 <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>
+<!--                <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>-->
+        <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>
 
 <script type="text/html" id="operate">
     <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">淇敼</a>
+    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">缁戝畾</a>
     <button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
 </script>
 
@@ -192,42 +195,42 @@
                 </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">
+                        <input name="matnr" 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="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
+                        <input name="name" 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 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 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>
@@ -236,27 +239,148 @@
                     </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 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>
+                    <label class="layui-form-label">鐘舵��</label>
                     <div class="layui-input-block">
-                        <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+                        <select id="color" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">
+                        <option value="">璇烽�夋嫨鐘舵��</option>
+                        <option value="姝e父" name="color" class="layui-input">姝e父</option>
+                        <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
+
+
+
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialogBarcode">
+    <form id="detailBarcode" lay-filter="detail" class="layui-form admin-form">
+        <input name="id" type="hidden">
+        <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">
+        <input name="custName" type="hidden">
+        <input name="itemNum" type="hidden">
+        <input name="count" type="hidden">
+        <input name="weight" type="hidden">
+        <input name="status" type="hidden">
+        <input name="createBy" type="hidden">
+        <input name="updateTime$" type="hidden">
+        <input name="updateBy" type="hidden">
+        <div class="layui-row">
+
+            <div class="layui-col-md6">
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鍒嗙被</label>
+                    <div class="layui-input-block">
+                        <div id="tagSelBarcode" class="ew-xmselect-tree"></div>
                     </div>
                 </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">
+                        <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="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+                        <input name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input">
                     </div>
                 </div>
 
+                <div class="layui-form-item">
+                    <label class="layui-form-label">濂楀彿</label>
+                    <div class="layui-input-block">
+                        <input name="name" 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">
+                    </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">
+                    </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 class="layui-form-item">
+                                    <label class="layui-form-label">鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <input name="color" placeholder="" class="layui-input">
+                                    </div>
+                                </div>
+<!--                <div class="layui-form-item">-->
+<!--                    <label class="layui-form-label">鐘舵��</label>-->
+<!--                    <div class="layui-input-block">-->
+<!--                        <select id="colorBarcode" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">-->
+<!--                            <option value="">璇烽�夋嫨鐘舵��</option>-->
+<!--                            <option value="姝e父" name="color" class="layui-input">姝e父</option>-->
+<!--                            <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>-->
+<!--                        </select>-->
+<!--                    </div>-->
+<!--                </div>-->
+
             </div>
         </div>
         <hr class="layui-bg-gray">

--
Gitblit v1.9.1