diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue index 32506239..1ef799df 100644 --- a/src/views/emis/emisWaybill/UserOrderList.vue +++ b/src/views/emis/emisWaybill/UserOrderList.vue @@ -160,6 +160,11 @@ + + + + + @@ -524,6 +529,7 @@ import { listEmisOrder,cancelOrder,assignTakeMan,assignSendSite, getEmisWaybill, import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; // import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView'; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; +import elDateAdvPicker1 from "@/components/DatePickerAdv/elDateAdvPicker.vue"; import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import waybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue'; @@ -558,7 +564,8 @@ export default { EmpNamePicker1, TransLinePicker, TransProductPicker, - TraceWaybillDetailView + TraceWaybillDetailView, + elDateAdvPicker1 }, dicts: ['emis_order_status','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear', 'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type', @@ -580,6 +587,7 @@ export default { showSearch: true, // 创建时间搜索 dateTimeRange:[], + beginPickRange:[], // 总条数 total: 0, // 运单列表表格数据 @@ -826,8 +834,9 @@ export default { this.queryParams.orderSn= null; this.queryParams.intoWarehouseBillCode=this.queryParams.queryKey; } - - listEmisOrder(this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate")).then(response => { + let qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate"); + qParam = this.addDateRange(qParam, this.beginPickRange,"PickStartDate"); + listEmisOrder(qParam).then(response => { this.emisWaybillList = response.rows; this.total = response.total; this.loading = false;