From a2746876e81443d52bc4cb6f35bf8554741a6b4c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 18 十月 2024 14:28:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/platform/components/WaybillDetail.vue | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/platform/components/WaybillDetail.vue b/admin/src/views/platform/components/WaybillDetail.vue
index 066ef82..f51878c 100644
--- a/admin/src/views/platform/components/WaybillDetail.vue
+++ b/admin/src/views/platform/components/WaybillDetail.vue
@@ -27,7 +27,17 @@
<div class="title">鍚堝悓鍒楄〃</div>
<div class="content">
<div class="item" v-for="item in info.wmsJobContractVOList">
- <div class="contract">鍚堝悓鍙凤細{{ item.contractCode }}</div>
+ <div class="contract">
+ <span>鍚堝悓鍙凤細{{ item.contractCode }}</span>
+ <!-- <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 class="placeholder6">鏀惰揣鍦帮細{{ item.address }}</div>
<div class="list">
<div class="line" v-for="line in item.platformWmsDetailList">
@@ -151,6 +161,17 @@
font-size: 15px;
color: #279baa;
margin-bottom: 4px;
+ display: flex;
+ justify-content: space-between;
+ .scs{
+ color: #00ba67;
+ }
+ .pad{
+ color: #f19c3f;
+ }
+ .err{
+ color: red;
+ }
}
.line {
--
Gitblit v1.9.3