|
@@ -22,14 +22,14 @@
|
|
<!-- <el-date-picker v-model="createTime" @change="setCreateTime" type="datetimerange"-->
|
|
<!-- <el-date-picker v-model="createTime" @change="setCreateTime" type="datetimerange"-->
|
|
<!-- range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />-->
|
|
<!-- range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />-->
|
|
<!-- </el-form-item>-->
|
|
<!-- </el-form-item>-->
|
|
- <el-form-item label="下单时间" class="w-[440px]">
|
|
|
|
- <el-date-picker v-model="checkoutTime" @change="setCheckoutTime" type="datetimerange"
|
|
|
|
- range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />
|
|
|
|
|
|
+ <el-form-item label="下单日期" class="w-[340px]">
|
|
|
|
+ <el-date-picker v-model="checkoutTime" @change="setCheckoutTime" type="daterange"
|
|
|
|
+ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item class="w-[280px]">
|
|
<el-form-item class="w-[280px]">
|
|
<el-button type="primary" @click="resetPage">查询</el-button>
|
|
<el-button type="primary" @click="resetPage">查询</el-button>
|
|
<el-button @click="resetParams">重置</el-button>
|
|
<el-button @click="resetParams">重置</el-button>
|
|
- <el-button type="success" @click="download">下载</el-button>
|
|
|
|
|
|
+ <el-button type="success" @click="download">导出</el-button>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</el-card>
|
|
</el-card>
|
|
@@ -220,11 +220,17 @@
|
|
}
|
|
}
|
|
const setCheckoutTime = (v : any) => {
|
|
const setCheckoutTime = (v : any) => {
|
|
queryParams.checkoutTime = ''
|
|
queryParams.checkoutTime = ''
|
|
- if (v.length > 0) {
|
|
|
|
- queryParams.checkoutTime =
|
|
|
|
- Math.round(v[0].getTime() / 1000).toString() +
|
|
|
|
- ',' +
|
|
|
|
- Math.round(v[1].getTime() / 1000).toString()
|
|
|
|
|
|
+ if (v && v.length === 2) {
|
|
|
|
+ // 开始时间保持不变
|
|
|
|
+ const startTime = Math.round(v[0].getTime() / 1000).toString()
|
|
|
|
+
|
|
|
|
+ // 结束时间设置为当天的23:59:59
|
|
|
|
+ const endDate = new Date(v[1])
|
|
|
|
+ endDate.setHours(23, 59, 59, 999)
|
|
|
|
+ console.log('End Date:', endDate) // 调试输出
|
|
|
|
+ const endTime = Math.round(endDate.getTime() / 1000).toString()
|
|
|
|
+
|
|
|
|
+ queryParams.checkoutTime = startTime + ',' + endTime
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// watch(queryParams, (newV, oldV) => {
|
|
// watch(queryParams, (newV, oldV) => {
|