From fc38ef283d254bc4c6b700cfefcb0a6e65f19ba7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 17:57:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/sendACar.vue | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/h5/pages/staff/vehicle/sendACar.vue b/h5/pages/staff/vehicle/sendACar.vue
index f11605d..b243345 100644
--- a/h5/pages/staff/vehicle/sendACar.vue
+++ b/h5/pages/staff/vehicle/sendACar.vue
@@ -18,7 +18,7 @@
class="box_list_item"
v-for="(item, index) in dataList"
:key="index"
- @click="itemDetail(item)"
+ @click="itemDetail(item)"
>
<view class="box_list_item_head">
<text>{{ item.carCode }}</text>
@@ -61,10 +61,11 @@
<!-- 鏃ユ湡 -->
<u-datetime-picker
mode="date"
+ v-model="param.queryDate"
:show="isShowDate"
:minDate="minDate"
+ closeOnClickOverlay
@close="isShowDate = false"
- :closeOnClickOverlay="true"
@confirm="seletedDate"
@cancel="isShowDate = false"
/>
@@ -81,6 +82,7 @@
isShowDate: false,
carsList: [],
param: {
+ queryDate: dayjs().format('YYYY-MM-DD'),
memberId: uni.getStorageSync('userInfo').memberId
},
minDate: '',
@@ -89,7 +91,7 @@
capacity: 10
},
total: 0,
- dataList: []
+ dataList: [],
}
},
onLoad() {
@@ -107,6 +109,10 @@
getList() {
const { param, pagination } = this
pagination.page = pagination.page + 1
+ if (param.queryDate) {
+ param.queryStartTime = param.queryDate + ' 00:00:00'
+ param.queryEndTime = param.queryDate + ' 23:59:59'
+ }
carUseBookPaiche({
...pagination,
model: { ...param }
@@ -119,28 +125,26 @@
this.total = res.data.total
})
},
- itemDetail(item) {
- uni.navigateTo({
- url: "/pages/staff/vehicle/sendACarDetail?id=" + item.id
- })
- },
+ itemDetail(item) {
+ uni.navigateTo({
+ url: "/pages/staff/vehicle/sendACarDetail?id=" + item.id
+ })
+ },
seletedCar(e) {
const item = e.value[0]
+ this.pagination.page = 0
this.$set(this.param, 'carCode', item.code)
this.$set(this.param, 'carId', item.id)
this.isShowCar = false
- if (this.param.carId && this.param.queryDate) {
- this.pagination.page = 0
- this.getList()
- }
+ this.getList()
},
seletedDate(e) {
- this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
- this.isShowDate = false
- if (this.param.carId && this.param.queryDate) {
+ setTimeout(() => {
+ this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
this.pagination.page = 0
+ this.isShowDate = false
this.getList()
- }
+ })
},
endtimeClose() {
this.param.endTime = ''
@@ -214,9 +218,9 @@
.error {
color: #e0312a;
}
- .grr{
- color: #999999;
- }
+ .grr {
+ color: #999999;
+ }
text {
&:nth-child(1) {
font-size: 32rpx;
--
Gitblit v1.9.3