From 8f98356e0fc445509bb1d3c7754277eb9d25e015 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 22 三月 2022 16:48:09 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/OrderController.java |    4 ++--
 src/main/webapp/views/pickout/pickout.html                         |   14 ++++++++------
 src/main/webapp/static/js/pickout/pickout.js                       |   40 ++++++++++++++++++++++++++--------------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
index a2e3574..1934bb6 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -208,8 +208,8 @@
          */
         Integer seqNo = 1;
         for (Order order : orders) {
-            if (order.getSettle() != 2L) {
-                return R.error("浠呮敮鎸�'鏈嫞璐�'鐘舵�佺敓鎴愭尝娆�");
+            if (order.getSettle() != 1L) {
+                return R.error("浠呮敮鎸�'寰呭鐞�'鐘舵�佺敓鎴愭尝娆�");
             }
         }
 
diff --git a/src/main/webapp/static/js/pickout/pickout.js b/src/main/webapp/static/js/pickout/pickout.js
index 08458ee..316ce54 100644
--- a/src/main/webapp/static/js/pickout/pickout.js
+++ b/src/main/webapp/static/js/pickout/pickout.js
@@ -101,6 +101,13 @@
             })
         });
     }
+    form.on('submit(leftResearch)', function (data) {
+
+        leftTB.reload({where: {wrk_no: data.field.docName}});
+        return false;
+    });
+
+
 
     /****************************************** 鍙宠竟琛� *************************************************/
     // 鏁版嵁娓叉煋
@@ -142,7 +149,7 @@
             ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳ID', hide:true}
             ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
 
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150, hide:true}
         ]],
         request: {
             pageName: 'curr',
@@ -167,7 +174,12 @@
             limit();
         }
     });
+    /* 琛ㄦ牸2鎼滅储 */
+    form.on('submit(rightSearch)', function (data) {
 
+        tableIns.reload({where: data.field , page: {curr: 1}});
+        return false;
+    });
     // // 鐩戝惉鎺掑簭浜嬩欢
     // table.on('sort(pickout)', function (obj) {
     //     var searchData = {};
@@ -259,19 +271,19 @@
     //     tableReload(false);
     // });
     //
-    // // 鏃堕棿閫夋嫨鍣�
-    // function layDateRender() {
-    //         layDate.render({
-    //     elem: '#createTime\\$',
-    //     type: 'datetime'
-    // });
-    //     layDate.render({
-    //     elem: '#updateTime\\$',
-    //     type: 'datetime'
-    // });
-    //
-    // }
-    // layDateRender();
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender() {
+            layDate.render({
+        elem: '#createTime\\$',
+        type: 'datetime'
+    });
+        layDate.render({
+        elem: '#updateTime\\$',
+        type: 'datetime'
+    });
+
+    }
+    layDateRender();
 
 });
 
diff --git a/src/main/webapp/views/pickout/pickout.html b/src/main/webapp/views/pickout/pickout.html
index 65d6893..5ffc23f 100644
--- a/src/main/webapp/views/pickout/pickout.html
+++ b/src/main/webapp/views/pickout/pickout.html
@@ -86,13 +86,13 @@
                     <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="id" class="layui-input"type="text" name="id" placeholder="缂栧彿" autocomplete="off"/>
+                                    <input name="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>
@@ -136,12 +136,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