diff --git a/src/api/oms/emisWaybill.js b/src/api/oms/emisWaybill.js
index 02f8089..99091c6 100644
--- a/src/api/oms/emisWaybill.js
+++ b/src/api/oms/emisWaybill.js
@@ -93,6 +93,13 @@ export function getOmsOrderStatInfo() {
   })
 }
 
+export function getOmsBillFeeStatInfo() {
+  return request({
+    url: '/oms2c/emisWaybill/getOmsBillFeeStatInfo',
+    method: 'get'
+  })
+}
+
 export function getLatestMonthCreateOrderMapList() {
   return request({
     url: '/oms2c/emisWaybill/getLatestMonthCreateOrderMapList',
diff --git a/src/views/oms/dashboard.vue b/src/views/oms/dashboard.vue
index c153528..3c3df9b 100644
--- a/src/views/oms/dashboard.vue
+++ b/src/views/oms/dashboard.vue
@@ -242,13 +242,13 @@
                         <el-row>
                             <el-col :span="12" >
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsBillFeeState.waitPayMoney}}</span>
+                                      <span @click="goRouter('/websites')">{{ omsBillFeeState.waitPayMoney||0}}</span>
                                   </div>
                                   <div class="title" style="color:red">未付款</div>
                               </el-col>
                               <el-col :span="12">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsBillFeeState.totalRecedMoney}}</span>
+                                      <span @click="goRouter('/websites')">{{ omsBillFeeState.totalRecedMoney||0}}</span>
                                   </div>
                                   <div class="title">已付款</div>
                               </el-col>
@@ -394,7 +394,10 @@ export default {
 
       getOmsBillFeeStatInfo().then(response => {
         console.log("====>getOmsBillFeeStatInfo===>",response);
-        this.omsBillFeeState = response.data;
+        if(response.data!=null){
+          this.omsBillFeeState = response.data;
+        }
+
       });
 
 
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index 30d0b4e..15e7b3b 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -224,7 +224,7 @@
                       </el-col>
                       <el-col :span="24" v-if="form.pickupMethod==2">
                         <el-form-item  :label="$t('上门时间')"  prop="pickTimeRange">
-                          <TimePicker v-model="form.pickTimeRange"  ></TimePicker>
+                          <TimePicker v-model="form.pickTimeRange" @onChange="onPickTimeRange" ></TimePicker>
                         </el-form-item>
                       </el-col>
 
@@ -242,8 +242,7 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="24" v-if="form.pickupMethod==1">
-                        <el-form-item  :label="$t('发货时间')"  prop="pickTimeRange">
-                          <!-- <TimePicker v-model="form.pickTimeRange"  ></TimePicker> -->
+                        <el-form-item  :label="$t('发货时间')"  prop="pickStartDate">
                           <el-date-picker
                             style="width: 100%;"
                             format="yyyy-MM-dd HH:mm:ss"
@@ -853,6 +852,12 @@ data() {
           { required: true, message: "寄件地址不能为空", trigger: ["blur",'change'] }
         ],
       },
+      intoWarehouseCode: [
+        { required: true, message: "仓库不能为空", trigger: ["blur",'change']  }
+      ],
+      pickStartDate: [
+        { required: true, message: "发货时间不能为空", trigger: ["blur",'change']  }
+      ],
       paymentType: [
         { required: true, message: "支付方式不能为空", trigger: ["blur",'change']  }
       ],
@@ -1108,6 +1113,11 @@ methods: {
               });
       }
   },
+  onPickTimeRange(item){
+    console.log("==onPickTimeRange==>",item);
+    this.form.pickStartDate=item[0];
+    this.form.pickFinishDate=item[1];
+  },
   handlePrivSalesmen(row) {
        this.$router.push({ path: '/BaseMgnt/PrivSalesmen', query: { }})
   },