From ccf8a9e7e53ce1516960cbd101e0afc7ac8ea2c2 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 20 八月 2024 17:42:13 +0800
Subject: [PATCH] update 质检功能

---
 sub_pages/partner/delivery/delivery.vue |   57 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index b57b313..8471586 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -23,6 +23,8 @@
 
 			// this.listApi = '/api/delivery/list/today'
 			this.listApi = '/api/delivery/check/list/today'
+			// this.listApi = '/api/delivery/check/list'
+
 			this.getList()
 			// this.$http.request('get', '/api/station/list', {
 			// 	params: {}
@@ -59,9 +61,9 @@
 
 				this.$nextTick(() => {
 					if (this.selecttoday) {
-						this.listApi = '/api/supplier/delivery/list/today'
+						this.listApi = '/api/delivery/check/list/today'
 					} else {
-						this.listApi = '/api/supplier/delivery/list'
+						this.listApi = '/api/delivery/check/list'
 					}
 					this.refreshList()
 				})
@@ -90,7 +92,8 @@
 			},
 			toDetail(item) {
 				uni.navigateTo({
-					url: `/sub_pages/partner/delivery/delivery-detail?id=${item.id}`
+					url: `/sub_pages/partner/delivery/delivery-supplier-detail?supplierId=${item.id}&range=` + (this
+						.selecttoday ? 'today' : '')
 				})
 			},
 			async compelete(item) {
@@ -106,11 +109,11 @@
 				})
 				if (code === 0) {
 					this.$message.showToast('完成成功')
-					let tmp = this
-					setTimeout(async () => {
-						await tmp.refreshList()
-						tmp.$forceUpdate()
-					}, 500)
+					// let tmp = this
+					// setTimeout(async () => {
+					// 	await tmp.refreshList()
+					// 	tmp.$forceUpdate()
+					// }, 500)
 				}
 			}
 		}
@@ -129,12 +132,7 @@
 					</u-input>
 				</view>
 			</view>
-			<!-- <view class="m-t-12">
-				<view class="m-l-a m-r-20 w-fit flex">
-					<radio :checked="selecttoday" @click="changeSelecrRange"></radio>
-					<view>只查看今日</view>
-				</view>
-			</view> -->
+
 			<view class="search-container m-t-12 flex">
 				<view class="flex1 input">
 					<u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
@@ -148,6 +146,12 @@
 						配送单状态:{{ query.statusStr || '全部' }}
 						<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 					</view>
+				</view>
+			</view>
+			<view class="m-t-12 m-b-12">
+				<view class="m-l-a m-r-20 w-fit flex">
+					<radio :checked="selecttoday" @click="changeSelecrRange"></radio>
+					<view>只查看今日</view>
 				</view>
 			</view>
 
@@ -172,43 +176,48 @@
 
 					</view>
 					<view class="line-gray"></view>
-					<view class="form-item">
+					<!-- 		<view class="form-item">
 						<view class="form-item-label">订单单号</view>
 						<view class="form-item-value">{{ item.orderNo || '-' }}</view>
-					</view>
+					</view> -->
 					<view class="flex">
 						<view class="form-item flex1">
 							<view class="form-item-label">集货站</view>
 							<view class="form-item-value">{{ item.stationName || '-' }}</view>
 						</view>
-						<view class="form-item flex1">
+						<!-- 	<view class="form-item flex1">
 							<view class="form-item-label">货位号</view>
 							<view class="form-item-value">{{ item.warehouseLocationCode || '-' }}</view>
-						</view>
+						</view> -->
 
 					</view>
 					<view class="flex">
-						<view class="form-item flex1">
+						<!-- <view class="form-item flex1">
 							<view class="form-item-label">状态</view>
 							<view class="form-item-value">{{ item.statusStr || '-' }}</view>
+						</view> -->
+						<view class="form-item flex1">
+							<view class="form-item-label">交易金额</view>
+							<view class="form-item-value">¥{{ item.totalAmount || '0.00' }}</view>
 						</view>
 						<view class="form-item flex1">
 							<view class="form-item-label">供货总数</view>
 							<view class="form-item-value">{{ item.totalNum || '-' }}</view>
 						</view>
 					</view>
-					<view class="form-item flex1">
+					<!-- 	<view class="form-item flex1">
 						<view class="form-item-label">送达时间</view>
 						<view class="form-item-value">{{ item.arriveTime || '-' }}</view>
-					</view>
+					</view> -->
 
 
 					<view class="line-gray"></view>
 					<view class="flex buttons">
-						<view class="button button-1 m-l-a m-r-15"
-							v-if="item.status==='ARRIVED'||item.status==='PENDING'" @click="compelete(item)">一键质检</view>
+						<!-- v-if="item.status==='ARRIVED'||item.status==='PENDING'" -->
+						<view class="button button-1 m-l-a m-r-15" @click="compelete(item)">一键质检</view>
 						<view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">
-							{{(item.status==='ARRIVED'||item.status==='PENDING')?'前往质检':'查看详情'}}
+							<!-- {{(item.status==='ARRIVED'||item.status==='PENDING')?'前往质检':'查看详情'}} -->
+							前往质检
 						</view>
 
 					</view>

--
Gitblit v1.9.3