From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

---
 src/main/webapp/views/order/out.html |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index b2d3445..c438001 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -95,23 +95,23 @@
                     <form class="layui-form toolbar">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">鍟嗗搧缂栫爜:</label>
+                                <label class="layui-form-label">鍖呰缁勫彿:</label>
                                 <div class="layui-input-inline">
-                                    <input name="matnr" class="layui-input" placeholder="鍟嗗搧缂栫爜"/>
+                                    <input name="brand" class="layui-input" placeholder="鍖呰缁勫彿"/>
                                 </div>
                             </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label">鍟嗗搧鍚嶇О:</label>
-                                <div class="layui-input-inline">
-                                    <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label">搴忓垪鐮�:</label>
-                                <div class="layui-input-inline">
-                                    <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>
-                                </div>
-                            </div>
+<!--                            <div class="layui-inline">-->
+<!--                                <label class="layui-form-label">鍟嗗搧鍚嶇О:</label>-->
+<!--                                <div class="layui-input-inline">-->
+<!--                                    <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                            <div class="layui-inline">-->
+<!--                                <label class="layui-form-label">搴忓垪鐮�:</label>-->
+<!--                                <div class="layui-input-inline">-->
+<!--                                    <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/>-->
+<!--                                </div>-->
+<!--                            </div>-->
                             <!--                            <div class="layui-inline">-->
                             <!--                                <label class="layui-form-label">鐘舵��:</label>-->
                             <!--                                <div class="layui-input-inline">-->
@@ -146,7 +146,7 @@
     <!--            </select>-->
     <!--        </div>-->
     <!--    </div>-->
-<!--    <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button>-->
+    <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button>
 
 </script>
 
@@ -166,9 +166,16 @@
         <div class="layui-card-body" style="padding: 10px">
             <table id="stoPreTab" lay-filter="stoPreTab"></table>
         </div>
-        <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">
-            鎵归噺淇敼
+        <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm"
+                lay-filter="checkModifySta"
+                lay-submit
+                style="display: block; float: right; margin-right: 3rem; transform: scale(1.2);margin-bottom: 3rem; transform-origin: right center;">
+            鐩樼偣鍧囧垎
         </button>
+
+<!--        <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">-->
+<!--            鎵归噺淇敼-->
+<!--        </button>-->
     </div>
 </script>
 

--
Gitblit v1.9.1