From b27b54d5dda5a2525a17d8d134a2a93c2ba09893 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 十月 2024 11:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/components/WaybillDetail.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/platform/components/WaybillDetail.vue b/admin/src/views/platform/components/WaybillDetail.vue
index f3a4446..f51878c 100644
--- a/admin/src/views/platform/components/WaybillDetail.vue
+++ b/admin/src/views/platform/components/WaybillDetail.vue
@@ -29,13 +29,14 @@
<div class="item" v-for="item in info.wmsJobContractVOList">
<div class="contract">
<span>鍚堝悓鍙凤細{{ item.contractCode }}</span>
- <div>
+ <!-- <div> -->
<span class="scs" v-if="item.status == 1">WMS浣滀笟宸插畬鎴�</span>
<span class="pad" v-if="item.status == 0">WMS浣滀笟鏈畬鎴�</span>
<span class="err" v-if="item.status == 2">WMS浣滀笟宸插彇娑�</span>
+
<span class="scs" v-if="item.lockStatus == 1">鐢靛瓙閿佸凡涓婇攣</span>
<span class="pad" v-if="item.lockStatus == 0">鐢靛瓙閿佹湭涓婇攣</span>
- </div>
+ <!-- </div> -->
</div>
<div class="placeholder6">鏀惰揣鍦帮細{{ item.address }}</div>
<div class="list">
--
Gitblit v1.9.3