|
@@ -16,12 +16,12 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
<a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
- <a-input id="shopOrder-contactPhone" allowClear :maxLength="11" v-model="queryParam.contactPhone" placeholder="请输入用户手机" />
|
|
|
|
|
|
+ <a-input id="shopOrder-customerMobile" allowClear :maxLength="11" v-model="queryParam.customerMobile" placeholder="请输入用户手机" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-form-item label="订单编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
<a-form-item label="订单编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
- <a-input id="shopOrder-orderNo" allowClear :maxLength="30" v-model="queryParam.orderNo" placeholder="请输入订单编号" />
|
|
|
|
|
|
+ <a-input id="shopOrder-orderSn" allowClear :maxLength="30" v-model="queryParam.orderSn" placeholder="请输入订单编号" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
@@ -30,7 +30,7 @@
|
|
v-model="queryParam.orderState"
|
|
v-model="queryParam.orderState"
|
|
ref="orderState"
|
|
ref="orderState"
|
|
id="shopOrder-status"
|
|
id="shopOrder-status"
|
|
- code="SETTLE_STATUS_ALL"
|
|
|
|
|
|
+ code="ORDER_STATE"
|
|
placeholder="请选择订单状态"
|
|
placeholder="请选择订单状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -91,8 +91,8 @@ export default {
|
|
queryParam: {
|
|
queryParam: {
|
|
beginDate: null, // 开始时间
|
|
beginDate: null, // 开始时间
|
|
endDate: null, // 结束时间
|
|
endDate: null, // 结束时间
|
|
- contactPhone: '', // 用户手机
|
|
|
|
- orderNo: '', // 订单编号
|
|
|
|
|
|
+ customerMobile: '', // 用户手机
|
|
|
|
+ orderSn: '', // 订单编号
|
|
orderState: null // 订单状态
|
|
orderState: null // 订单状态
|
|
},
|
|
},
|
|
loading: false, // 导出loading
|
|
loading: false, // 导出loading
|
|
@@ -101,7 +101,7 @@ export default {
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '下单时间', dataIndex: 'orderTime', width: 200, align: 'center' },
|
|
{ title: '下单时间', dataIndex: 'orderTime', width: 200, align: 'center' },
|
|
{ title: '用户手机', dataIndex: 'userMoblie', width: 200, align: 'center' },
|
|
{ title: '用户手机', dataIndex: 'userMoblie', width: 200, align: 'center' },
|
|
- { title: '订单编号', dataIndex: 'orderNo', width: 200, align: 'center' },
|
|
|
|
|
|
+ { title: '订单编号', dataIndex: 'orderSn', width: 200, align: 'center' },
|
|
{ title: '订单状态', dataIndex: 'orderStateDictValue', width: 200, align: 'center' },
|
|
{ title: '订单状态', dataIndex: 'orderStateDictValue', width: 200, align: 'center' },
|
|
{ title: '订单总额', scopedSlots: { customRender: 'originalGold' }, width: 200, align: 'center' },
|
|
{ title: '订单总额', scopedSlots: { customRender: 'originalGold' }, width: 200, align: 'center' },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
|
|
@@ -161,8 +161,8 @@ export default {
|
|
moment(getDate.getToday().starttime, this.dateFormat),
|
|
moment(getDate.getToday().starttime, this.dateFormat),
|
|
moment(getDate.getToday().endtime, this.dateFormat)
|
|
moment(getDate.getToday().endtime, this.dateFormat)
|
|
]
|
|
]
|
|
- this.queryParam.contactPhone = ''
|
|
|
|
- this.queryParam.orderNo = ''
|
|
|
|
|
|
+ this.queryParam.customerMobile = ''
|
|
|
|
+ this.queryParam.orderSn = ''
|
|
this.queryParam.orderState = null
|
|
this.queryParam.orderState = null
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
@@ -171,8 +171,8 @@ export default {
|
|
const params = {
|
|
const params = {
|
|
beginDate: this.queryParam.beginDate == null ? getDate.getToday().starttime : this.queryParam.beginDate,
|
|
beginDate: this.queryParam.beginDate == null ? getDate.getToday().starttime : this.queryParam.beginDate,
|
|
endDate: this.queryParam.endDate == null ? getDate.getToday().endtime : this.queryParam.endDate,
|
|
endDate: this.queryParam.endDate == null ? getDate.getToday().endtime : this.queryParam.endDate,
|
|
- contactPhone: this.queryParam.contactPhone,
|
|
|
|
- orderNo: this.queryParam.orderNo,
|
|
|
|
|
|
+ customerMobile: this.queryParam.customerMobile,
|
|
|
|
+ orderSn: this.queryParam.orderSn,
|
|
orderState: this.queryParam.orderState
|
|
orderState: this.queryParam.orderState
|
|
}
|
|
}
|
|
if (!params.beginDate && !params.endDate) {
|
|
if (!params.beginDate && !params.endDate) {
|