|  | @@ -99,6 +99,19 @@
 | 
	
		
			
				|  |  |            </el-date-picker>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  |          <el-form-item>
 | 
	
		
			
				|  |  | +          <el-date-picker
 | 
	
		
			
				|  |  | +            style="width: 410px"
 | 
	
		
			
				|  |  | +            v-model.trim="searchForm.deliveryDate"
 | 
	
		
			
				|  |  | +            type="daterange"
 | 
	
		
			
				|  |  | +            value-format="yyyy-MM-dd"
 | 
	
		
			
				|  |  | +            range-separator="至"
 | 
	
		
			
				|  |  | +            start-placeholder="发货开始日期"
 | 
	
		
			
				|  |  | +            end-placeholder="发货结束日期"
 | 
	
		
			
				|  |  | +            :picker-options="{ firstDayOfWeek: 1 }"
 | 
	
		
			
				|  |  | +          >
 | 
	
		
			
				|  |  | +          </el-date-picker>
 | 
	
		
			
				|  |  | +        </el-form-item>
 | 
	
		
			
				|  |  | +        <el-form-item>
 | 
	
		
			
				|  |  |            <el-button native-type="submit" type="danger">搜索</el-button>
 | 
	
		
			
				|  |  |            <el-button native-type="reset" type="primary">重置</el-button>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
	
		
			
				|  | @@ -444,6 +457,8 @@ export default {
 | 
	
		
			
				|  |  |          organIdList: [],
 | 
	
		
			
				|  |  |          userName: "",
 | 
	
		
			
				|  |  |          orderDate: [],
 | 
	
		
			
				|  |  | +        /** 发货日期 */
 | 
	
		
			
				|  |  | +        deliveryDate: [],
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  |        tableList: [],
 | 
	
		
			
				|  |  |        organList: [],
 | 
	
	
		
			
				|  | @@ -518,12 +533,13 @@ export default {
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      getList() {
 | 
	
		
			
				|  |  | -      let { orderDate, ...rest } = this.searchForm;
 | 
	
		
			
				|  |  | +      let { orderDate, deliveryDate, ...rest } = this.searchForm;
 | 
	
		
			
				|  |  |        let params = {
 | 
	
		
			
				|  |  |          ...rest,
 | 
	
		
			
				|  |  |          page: this.pageInfo.page,
 | 
	
		
			
				|  |  |          rows: this.pageInfo.limit,
 | 
	
		
			
				|  |  |          ...getTimes(orderDate, ["startTime", "endTime"]),
 | 
	
		
			
				|  |  | +        ...getTimes(deliveryDate, ["deliveryStartTime", "deliveryEndTime"]),
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |        getSellOrder({
 | 
	
	
		
			
				|  | @@ -547,6 +563,7 @@ export default {
 | 
	
		
			
				|  |  |          goodsName: [],
 | 
	
		
			
				|  |  |          cooperationOrganId: "",
 | 
	
		
			
				|  |  |          orderDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")],
 | 
	
		
			
				|  |  | +        deliveryDate: []
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |        this.getList();
 | 
	
		
			
				|  |  |      },
 | 
	
	
		
			
				|  | @@ -610,12 +627,13 @@ export default {
 | 
	
		
			
				|  |  |        // applyRefundAudit()
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      onOrderExport() {
 | 
	
		
			
				|  |  | -      let { orderDate, ...rest } = this.searchForm;
 | 
	
		
			
				|  |  | +      let { orderDate, deliveryDate, ...rest } = this.searchForm;
 | 
	
		
			
				|  |  |        let params = {
 | 
	
		
			
				|  |  |          ...rest,
 | 
	
		
			
				|  |  |          page: this.pageInfo.page,
 | 
	
		
			
				|  |  |          rows: this.pageInfo.limit,
 | 
	
		
			
				|  |  |          ...getTimes(orderDate, ["startTime", "endTime"]),
 | 
	
		
			
				|  |  | +        ...getTimes(deliveryDate, ["deliveryStartTime", "deliveryEndTime"]),
 | 
	
		
			
				|  |  |        };
 | 
	
		
			
				|  |  |        Export(
 | 
	
		
			
				|  |  |          this,
 |