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'
---
h5/pages/staff/vehicle/apply.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index fa6f395..23ad5ae 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,15 @@
}"
>
<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>
@@ -126,14 +134,16 @@
<view class="line"
>4銆佸叕鍙稿�熺粰鐢宠浜虹敤杞︼紝鐢宠鍊熻溅浜轰负绗竴璐ｄ换浜猴紝涓嶅厑璁歌浆鍊熺粰鍏朵粬浜轰娇鐢紝鑻ヨ鍊熺粰浠栦汉浣跨敤銆傝矗浠讳汉瑕佹壙鎷呭叏閮ㄨ矗浠汇��</view
>
+ <view class="sub_btn" @click="handleSub">鎻愪氦</view>
</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>
@@ -162,7 +172,7 @@
console.log(option)
this.param = { ...option }
this.minDate = new Date().getTime()
-
+ this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
},
methods: {
handleSub() {
@@ -201,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)
@@ -281,9 +291,10 @@
}
}
.sub_btn {
- position: fixed;
- bottom: 84rpx;
- left: 30rpx;
+ // position: fixed;
+ // bottom: 84rpx;
+ // left: 30rpx;
+ margin-top: 60rpx;
width: 690rpx;
height: 88rpx;
line-height: 88rpx;
--
Gitblit v1.9.3