From 4a11d02da294558e44f25237317037dbcd33afc7 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 18:00:33 +0800
Subject: [PATCH] 1

---
 sub_pages/partner/delivery/delivery.vue |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index 27deeb7..3398f33 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -17,15 +17,18 @@
 				status_columns: [],
 			}
 		},
-		onLoad() {
-			this.listApi = '/api/delivery/list'
+		onLoad(options) {
+			this.query.stationId = options.stationId || ''
+			this.query.stationName = options.stationName || ''
+
+			this.listApi = '/api/delivery/list/today'
 			this.getList()
-			this.$http.request('get', '/api/station/list', {
-				params: {}
-			}).then(res => {
-				var data = res.data
-				this.columns_station = [data || []]
-			})
+			// this.$http.request('get', '/api/station/list', {
+			// 	params: {}
+			// }).then(res => {
+			// 	var data = res.data
+			// 	this.columns_station = [data || []]
+			// })
 			this.$http.request('get', '/api/code/value', {
 				params: {
 					type: 'DELIVERY_ORDER_STATUS'
@@ -114,19 +117,24 @@
 						</template>
 					</u-input>
 				</view>
+				<view class="component-filter-container p10 bg-white m-l-10">
+					<view class="flex1" @click="show_select_status=true">
+						配送单状态:{{ query.statusStr || '全部' }}
+						<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
+					</view>				
+				</view>
 			</view>
 
-			<view class="component-filter-container p20 bg-white">
+			<!-- <view class="component-filter-container p20 bg-white">
 				<view class="flex1" @click="show_select_status=true">
 					配送单状态:{{ query.statusStr || '全部' }}
 					<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 				</view>
-
-				<view class="flex1" @click="show_select_station=true">
+				<view class="flex1">
 					集货站:{{ query.stationName || '全部' }}
 					<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 				</view>
-			</view>
+			</view> -->
 
 			<no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
 			<view v-for="(item,index) in list" :key="index" class="m-b-24">
@@ -166,10 +174,11 @@
 
 					<view class="line-gray"></view>
 					<view class="flex buttons">
-						<view class="button button-1 m-l-15 m-r-0" v-if="item.status==='ARRIVED'"
+						<view class="button button-1 m-l-15 m-r-0" v-if="item.status==='ARRIVED'||item.status==='PENDING'"
 							@click="compelete(item)">质检完成</view>
 						<view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">
-							{{item.status==='ARRIVED'?'前往质检':'查看详情'}}</view>
+							{{(item.status==='ARRIVED'||item.status==='PENDING')?'前往质检':'查看详情'}}
+						</view>
 
 					</view>
 				</view>

--
Gitblit v1.9.3