From 0de827b5feec9183117406d1f34bc682b1703b04 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Sat, 7 Feb 2026 13:39:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue
index b8f258de..92d56b00 100644
--- a/src/views/emis/emisWaybill/UserOrderList.vue
+++ b/src/views/emis/emisWaybill/UserOrderList.vue
@@ -8,7 +8,7 @@
               <el-col :span="9">
                 <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                   <el-col :span="24">
-                    <el-form-item label="" prop="queryKey">
+                    <el-form-item label="" prop="queryKey" label-width="120px">
                         <div slot="label">
                             <el-radio-group class="query-label" v-model="queryParams.queryOrderType">
                               <el-radio :key="1" label="1">运单号</el-radio>
@@ -25,11 +25,12 @@
                       </el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="下单时间" prop="createTime" label-width="100px" >
+                    <el-form-item label="下单时间" prop="createTime" label-width="120px" >
                        <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 :key="3" label="3">发货日期</el-radio>
                             </el-radio-group>
                         </div>
                       <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
@@ -840,9 +841,15 @@ export default {
       if(this.queryParams.params.queryDateType=='1'){
          qParam = this.addDateRange(this.queryParams, this.dateTimeRange,"orderDate");
          qParam = this.addDateRange(this.queryParams,[],'PickStartDate')
-      }else{
+         qParam = this.addDateRange(this.queryParams,[],'sendDate')
+      }else if(this.queryParams.params.queryDateType=='2'){
         qParam = this.addDateRange(qParam, this.dateTimeRange,"PickStartDate");
         qParam = this.addDateRange(qParam, [],"orderDate");
+        qParam = this.addDateRange(qParam, [],"sendDate");
+      }else{
+        qParam = this.addDateRange(qParam, this.dateTimeRange,"sendDate");
+        qParam = this.addDateRange(qParam, [],"PickStartDate");
+        qParam = this.addDateRange(qParam, [],"orderDate");
       }
       listEmisOrder(qParam).then(response => {
         this.emisWaybillList = response.rows;

From c3b6e1d7ef7d42e3506050e361d832d2ceba2aa8 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Sat, 7 Feb 2026 13:40:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E9=A2=9D=E5=BA=A6=EF=BC=8C=E6=9C=88=E7=BB=93?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisTempCreditCustomer/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/emis/emisTempCreditCustomer/index.vue b/src/views/emis/emisTempCreditCustomer/index.vue
index 35b19ec8..c7e50c26 100644
--- a/src/views/emis/emisTempCreditCustomer/index.vue
+++ b/src/views/emis/emisTempCreditCustomer/index.vue
@@ -8,7 +8,8 @@
 
 
       <el-form-item label="月结客户" prop="customerCode">
-        <EmisMonthpayAccountPicker1 v-model="queryParams.customerCode" @onChange="onMonthpayAccountChange"></EmisMonthpayAccountPicker1>
+        <!-- <EmisMonthpayAccountPicker1 v-model="queryParams.customerCode" @onChange="onMonthpayAccountChange"></EmisMonthpayAccountPicker1> -->
+        <EmisMonthpayAccountPicker v-model="queryParams.customerCode" @onChange="onMonthpayAccountChange"></EmisMonthpayAccountPicker>
       </el-form-item>