From 10778ff6207c31641187acb487d4b67c0de59b24 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 10:38:51 +0800
Subject: [PATCH] agv增加一个新单号防重复 ,增加一个手动呼叫agv
---
src/main/webapp/views/orderPakoutLog/order.html | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/orderPakoutLog/order.html b/src/main/webapp/views/orderPakoutLog/order.html
index 9df2682..e075926 100644
--- a/src/main/webapp/views/orderPakoutLog/order.html
+++ b/src/main/webapp/views/orderPakoutLog/order.html
@@ -25,6 +25,26 @@
.layui-timeline:first-child .layui-timeline-item {
margin-top: 30px;
}
+
+ .btn-add {
+ display: none;
+ }
+
+ .btn-edit {
+ display: none;
+ }
+
+ .btn-complete {
+ display: none;
+ }
+
+ .btn-delete {
+ display: none;
+ }
+
+ .btn-view {
+ display: none;
+ }
</style>
</head>
@@ -66,7 +86,7 @@
</div>
</div>
<div class="layui-inline">
- <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
+ <button class="layui-btn icon-btn btn-view" lay-filter="tbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
</div>
@@ -92,7 +112,7 @@
<!-- 鎿嶄綔鍒� -->
<script type="text/html" id="operate">
{{# if(!d.monthlySettleId || d.monthlySettleId == 0){ }}
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="editOrderTime">淇敼涓氬姟鏃堕棿</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="editOrderTime">淇敼涓氬姟鏃堕棿</a>
{{# } }}
</script>
<script type="text/html" id="orderNoTpl">
@@ -119,6 +139,13 @@
{{# } }}
>{{d.settle$}}</span>
</script>
+ <script type="text/html" id="monthlySettleTpl">
+ {{# if(d.monthlySettleId && d.monthlySettleId > 0){ }}
+ <span class="layui-badge layui-bg-orange" title="鏈堢粨缂栧彿锛歿{d.monthlySettleNo}}">宸叉湀缁�</span>
+ {{# } else { }}
+ <span class="layui-badge layui-badge-gray">鏈湀缁�</span>
+ {{# } }}
+</script>
<!-- 璁㈠崟浠诲姟杩芥函 -->
<script id="wrkTraceDialog" type="text/html" style="position: relative">
<div style="position: absolute; top: 0; left: 0;">
--
Gitblit v1.9.1