From 8b00bff78ba86989df613fcc7b09e7f64e135a52 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/strandedPersonnel.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/strandedPersonnel.vue b/admin/src/views/business/strandedPersonnel.vue
index 4ba97d3..1142b04 100644
--- a/admin/src/views/business/strandedPersonnel.vue
+++ b/admin/src/views/business/strandedPersonnel.vue
@@ -45,7 +45,8 @@
<el-table-column prop="outDate" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
<el-table-column label="瓒呮椂鏃堕暱" min-width="100px">
<template slot-scope="{row}">
- <span>{{row.timeOut.toString().replace('-', '')}}</span>
+ <span v-if="row.outStatus === 1">{{row.timeOut.toString().replace('-', '')}}鍒嗛挓</span>
+ <span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="鐘舵��" min-width="100px">
@@ -62,7 +63,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="departure(scope.row.id)">绂诲巶</el-button>
+ <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="departure(row.id)">绂诲巶</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3