From 15c6e8cdd58305719865e5bdab5df5b6a149b0df Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 30 Jul 2025 14:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=97=B6=E9=97=B4=E5=92=8C=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E5=85=A5=E4=BB=93=E6=97=B6=E9=97=B4=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisWaybill/UserOrderList.vue | 24 +++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue
index 1ef799df..aabfd1a7 100644
--- a/src/views/emis/emisWaybill/UserOrderList.vue
+++ b/src/views/emis/emisWaybill/UserOrderList.vue
@@ -26,6 +26,12 @@
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="下单时间" prop="createTime" label-width="100px" >
+                       <div slot="label" style="text-align: left;">
+                            <el-radio-group class="query-label" v-model="queryParams.params.queryDateType">
+                              <el-radio :key="1" label="1">下单时间</el-radio>
+                              <el-radio :key="2" label="2">预计入仓时间</el-radio>
+                            </el-radio-group>
+                        </div>
                       <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
                     </el-form-item>
                   </el-col>
@@ -160,11 +166,6 @@
                           <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>
@@ -776,7 +777,8 @@ export default {
         dataFrom:null,
         params:{
           queryOrderType:1,
-          queryOrderDateType:1
+          queryOrderDateType:1,
+          queryDateType:'1',
         }
       },
     };
@@ -834,8 +836,14 @@ export default {
         this.queryParams.orderSn= null;
         this.queryParams.intoWarehouseBillCode=this.queryParams.queryKey;
       }
-      let qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
-      qParam = this.addDateRange(qParam, this.beginPickRange,"PickStartDate");
+      let qParam ={...this.queryParams};
+      if(this.queryParams.params.queryDateType=='1'){
+         qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
+         qParam = this.addDateRange(this.queryParams,[],'PickStartDate')
+      }else{
+        qParam = this.addDateRange(qParam, this.dateTimeRange,"PickStartDate");
+        qParam = this.addDateRange(qParam, [],"orderDate");
+      }
       listEmisOrder(qParam).then(response => {
         this.emisWaybillList = response.rows;
         this.total = response.total;