From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 company/src/components/enterprise/dispatchUnitDetails.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/company/src/components/enterprise/dispatchUnitDetails.vue b/company/src/components/enterprise/dispatchUnitDetails.vue
index 33c07bd..da04967 100644
--- a/company/src/components/enterprise/dispatchUnitDetails.vue
+++ b/company/src/components/enterprise/dispatchUnitDetails.vue
@@ -18,9 +18,13 @@
                 </div>
                 <div class="info_list_item">
                     <div class="info_list_item_label">娲鹃仯鍗曚綅鐘舵�侊細</div>
-                    <div class="info_list_item_val" v-if="form.unitStatus === 0">寰呭鏍�</div>
-                    <div class="info_list_item_val" style="color: green;" v-if="form.unitStatus === 1">瀹℃牳閫氳繃</div>
-                    <div class="info_list_item_val" style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
+                    <div class="info_list_item_val" style="color:#2E68EC;" v-if="form.unitStatus === 0">寰呭鏍�</div>
+                    <div class="info_list_item_val"   v-if="form.unitStatus === 1">
+                        <span style="color:#2E68EC;" v-if="form.worktypeStatus  ==null||form.worktypeStatus === 0">宸ョ寰呭</span>
+                        <span style="color: green" v-if="form.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+                        <span style="color: red;" v-if="form.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+                    </div>
+                    <div class="info_list_item_val"  style="color: red;" v-if="form.unitStatus === 2">瀹℃牳涓嶉�氳繃</div>
                 </div>
                 <div class="info_list_item">
                     <div class="info_list_item_label">娲鹃仯鍗曚綅璇﹁堪锛�</div>

--
Gitblit v1.9.3