|
|
@@ -1,20 +1,6 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
|
|
|
- <el-form-item label="公司名" prop="companyId">
|
|
|
- <el-select filterable v-model="queryParams.companyId" placeholder="请选择公司名" @change="companyChange" clearable size="small">
|
|
|
- <el-option
|
|
|
- v-for="item in companys"
|
|
|
- :key="item.companyId"
|
|
|
- :label="item.companyName"
|
|
|
- :value="item.companyId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item>
|
|
|
- <treeselect style="width: 220px" :clearable="false" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
|
|
|
- </el-form-item>
|
|
|
|
|
|
<el-form-item label="订单类型" prop="orderTypeFilter">
|
|
|
<el-select v-model="queryParams.orderTypeFilter" placeholder="请选择订单类型" clearable size="small">
|
|
|
@@ -295,6 +281,7 @@
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
@change="handleOrderTimeChange"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -310,6 +297,7 @@
|
|
|
format="yyyy-MM-dd HH:mm:ss"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
@change="handlePayTimeChange"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -916,40 +904,10 @@ export default {
|
|
|
this.getList()
|
|
|
},
|
|
|
handleOrderTimeChange(value) {
|
|
|
- if (value && value.length === 2) {
|
|
|
- // 如果结束时间不是当天的23:59:59,则自动设置为当天的23:59:59
|
|
|
- const endDateStr = value[1]
|
|
|
- const datePart = endDateStr.split(' ')[0] // 获取日期部分
|
|
|
- const timePart = endDateStr.split(' ')[1] // 获取时间部分
|
|
|
-
|
|
|
- // 如果时间部分不是23:59:59,则设置为23:59:59
|
|
|
- if (timePart !== '23:59:59') {
|
|
|
- const newEndTime = datePart + ' 23:59:59'
|
|
|
- this.createTimeRange = [value[0], newEndTime]
|
|
|
- this.queryParams.createTimeStart = value[0]
|
|
|
- this.queryParams.createTimeEnd = newEndTime
|
|
|
- } else {
|
|
|
- this.queryParams.createTimeStart = value[0]
|
|
|
- this.queryParams.createTimeEnd = value[1]
|
|
|
- }
|
|
|
- } else {
|
|
|
- this.queryParams.createTimeStart = null
|
|
|
- this.queryParams.createTimeEnd = null
|
|
|
- }
|
|
|
+
|
|
|
},
|
|
|
handlePayTimeChange(value) {
|
|
|
- if (value && value.length === 2) {
|
|
|
- // 如果结束时间不是当天的23:59:59,则自动设置为当天的23:59:59
|
|
|
- const endDateStr = value[1]
|
|
|
- const datePart = endDateStr.split(' ')[0] // 获取日期部分
|
|
|
- const timePart = endDateStr.split(' ')[1] // 获取时间部分
|
|
|
-
|
|
|
- // 如果时间部分不是23:59:59,则设置为23:59:59
|
|
|
- if (timePart !== '23:59:59') {
|
|
|
- const newEndTime = datePart + ' 23:59:59'
|
|
|
- this.payTimeRange = [value[0], newEndTime]
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
},
|
|
|
/** 导出订单 */
|
|
|
handleExport() {
|