From a23b44f21f596c5500bda617050aa72125e2e701 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 07 十月 2023 12:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index acec6aa..d39c441 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -61,15 +61,16 @@
<!-- <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}">鎷ｆ枡鍏ュ簱</button>-->
<!-- </div>-->
- {{#if agvWrkDetl}}
+ {{#if containerMoveOutFlag}}
<div style=" padding-bottom: 20px">
-
<button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="containerMoveOut">瀹瑰櫒绂诲満</button>
- <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">鎷ｆ枡鍏ュ簱</button>
-
</div>
{{/if}}
-
+ {{#if pickInFlag}}
+ <div style=" padding-bottom: 20px">
+ <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">鎷ｆ枡/鐩樼偣鍏ュ簱</button>
+ </div>
+ {{/if}}
<div>
宸ヤ綔绔欑紪鐮侊細{{devNo}} </br>
绔欑偣鐘舵�侊細{{locSts$}}
@@ -204,7 +205,7 @@
});
- //鎷ｆ枡鍏ュ簱
+ //鎷ｆ枡/鐩樼偣鍏ュ簱
form.on('submit(pickIn)', function () {
var devNoList = [];
devNoList.push(this.value);
--
Gitblit v1.9.1