From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库: 	显示在库信息,入库完成后显示成功入库的包数 	订单出库页面显示剩余待检包数 (PDA) 	未查询到的提示改为显示物料实际状态 	拣货单已完成,单据未完成 ✔ 	单据数量字段显示变更 ✔ 	拣货单按实际操作时间降序排序 ✔ 	拣货单明细导出 ✔ 	拣货单显示创建时间与操作时间 ✔

---
 src/main/webapp/views/orderCheck/orderCheck.html |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/orderCheck/orderCheck.html b/src/main/webapp/views/orderCheck/orderCheck.html
index c61eea3..5935e23 100644
--- a/src/main/webapp/views/orderCheck/orderCheck.html
+++ b/src/main/webapp/views/orderCheck/orderCheck.html
@@ -93,7 +93,11 @@
 </div>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
+
+  {{# if (d.settle == 0 || d.settle == 1 || d.settle ==2) { }}
   <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="examine">瀹℃牳</a>
+  {{# } }}
+
 
   {{# if (d.settle == 0 || d.settle == 1) { }}
   <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
@@ -185,9 +189,15 @@
 </script>
 
 <script type="text/html" id="editDialog2">
-  <form id="editForm2" lay-filter="editForm" class="layui-form model-form">
+  <form id="editForm2" lay-filter="editForm2" class="layui-form model-form">
     <input name="id" type="hidden"/>
     <div class="layui-form-item">
+      <label class="layui-form-label">鐩樼偣鍗曞彿锛�</label>
+      <div class="layui-input-block">
+        <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+        <!--                lay-verify="required"-->
+      </div>
+    </div>
 
 
 
@@ -200,7 +210,7 @@
     </div>
     <div class="layui-form-item text-right">
       <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
-      <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
+      <button class="layui-btn" lay-filter="examine" lay-submit>瀹屾垚瀹℃牳</button>
     </div>
   </form>
 </script>

--
Gitblit v1.9.1