From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/staff/vehicle/apply.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index 61bed1d..c2e224f 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -14,7 +14,7 @@
           >
             <text v-if="param.startTime">
               {{ param.startTime.slice(5, 16) }}鑷硔{
-                param.endTime.slice(11, 16)
+                param.endTime.slice(5, 16)
               }}
             </text>
             <text v-else>璇烽�夋嫨</text>
@@ -91,7 +91,13 @@
             }"
           >
             <text v-if="param.memberNames">
-              {{ param.memberNames }}
+              <text v-for="mem,i in param.memberList" :key="mem.id">
+								<template v-if="i < 2">
+									<text>{{ mem.name }}</text>
+									<text v-if="i < 1 && param.memberList.length > 1">,</text>
+								</template>
+							</text>
+							<text v-if="param.memberList.length > 2">绛墈{ param.memberList.length }}浜�</text>
             </text>
             <text v-else>璇烽�夋嫨</text>
           </text>
@@ -209,7 +215,6 @@
       this.$jump('/pages/staff/vehicle/applePeo')
     },
     confirmDate(e) {
-
       this.param.planUseDate = dayjs(e.value).format('YYYY-MM-DD HH:mm')
       this.isShowDatetime = false
     }

--
Gitblit v1.9.3