From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/shiwai.vue | 84 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index 6f7b9e9..531e6b3 100644
--- a/h5/pages/staff/vehicle/shiwai.vue
+++ b/h5/pages/staff/vehicle/shiwai.vue
@@ -21,7 +21,7 @@
<text>*</text>
<text>棰勮鐢ㄨ溅鏃舵</text>
</view>
- <view class="value" @click="isShowDate = true">
+ <view class="value" @click="showDate">
<text
class="mr6"
:style="{ color: param.startTime ? '#000000' : '#999999' }"
@@ -42,7 +42,7 @@
<view class="line">
<text>鐢ㄨ溅鏃舵</text>
<text>
- {{ item.startTime.slice(5, 16) }}鑷硔{
+ {{ item.startTime.slice(5, 16) }} 鑷� {{
item.endTime.slice(5, 16)
}}</text
>
@@ -66,11 +66,14 @@
</view>
</view>
<view class="main_footer">
- <text>宸查�夋嫨锛�</text>
- <text class="sel" v-if="param.startTime"
- >{{ param.startHours }}鑷硔{ param.endHours }}</text
- >
- <text class="btn" :class="{disable: info && info.length > 0}" @click="onSubmit">纭棰勭害</text>
+ <view class="df_sb">
+ <text>宸查�夋嫨锛�</text>
+ <text class="sel" v-if="param.startTime"
+ >{{ param.startHours }}鑷硔{ param.endHours }}</text
+ >
+ <text class="btn" :class="{disable: info && info.length > 0}" @click="onSubmit">纭棰勭害</text>
+ </view>
+ <view class="red">{{placeStr}}</view>
</view>
<!-- -->
<!-- 閫夋嫨杞﹁締 -->
@@ -83,7 +86,7 @@
@confirm="seletedCar"
@cancel="isShowCar = false"
></u-picker>
- <u-datetime-picker
+ <!-- <u-datetime-picker
mode="datetime"
:show="isShowDate"
:filter="timeFilter"
@@ -93,12 +96,24 @@
:closeOnClickOverlay="true"
@confirm="seletedDate"
@cancel="isShowDate = false"
- />
+ /> -->
+ <u-datetime-picker
+ mode="datetime"
+ :show="isShowDate"
+ ref="startPick"
+ title="寮�濮嬫椂闂�"
+ :formatter="formatter"
+ :minDate="minDate"
+ @close="isShowDate = false"
+ :closeOnClickOverlay="true"
+ @confirm="seletedDate"
+ @cancel="isShowDate = false"
+ />
<u-datetime-picker
mode="datetime"
:show="isShowEndDate"
- :filter="timeFilter"
title="缁撴潫鏃堕棿"
+ :formatter="formatter"
:minDate="new Date(param.startTime || null).getTime()"
@close="endtimeClose"
:closeOnClickOverlay="true"
@@ -121,14 +136,40 @@
carsList: [],
info: [],
- minDate: ''
+ minDate: '',
+ placeStr: ''
}
},
onLoad() {
- this.minDate = new Date(dayjs().format('YYYY-MM-DD HH:') + '00:00').getTime()
+ // this.minDate = new Date(dayjs().format('YYYY-MM-DD HH:mm') + ':00').getTime()
+ this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
this.initData()
},
methods: {
+ formatter(type, value) {
+ if (type === 'year') {
+ return `${value}骞碻
+ }
+ if (type === 'month') {
+ return `${value}鏈坄
+ }
+ if (type === 'day') {
+ return `${value}鏃
+ }
+ if (type === 'hour') {
+ return `${value}鏃禶
+ }
+ if (type === 'minute') {
+ return `${value}鍒哷
+ }
+ return value
+ },
+ showDate() {
+ this.isShowDate = true
+ if (!this.param.startTime) {
+ this.$refs.startPick.innerValue = new Date().getTime()
+ }
+ },
onSubmit() {
const { param, info } = this
if (info.length > 0) return
@@ -188,6 +229,12 @@
if (this.param.carId && this.param.startTime) {
this.getInfo()
}
+ console.log(e);
+ if(new Date(this.param.startTime).getTime() < new Date().getTime() - 60 * 1000){
+ this.placeStr = '褰撳墠閫夋嫨鍖呭惈宸茬粡杩囧幓鏃堕棿锛岃纭鍚庡啀鎻愪氦锛�'
+ }else{
+ this.placeStr = ''
+ }
this.$forceUpdate()
},
endtimeClose() {
@@ -203,7 +250,7 @@
},
initData() {
getCarsList({
- type: 1
+ type: 0
}).then(res => {
this.carsList = [res.data]
})
@@ -316,11 +363,14 @@
left: 0;
background-color: #fff;
bottom: 0;
- padding: 20rpx 30rpx 84rpx;
+ padding: 20rpx 30rpx 62rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
- display: flex;
- align-items: center;
- justify-content: space-between;
+
+ .df_sb{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
.btn {
width: 184rpx;
height: 72rpx;
--
Gitblit v1.9.3