From abe23c44bd3697fb1ac91e8ae8d0f0e65dd1afc8 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 29 Jul 2025 17:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E9=A2=84=E8=AE=A1=E5=85=A5=E4=BB=93=E6=97=B6=E9=97=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisWaybill/UserOrderList.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 @@
                           <el-option key="oms" label="oms" value="oms"></el-option>
                       </el-select>
                   </el-form-item>
+                  <el-col :span="24">
+                    <el-form-item label="预计入仓时间" prop="beginPickRange" label-width="100px" >
+                      <elDateAdvPicker1 clearable v-model="beginPickRange" ></elDateAdvPicker1>
+                    </el-form-item>
+                  </el-col>
               </el-col>
             </el-row>
         </SearchForm>
@@ -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;