发货时间&echart隐藏

src/views/hisStore/statistics/storeProduct.vue

@@ -84,7 +84,7 @@
       </el-form>
 
       <div class="data-box">
-        <div class="echart-box">
+        <div class="echart-box" hidden="hidden">
           <div id="echart-customer"></div>
         </div>
 

src/views/hisStore/storeOrder/list.vue

@@ -133,6 +133,17 @@
               end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="发货时间" prop="deliverySendTimeRange">
+            <el-date-picker
+              style="width:220px"
+              clearable size="small"
+              v-model="deliverySendTimeRange"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item label="回单时间" prop="deliveryImportTimeRange">
             <el-date-picker
             style="width:220px"
@@ -263,6 +274,7 @@
             </template>
           </el-table-column>
           <el-table-column label="下单时间" align="center" prop="createTime" width="100"/>
+          <el-table-column label="发货时间" align="center" prop="deliverySendTime" width="100"/>
           <!-- <el-table-column label="支付状态" align="center" prop="paid" /> -->
           <el-table-column label="支付时间" align="center" prop="payTime" width="100">
           </el-table-column>
@@ -607,6 +619,7 @@ export default {
       open: false,
       createTimeRange:[],
       payTimeRange:[],
+      deliverySendTimeRange:[],
       deliveryImportTimeRange:[],
       scheduleOptions:[],
       // 查询参数
@@ -877,6 +890,14 @@ export default {
       else{
         this.queryParams.deliveryImportTimeRange=null;
       }
+      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+      }
+      else {
+        this.queryParams.deliverySendTimeRange=null;
+      }
+
+
       this.loading = true;
       listStoreOrder(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.storeOrderList = response.rows;
@@ -975,6 +996,14 @@ export default {
       else{
         this.queryParams.payTimeRange=null;
       }
+      if (this.deliverySendTimeRange!=null && this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+
+      }
+      else{
+        this.queryParams.deliverySendTimeRange=null;
+      }
+
       if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
         this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
       }
@@ -1009,6 +1038,13 @@ export default {
       else{
         this.queryParams.payTimeRange=null;
       }
+      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+      }
+      else{
+        this.queryParams.deliverySendTimeRange=null;
+      }
+
       if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
         this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
       }