From 8603613a12466bd41aaeb8db6da56a56c24f8450 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 04 二月 2024 18:31: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..2b3a658 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 :class="'du-status'+row.status" v-if="row.unitStatus === 0">寰呭鏍�</span>
+ <span v-if="row.unitStatus === 1">
+ <span :class="'du-status'+row.worktypeStatus" v-if="row.worktypeStatus ==null || row.worktypeStatus === 0">宸ョ寰呭</span>
+ <span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 1">瀹℃牳閫氳繃</span>
+ <span :class="'du-status'+row.worktypeStatus" v-else-if="row.worktypeStatus === 2">宸ョ瀹℃牳涓嶉�氳繃</span>
+ </span>
+ <span :class="'du-status'+row.status" v-if="row.unitStatus === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="娣诲姞鏃ユ湡"></el-table-column>
--
Gitblit v1.9.3