|
|
@@ -100,6 +100,19 @@
|
|
|
@change="handleDeliveryTimeChange"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="下单时间">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="createTimeRange"
|
|
|
+ type="daterange"
|
|
|
+ size="small"
|
|
|
+ clearable
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ @change="handleCreateTimeChange"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
|
|
|
<el-form-item label="员工姓名" prop="companyUserName">
|
|
|
<el-input
|
|
|
@@ -227,6 +240,11 @@
|
|
|
<dict-tag :options="deliveryTypeOptions" :value="item.row.deliveryType"/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="下单时间" align="center" prop="createTime" width="180">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ scope.row.createTime }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="支付时间" align="center" prop="payTime" width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ scope.row.payTime }}</span>
|
|
|
@@ -238,7 +256,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
|
|
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
@@ -310,6 +328,8 @@ export default {
|
|
|
payTimeRange: [],
|
|
|
// 发货时间范围选择器绑定的值
|
|
|
deliverySendTimeRange: [],
|
|
|
+ // 下单时间范围选择器绑定的值
|
|
|
+ createTimeRange: [],
|
|
|
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
@@ -328,6 +348,9 @@ export default {
|
|
|
deliverySn: null,
|
|
|
deliverySendTimeStart: null,
|
|
|
deliverySendTimeEnd: null,
|
|
|
+ // 下单时间范围(按天,开始 00:00:00,结束 23:59:59)
|
|
|
+ createTimeStart: null,
|
|
|
+ createTimeEnd: null,
|
|
|
// 移除单个时间字段,改为范围字段
|
|
|
payStartTime: null,
|
|
|
payEndTime: null,
|
|
|
@@ -392,6 +415,16 @@ export default {
|
|
|
this.queryParams.deliverySendTimeEnd = null;
|
|
|
}
|
|
|
},
|
|
|
+ // 下单时间范围选择变化处理(按天,开始 00:00:00,结束 23:59:59)
|
|
|
+ handleCreateTimeChange(value) {
|
|
|
+ if (value && value.length === 2) {
|
|
|
+ this.queryParams.createTimeStart = value[0].substring(0, 10);
|
|
|
+ this.queryParams.createTimeEnd = value[1].substring(0, 10);
|
|
|
+ } else {
|
|
|
+ this.queryParams.createTimeStart = null;
|
|
|
+ this.queryParams.createTimeEnd = null;
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
// 查看详情
|
|
|
handledetails(row){
|
|
|
@@ -451,6 +484,7 @@ export default {
|
|
|
// 同时清空范围选择器的值
|
|
|
this.payTimeRange = [];
|
|
|
this.deliverySendTimeRange = [];
|
|
|
+ this.createTimeRange = [];
|
|
|
this.searchKey= '';
|
|
|
this.queryParams[this.searchType]=null;
|
|
|
// 清空时间范围参数
|
|
|
@@ -458,6 +492,8 @@ export default {
|
|
|
this.queryParams.payEndTime = null;
|
|
|
this.queryParams.deliverySendTimeStart = null;
|
|
|
this.queryParams.deliverySendTimeEnd = null;
|
|
|
+ this.queryParams.createTimeStart = null;
|
|
|
+ this.queryParams.createTimeEnd = null;
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
|