From 98cac850db801e84dff4387eb12b08921c436472 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 20:33:50 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pickout/pickout.html |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/pickout/pickout.html b/src/main/webapp/views/pickout/pickout.html
index 65d6893..09c1aa3 100644
--- a/src/main/webapp/views/pickout/pickout.html
+++ b/src/main/webapp/views/pickout/pickout.html
@@ -62,18 +62,21 @@
             <div class="layui-card">
                 <div class="layui-card-body" style="padding: 10px;">
                     <!-- 琛ㄦ牸宸ュ叿鏍�1 -->
-                    <form class="layui-form toolbar">
+                    <div class="layui-form toolbar">
                         <div class="layui-form-item">
                             <div class="layui-inline" style="max-width: 140px;">
-                                <input name="docName" class="layui-input" placeholder="璇疯緭鍏ヤ换鍔″彿"/>
+                                <input name="docName" id="docName" class="layui-input" placeholder="璇疯緭鍏ヤ换鍔″彿"/>
                             </div>
                             <div class="layui-inline">
                                 <button class="layui-btn icon-btn" lay-filter="leftResearch" lay-submit>
                                     <i class="layui-icon">&#xe615;</i>鎼滅储
                                 </button>
+                                <button class="layui-btn icon-btn" lay-filter="leftReset" lay-submit>
+                                    <i class="layui-icon">&#xe666;</i>閲嶇疆
+                                </button>
                             </div>
                         </div>
-                    </form>
+                    </div>
                     <!-- 鏁版嵁琛ㄦ牸1 -->
                     <table id="leftTable" lay-filter="leftTable"></table>
                 </div>
@@ -83,16 +86,16 @@
             <div class="layui-card">
                 <div class="layui-card-body" style="padding: 10px;">
                     <!-- 琛ㄦ牸宸ュ叿鏍�2 -->
-                    <form class="layui-form toolbar">
+                    <div 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="id" class="layui-input"type="text" name="id" placeholder="缂栧彿" autocomplete="off"/>
+                                    <input name="matnr" id="matnr" class="layui-input"type="text"  placeholder="缂栫爜" autocomplete="off"/>
                                 </div>
                             </div>
                             <div class="layui-inline">&emsp;
-                                <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                                <button class="layui-btn icon-btn" lay-filter="rightSearch" lay-submit>
                                     <i class="layui-icon">&#xe615;</i>鎼滅储
                                 </button>
                                 <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -100,7 +103,7 @@
                                 </button>
                             </div>
                         </div>
-                    </form>
+                    </div>
                     <!-- 鏁版嵁琛ㄦ牸2 -->
                     <table id="pickout" lay-filter="pickout"></table>
                 </div>
@@ -136,12 +139,14 @@
 </script>
 
 <script type="text/html" id="operate">
-    {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
-    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">鎵撳嵃鎷ｈ揣鍗�</a>
-    {{# } }}
     {{#if (d.wrkSts == 3){ }}
     <a class="layui-btn layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
     {{# } }}
+    {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="printOrder">鎵撳嵃鎷ｈ揣鍗�</a>
+    {{# } }}
+
+
 
 <!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
     {{#if (d.wrkSts == 1||d.wrkSts == 2){ }}

--
Gitblit v1.9.1