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/views/enterprise/dispatchUnit.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/company/src/views/enterprise/dispatchUnit.vue b/company/src/views/enterprise/dispatchUnit.vue
index 5d7a04b..2c8f05b 100644
--- a/company/src/views/enterprise/dispatchUnit.vue
+++ b/company/src/views/enterprise/dispatchUnit.vue
@@ -26,11 +26,15 @@
</template>
</el-table-column>
<el-table-column prop="name" label="娲鹃仯鍗曚綅"></el-table-column>
- <el-table-column label="浼佷笟鐘舵��">
+ <el-table-column label="娲鹃仯鍗曚綅鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.unitStatus === 0">寰呭鏍�</span>
- <span v-if="row.unitStatus === 1" style="color: green;">瀹℃牳閫氳繃</span>
- <span v-if="row.unitStatus === 2" style="color: red;">瀹℃牳涓嶉�氳繃</span>
+ <span style="color: #2E68EC" v-if="row.unitStatus === 0">寰呭鏍�</span>
+ <span v-if="row.unitStatus === 1">
+ <span style="color:#2E68EC" v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">宸ョ寰呭</span>
+ <span style="color: green" v-else-if="row.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span style="color: red" v-else-if="row.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ </span>
+ <span style="color: red" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="娣诲姞鏃ユ湡"></el-table-column>
--
Gitblit v1.9.3