From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/index.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 31b1e0c..9284bd4 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -61,19 +61,18 @@
</el-table-column>
<el-table-column
prop="companyName"
- label="璁垮鍏徃">
+ label="璁垮缁勭粐">
</el-table-column>
<el-table-column
- prop="address"
label="浜哄憳绫诲瀷">
<template slot-scope="{row}">
- <span v-if="row.memberType === 0">鍔冲姟璁垮</span>
- <span v-if="row.memberType === 1">鏅�氳瀹�</span>
- <span v-if="row.memberType === 2">鍐呴儴浜哄憳</span>
+ <span v-if="row.type === 0">鍔冲姟璁垮</span>
+ <span v-if="row.type === 1">鏅�氳瀹�</span>
+ <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
<el-table-column
- prop="endtime"
+ prop="outDate"
label="鎺堟潈鍒版湡鏃堕棿">
</el-table-column>
<el-table-column
@@ -89,7 +88,7 @@
label="澶勭悊"
width="80">
<template slot-scope="scope">
- <el-button type="text" @click="departure(scope.row.id)">绂诲満</el-button>
+ <el-button type="text" @click="departure(scope.row.id)" v-if="scope.row.outStatus === 1">绂诲巶</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3