From a165a1551f90457cca0d7c16fa8151da75ac1cfa Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 08 八月 2024 17:42:08 +0800
Subject: [PATCH] update 统计跳转和签收

---
 pages/order/order-delivery.vue |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pages/order/order-delivery.vue b/pages/order/order-delivery.vue
index d94e390..1f5537f 100644
--- a/pages/order/order-delivery.vue
+++ b/pages/order/order-delivery.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="list-container order-sale supplier">
-		<view class="component-tab-container m-t-12">
+		<view class="component-tab-container m-t-12" v-if="!range||range=='today'">
 			<view class="tab-item" :class="[query.status==''?'cur':'']" @click="changeIndex('')">全部订单</view>
 			<view class="tab-item" :class="[query.status=='PENDING'?'cur':'']" @click="changeIndex('PENDING')">待入位
 			</view>
 			<view class="tab-item" :class="[query.status=='ARRIVED'?'cur':'']" @click="changeIndex('ARRIVED')">已入位
 			</view>
 		</view>
-		<view class="m-t-12">
+		<view class="m-t-12" v-if="!range||range=='today'">
 			<view class="m-l-a m-r-20 w-fit flex">
 				<radio :checked="selecttoday" @click="changeSelecrRange"></radio>
 				<view>只查看今日</view>
@@ -113,15 +113,28 @@
 					status: '',
 				},
 				selecttoday: true,
+				range: '', //today的话才有查询条件,其他的话,不展示顶部查询条件(yesterday、month、todayall)
 			}
 		},
 		onLoad(options) {
 			if (options.status) {
 				this.query.status = options.status || ''
 			}
+			this.range = options.range || ''
 			//目前应该是admin(质检人员不会用这个页面)
+			if (this.range === 'todayall') {
+				this.listApi = '/api/supplier/delivery/list/today'
 
-			this.listApi = '/api/supplier/delivery/list/today'
+			} else if (this.range === 'month') {
+				this.listApi = '/api/supplier/delivery/list/month'
+
+			} else if (this.range === 'yesterday') {
+				this.listApi = '/api/supplier/delivery/list/yesterday'
+
+			} else {
+				this.listApi = '/api/supplier/delivery/list/today'
+			}
+
 			// this.listApi = '/api/supplier/delivery/list'
 
 			this.getList()
@@ -242,6 +255,7 @@
 				font-size: 28rpx;
 				color: #000000;
 				line-height: 40rpx;
+
 				.level {
 					font-weight: 400;
 					font-size: 28rpx;
@@ -278,6 +292,7 @@
 					font-size: 28rpx;
 					color: #000000;
 					line-height: 40rpx;
+
 					.level {
 						font-weight: 400;
 						font-size: 28rpx;

--
Gitblit v1.9.3