|
@@ -55,10 +55,14 @@
|
|
|
<el-form-item label="提交时间:">
|
|
|
<el-date-picker
|
|
|
class="input-width"
|
|
|
- v-model="listQuery.createTime"
|
|
|
+ v-model="listQuery.dateRange"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
- type="date"
|
|
|
+ type="daterange"
|
|
|
placeholder="请选择时间"
|
|
|
+ range-separator="~"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ style="width: 260px;"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
@@ -285,6 +289,7 @@
|
|
|
import { fetchList, closeOrder, deleteOrder } from "@/api/order";
|
|
|
import { formatDate } from "@/utils/date";
|
|
|
import { Export } from "@/utils/downLoadFile";
|
|
|
+import dayjs from 'dayjs'
|
|
|
import LogisticsDialog from "@/views/oms/order/components/logisticsDialog";
|
|
|
const defaultListQuery = {
|
|
|
pageNum: 1,
|
|
@@ -294,7 +299,9 @@ const defaultListQuery = {
|
|
|
status: null,
|
|
|
orderType: null,
|
|
|
sourceType: null,
|
|
|
+ dateRange: [],
|
|
|
createTime: null,
|
|
|
+ endTime: null,
|
|
|
};
|
|
|
export default {
|
|
|
name: "orderList",
|
|
@@ -547,7 +554,17 @@ export default {
|
|
|
},
|
|
|
getList() {
|
|
|
this.listLoading = true;
|
|
|
- fetchList(this.listQuery).then((response) => {
|
|
|
+ console.log(this.listQuery, 'listQuery')
|
|
|
+ let { dateRange, createTime, endTime, ...res } = this.listQuery
|
|
|
+ if(dateRange && dateRange.length > 0) {
|
|
|
+ createTime = dayjs(dateRange[0]).format('YYYY-MM-DD')
|
|
|
+ endTime = dayjs(dateRange[1]).format('YYYY-MM-DD')
|
|
|
+ }
|
|
|
+ fetchList({
|
|
|
+ createTime: createTime,
|
|
|
+ endTime: endTime,
|
|
|
+ ...res
|
|
|
+ }).then((response) => {
|
|
|
this.listLoading = false;
|
|
|
this.list = response.data.list;
|
|
|
this.total = response.data.total;
|