|
|
@@ -78,6 +78,38 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="直播ID" prop="liveId">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.liveId"
|
|
|
+ placeholder="请输入直播id"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="发货时间">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="deliverySendTimeRange"
|
|
|
+ type="datetimerange"
|
|
|
+ size="small"
|
|
|
+ clearable
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始时间"
|
|
|
+ end-placeholder="结束时间"
|
|
|
+ @change="handleDeliveryTimeChange"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="员工姓名" prop="companyUserName">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.companyUserName"
|
|
|
+ placeholder="请输入员工姓名"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item style="margin-left: 20px;">
|
|
|
<el-button type="text" :icon="isCollapsed ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" @click="upDown">{{ isCollapsed ? '展开' : '收起' }} </el-button>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
@@ -133,21 +165,31 @@
|
|
|
/>
|
|
|
</el-form-item> -->
|
|
|
|
|
|
- <el-form-item label="支付时间" prop="payTime">
|
|
|
- <el-date-picker clearable size="small"
|
|
|
- v-model="queryParams.payTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择支付时间">
|
|
|
- </el-date-picker>
|
|
|
+ <el-form-item label="支付时间">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="payTimeRange"
|
|
|
+ type="datetimerange"
|
|
|
+ size="small"
|
|
|
+ clearable
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始时间"
|
|
|
+ end-placeholder="结束时间"
|
|
|
+ @change="handlePayTimeChange"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="完成时间" prop="finishTime">
|
|
|
- <el-date-picker clearable size="small"
|
|
|
- v-model="queryParams.finishTime"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择完成时间">
|
|
|
- </el-date-picker>
|
|
|
+ <el-form-item label="完成时间">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="finishTimeRange"
|
|
|
+ type="datetimerange"
|
|
|
+ size="small"
|
|
|
+ clearable
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始时间"
|
|
|
+ end-placeholder="结束时间"
|
|
|
+ @change="handleFinishTimeChange"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -175,6 +217,7 @@
|
|
|
<el-table border v-loading="loading" :data="liveOrderList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="订单号" align="center" prop="orderCode" />
|
|
|
+ <el-table-column label="直播ID" align="center" prop="liveId" />
|
|
|
<el-table-column label="所属公司" align="center" prop="companyName" />
|
|
|
<el-table-column label="所属员工" align="center" prop="companyUserName" />
|
|
|
<el-table-column label="用户ID" align="center" prop="userId" />
|
|
|
@@ -280,6 +323,8 @@ export default {
|
|
|
payTimeRange: [],
|
|
|
// 完成时间范围选择器绑定的值
|
|
|
finishTimeRange: [],
|
|
|
+ // 发货时间范围选择器绑定的值
|
|
|
+ deliverySendTimeRange: [],
|
|
|
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
@@ -296,12 +341,15 @@ export default {
|
|
|
deliveryCode: null,
|
|
|
deliveryName: null,
|
|
|
deliverySn: null,
|
|
|
+ deliverySendTimeStart: null,
|
|
|
+ deliverySendTimeEnd: null,
|
|
|
// 移除单个时间字段,改为范围字段
|
|
|
payStartTime: null,
|
|
|
payEndTime: null,
|
|
|
finishTimeStart: null,
|
|
|
finishTimeEnd: null,
|
|
|
status: null,
|
|
|
+ companyUserName: null,
|
|
|
},
|
|
|
orderOptions: [],
|
|
|
actName: "10",
|
|
|
@@ -359,6 +407,16 @@ export default {
|
|
|
this.queryParams.finishTimeEnd = null;
|
|
|
}
|
|
|
},
|
|
|
+ // 发货时间范围选择变化处理
|
|
|
+ handleDeliveryTimeChange(value) {
|
|
|
+ if (value && value.length === 2) {
|
|
|
+ this.queryParams.deliverySendTimeStart = value[0] + ' 00:00:00';
|
|
|
+ this.queryParams.deliverySendTimeEnd = value[1] + ' 23:59:59';
|
|
|
+ } else {
|
|
|
+ this.queryParams.eliverySendTimeStart = null;
|
|
|
+ this.queryParams.deliverySendTimeEnd = null;
|
|
|
+ }
|
|
|
+ },
|
|
|
|
|
|
// 查看详情
|
|
|
handledetails(row){
|