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>
 
 
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;