From 97e1b9d6c8d7da0891aa7a1e00116b4b14e1b942 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/apply.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index c2e224f..87d9c52 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -91,13 +91,15 @@
}"
>
<text v-if="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 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>
@@ -135,11 +137,13 @@
</view>
<view class="sub_btn" @click="handleSub">鎻愪氦</view>
<!-- -->
+ <!-- :minDate="new Date(param.startTime).getTime()"
+ :maxDate="new Date(param.endTime).getTime()" -->
<u-datetime-picker
:show="isShowDatetime"
+ @confirm="confirmDate"
:minDate="new Date(param.startTime).getTime()"
:maxDate="new Date(param.endTime).getTime()"
- @confirm="confirmDate"
@cancel="isShowDatetime = false"
mode="datetime"
></u-datetime-picker>
@@ -207,7 +211,7 @@
})
},
selPeople() {
- if(this.param.memberList && this.param.memberList.length > 0){
+ if (this.param.memberList && this.param.memberList.length > 0) {
setTimeout(() => {
this.$eventBus.$emit('applePeoDetail', this.param.memberList || [])
}, 500)
--
Gitblit v1.9.3