From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/apply.vue | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index 174c512..d0fa466 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>
@@ -80,7 +80,7 @@
<text>*</text>
<text>涔樿溅浜哄憳</text>
</view>
- <view class="value" @click="$jump('/pages/staff/vehicle/applePeo')">
+ <view class="value" @click="selPeople">
<text
class="mr6"
:style="{
@@ -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() {
@@ -200,8 +210,15 @@
}
})
},
+ selPeople() {
+ if (this.param.memberList && this.param.memberList.length > 0) {
+ setTimeout(() => {
+ this.$eventBus.$emit('applePeoDetail', this.param.memberList || [])
+ }, 500)
+ }
+ this.$jump('/pages/staff/vehicle/applePeo')
+ },
confirmDate(e) {
-
this.param.planUseDate = dayjs(e.value).format('YYYY-MM-DD HH:mm')
this.isShowDatetime = false
}
@@ -210,13 +227,19 @@
</script>
<style lang="scss">
+ page{
+ background-color: #f7f7f7;
+ }
.main_wrap {
.line {
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1rpx solid #e5e5e5;
- padding: 30rpx 0;
+ padding: 30rpx;
+ background-color: #fff;
+ width: 750rpx;
+ margin: 0 -30rpx;
.label {
font-size: 30rpx;
font-weight: 400;
@@ -245,11 +268,14 @@
}
}
.upload_line {
- padding: 30rpx 0;
+ padding: 30rpx;
+ width: 750rpx;
+ margin: 0 -30rpx;
+ background-color: #fff;
textarea {
margin-top: 12rpx;
width: 100%;
- height: 180rpx;
+ height: 120rpx;
font-size: 28rpx;
font-weight: 400;
color: #222222;
@@ -274,14 +300,15 @@
}
}
.sub_btn {
- position: fixed;
- bottom: 84rpx;
- left: 30rpx;
+ // position: fixed;
+ // bottom: 84rpx;
+ // left: 30rpx;
+ margin-top: 60rpx;
width: 690rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center;
- background: #279baa;
+ background: $uni-color-primary;
box-shadow: 0rpx -1rpx 0rpx 0rpx #eeeeee;
border-radius: 44rpx;
font-size: 30rpx;
@@ -289,7 +316,7 @@
}
.tip {
background: #f7f7f7;
- padding: 30rpx 30rpx 180rpx;
+ padding: 30rpx 30rpx 10rpx;
margin: 0 -30rpx;
.title {
line-height: 40rpx;
--
Gitblit v1.9.3