From 0f2fe7499e107ffd98bf41800045f16bb2f246d3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 十月 2024 16:47:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/operation/OperCarUseBookParamWindow.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/admin/src/components/operation/OperCarUseBookParamWindow.vue b/admin/src/components/operation/OperCarUseBookParamWindow.vue
index c571bcb..64f9063 100644
--- a/admin/src/components/operation/OperCarUseBookParamWindow.vue
+++ b/admin/src/components/operation/OperCarUseBookParamWindow.vue
@@ -139,7 +139,7 @@
v-for="(item, i) in timeList"
:key="i"
>
- {{ item.startHours }}-{{ item.endHours }}
+ {{ item.startHours }} - {{ item.endHours }}
</div>
</div>
</div>
@@ -168,20 +168,22 @@
<el-form-item label="鐢ㄨ溅寮�濮嬫椂闂�" prop="startTime">
<el-date-picker
v-model="form.startTime"
- format="yyyy-MM-dd HH:mm"
+ format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
- :picker-options="pickerOptions"
- @change="seletedShiwaiDate"
+ :default-time="defaultTime"
+ :picker-options="pickerOptionsNow"
+ @change="seletedShiwaiDate(1)"
>
</el-date-picker>
</el-form-item>
<el-form-item label="鐢ㄨ溅缁撴潫鏃堕棿" prop="endTime">
<el-date-picker
v-model="form.endTime"
- format="yyyy-MM-dd HH:mm"
+ format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
+ :default-time="defaultTime"
:picker-options="pickerOptions"
@change="seletedShiwaiDate"
>
@@ -283,6 +285,7 @@
memberList: [],
timeList: [],
+ defaultTime: dayjs().format('HH:mm:ss'),
selDatetime: '',
colorOptions: [
{ color: this.$store.state.primaryColor, name: '宸查�夋嫨' },
@@ -329,6 +332,11 @@
},
selectableRange: '00:00:00 - 23:59:59'
},
+ pickerOptionsNow: {
+ disabledDate: (time) => {
+ return time.getTime() < Date.now() - 8.64e7;
+ }
+ },
// 楠岃瘉瑙勫垯
rules: {
type: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
@@ -350,16 +358,6 @@
handler (newValue, oldValue) {
if (newValue) {
this.$set(this.pickerOptions, 'selectableRange', this.form.startTime.slice(11, 19) + ' - ' + this.form.endTime.slice(11, 19))
- // this.startPickerOptions = this.startPickerOptions
- }
- },
- deep: true,
- immediate: true
- },
- 'form.startTime': {
- handler (newValue, oldValue) {
- if (newValue) {
- this.$set(this.pickerOptions, 'selectableRange', this.form.startTime.slice(11, 19) + ' - ' + '23:59:59')
// this.startPickerOptions = this.startPickerOptions
}
},
@@ -417,6 +415,7 @@
this.isShowTime = true
} else {
this.clearTime()
+ this.selDatetime = ''
this.isShowShiwai = true
}
},
@@ -505,10 +504,13 @@
seletedDate (e) {
this.gettimes()
},
- seletedShiwaiDate () {
+ seletedShiwaiDate (str) {
const { form } = this
+ if(str && str == 1){
+ this.$set(this.form, 'endTime', '')
+ }
if (form.startTime && form.endTime) {
- this.selDatetime = form.startTime + '-' + form.endTime
+ this.selDatetime = form.startTime + ' - ' + form.endTime
carUseBookList({
carId: form.carId,
startTime: form.startTime,
--
Gitblit v1.9.3