修改订单搜索
This commit is contained in:
@@ -65,6 +65,8 @@ public class PrcOrderBill extends BaseEntity
|
|||||||
private Date orderTime;
|
private Date orderTime;
|
||||||
/** 上游订单状态 ORDER_STATUS */
|
/** 上游订单状态 ORDER_STATUS */
|
||||||
private Integer orderStatus;
|
private Integer orderStatus;
|
||||||
|
/** 查询用:多个订单状态 */
|
||||||
|
private List<Integer> orderStatuses;
|
||||||
/** 是否收货:0否/1是 */
|
/** 是否收货:0否/1是 */
|
||||||
private Integer blPickup;
|
private Integer blPickup;
|
||||||
/** 收货时间 PICKUP_DATE */
|
/** 收货时间 PICKUP_DATE */
|
||||||
|
|||||||
@@ -307,6 +307,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="creditArrearsStatus != null and creditArrearsStatus != ''">
|
<if test="creditArrearsStatus != null and creditArrearsStatus != ''">
|
||||||
AND p.credit_arrears_status = #{creditArrearsStatus}
|
AND p.credit_arrears_status = #{creditArrearsStatus}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="orderStatus != null">
|
||||||
|
AND p.order_status = #{orderStatus}
|
||||||
|
</if>
|
||||||
|
<if test="orderStatuses != null and orderStatuses.size() > 0">
|
||||||
|
AND p.order_status IN
|
||||||
|
<foreach collection="orderStatuses" item="os" open="(" separator="," close=")">
|
||||||
|
#{os}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
<if test="billingFailStatus != null">
|
<if test="billingFailStatus != null">
|
||||||
AND p.billing_fail_status = #{billingFailStatus}
|
AND p.billing_fail_status = #{billingFailStatus}
|
||||||
</if>
|
</if>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
:columns="columns"
|
:columns="columns"
|
||||||
:search-columns="searchColumns"
|
:search-columns="searchColumns"
|
||||||
:query="queryList"
|
:query="queryList"
|
||||||
|
:default-params="defaultParams"
|
||||||
:search-per-row="4"
|
:search-per-row="4"
|
||||||
row-key="billId"
|
row-key="billId"
|
||||||
:page-sizes="[100, 200, 300, 400]"
|
:page-sizes="[100, 200, 300, 400]"
|
||||||
@@ -99,6 +100,10 @@ const batchLoading = ref(false)
|
|||||||
const tableHeight = ref(480)
|
const tableHeight = ref(480)
|
||||||
let tableResizeObserver = null
|
let tableResizeObserver = null
|
||||||
|
|
||||||
|
const defaultParams = {
|
||||||
|
orderStatuses: [3, 4, 5, 6, 7, 8, 11]
|
||||||
|
}
|
||||||
|
|
||||||
const columns = [
|
const columns = [
|
||||||
{ label: '订单号', prop: 'orderNo', width: 160, fixed: 'left', showOverflowTooltip: true },
|
{ label: '订单号', prop: 'orderNo', width: 160, fixed: 'left', showOverflowTooltip: true },
|
||||||
{ label: '运单号', prop: 'trackingNo', minWidth: 140, showOverflowTooltip: true },
|
{ label: '运单号', prop: 'trackingNo', minWidth: 140, showOverflowTooltip: true },
|
||||||
@@ -123,7 +128,7 @@ const columns = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
const orderStatusMap = {
|
const orderStatusMap = {
|
||||||
0: '预报订单',
|
0: '草稿订单',
|
||||||
1: '确认订单',
|
1: '确认订单',
|
||||||
2: '已中转',
|
2: '已中转',
|
||||||
3: '已收货',
|
3: '已收货',
|
||||||
@@ -133,9 +138,12 @@ const orderStatusMap = {
|
|||||||
7: '已上网',
|
7: '已上网',
|
||||||
8: '已签收',
|
8: '已签收',
|
||||||
9: '已退件',
|
9: '已退件',
|
||||||
10: '已删除'
|
10: '已取消',
|
||||||
|
11: '已复核'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const orderStatusOptions = Object.keys(orderStatusMap).map(k => ({ label: orderStatusMap[k], value: Number(k) }))
|
||||||
|
|
||||||
const billingFailStatusOptions = [
|
const billingFailStatusOptions = [
|
||||||
{ label: '计费成功', value: 0 },
|
{ label: '计费成功', value: 0 },
|
||||||
{ label: '未匹配产品', value: 1 },
|
{ label: '未匹配产品', value: 1 },
|
||||||
@@ -175,6 +183,19 @@ const searchColumns = [
|
|||||||
defaultTime: [new Date(2000, 0, 1, 0, 0, 0), new Date(2000, 0, 1, 23, 59, 59)]
|
defaultTime: [new Date(2000, 0, 1, 0, 0, 0), new Date(2000, 0, 1, 23, 59, 59)]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: '订单状态',
|
||||||
|
prop: 'orderStatuses',
|
||||||
|
component: 'select',
|
||||||
|
options: orderStatusOptions,
|
||||||
|
placeholder: '请选择',
|
||||||
|
props: {
|
||||||
|
multiple: true,
|
||||||
|
clearable: true,
|
||||||
|
collapseTags: true,
|
||||||
|
collapseTagsTooltip: true
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: '计费状态',
|
label: '计费状态',
|
||||||
prop: 'billingFailStatuses',
|
prop: 'billingFailStatuses',
|
||||||
|
|||||||
Reference in New Issue
Block a user