From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/operation/serviceCar/apprRecord.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index f8099c4..784b850 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -120,32 +120,41 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
+ prop="carCode"
+ label="杞︾墝鍙�"
+ min-width="100px"
+ ></el-table-column>
+ <el-table-column
prop="memberName"
label="鎻愭姤浜�"
min-width="80px"
+ ></el-table-column>
+ <el-table-column
+ prop="memberNames"
+ label="涔樿溅浜�"
+ min-width="180px"
></el-table-column>
<el-table-column
prop="companyName"
label="鎵�灞炵粍缁�"
min-width="150px"
></el-table-column>
- <el-table-column
- prop="carCode"
- label="杞︾墝鍙�"
- min-width="100px"
- ></el-table-column>
<el-table-column label="鐢ㄨ溅鏃堕棿" min-width="170px">
<template slot-scope="{ row }">
- <span>璧�:{{ row.startTime || "" }}</span
+ <span v-if="row.startTime">璧�:{{ row.startTime.slice(0,16) }}</span
><br />
- <span>姝�:{{ row.endTime || "" }}</span>
+ <span v-if="row.endTime">姝�:{{ row.endTime.slice(0,16) }}</span>
</template>
</el-table-column>
<el-table-column
prop="planUseDate"
label="鍑哄彂鏃堕棿"
min-width="150px"
- ></el-table-column>
+ >
+ <template slot-scope="{ row }">
+ <span v-if="row.planUseDate">{{ row.planUseDate.slice(0,16) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鐩殑鍦�" min-width="200px">
<template slot-scope="{ row }">
<span class="status-green" v-if="row.type === 0">銆愬競鍐呫��</span>
--
Gitblit v1.9.3