From 7b6329313ca3a5e6ff96246eeaf96f839df7760b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/webapp/views/basArmMastLog/basArmMastLog.html |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/views/basArmMastLog/basArmMastLog.html b/src/main/webapp/views/basArmMastLog/basArmMastLog.html
index abae12c..3f5325e 100644
--- a/src/main/webapp/views/basArmMastLog/basArmMastLog.html
+++ b/src/main/webapp/views/basArmMastLog/basArmMastLog.html
@@ -17,11 +17,11 @@
         <div class="layui-card-body">
             <div class="layui-form toolbar" id="search-box">
                 <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
-                        </div>
-                    </div>
+<!--                    <div class="layui-inline">-->
+<!--                        <div class="layui-input-inline">-->
+<!--                            <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!--                        </div>-->
+<!--                    </div>-->
                     <div class="layui-inline">
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="arm_no" placeholder="鏈烘鑷傜紪鍙�" autocomplete="off">
@@ -82,6 +82,11 @@
                             <input class="layui-input" type="text" name="binding_tags" placeholder="鍒嗘嫞缁戝畾鏍囪" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">&emsp;
                         <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储

--
Gitblit v1.9.1