From 7e10622ead5bd8b3ce0c9fda39d22ae0e938e030 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 12 九月 2025 13:44:10 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/webapp/views/order/order.html | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wms/src/main/webapp/views/order/order.html b/zy-asrs-wms/src/main/webapp/views/order/order.html
index ac90e29..3aa8f67 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/order.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/order.html
@@ -54,6 +54,11 @@
<input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
@@ -73,6 +78,7 @@
<option value="2">浣滀笟涓�</option>
<option value="4">宸插畬鎴�</option>
<option value="6">涓婃姤瀹屾垚</option>
+ <option value="7">涓婃姤澶辫触</option>
</select>
</div>
</div>
@@ -99,14 +105,14 @@
<script type="text/html" id="operate">
{{# if (d.settle == 1 || d.settle == 2) { }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="editEnd">杞巻鍙叉。妗�</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="editEnd">杞巻鍙叉。妗�</a>-->
{{# if (d.settle == 2) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
<a class="layui-btn layui-btn-primary layui-border-green layui-btn-xs" lay-event="cancel"><i class="layui-icon">;</i> 鍙栨秷浠诲姟</a>
{{# } }}
{{# } }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
-
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="dy">鎵撳嵃</a>
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
@@ -149,7 +155,7 @@
<div class="layui-form-item">
<label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
+ <input class="layui-input" id="docType" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
<input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
@@ -178,6 +184,11 @@
<button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
</div>
</form>
+</script>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="formSSXMTableBar">
@@ -257,18 +268,18 @@
</div>
<table class="layui-table" lay-skin="nob" style="width: 80%">
- <thead>
- <tr style="background: none">
- <td>No.</td>
- <td>鍟嗗搧缂栧彿</td>
- <td>鏁伴噺</td>
- </tr>
- </thead>
<tbody>
{{# layui.each(item.wrkDetls, function(idx, wrkDetl){ }}
- <tr>
+ <tr style="background: none">
+ <td>No.</td>
<td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
+ </tr>
+ <tr style="background: none">
+ <td>鐗╂枡鍙凤細</td>
<td>{{ wrkDetl.matnr }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>鏁伴噺锛�</td>
<td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
</tr>
{{# }); }}
--
Gitblit v1.9.1