From cf3bea139063544d92dc0e03f7766b2882c5daa1 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 13 Nov 2024 00:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=9A=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=94=B9=E6=88=90=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=88=E5=87=8F=E5=B0=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=EF=BC=89=EF=BC=8C=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E5=B0=B1=E5=8F=AF=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/user/fenzhen/fenzhen.vue | 145 +++++++++++++++++++++++-------
 1 file changed, 113 insertions(+), 32 deletions(-)

diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue
index cec4fdc..d523a28 100644
--- a/h5/pages/user/fenzhen/fenzhen.vue
+++ b/h5/pages/user/fenzhen/fenzhen.vue
@@ -40,7 +40,8 @@
 			fenzhen_list.value = response.data;
 			console.log(window.location.href)
 			setTimeout(() => {
-				if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen')) {
+				if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen') &&
+					!window.location.href.includes('192.168.31.84:5173')) {
 					getFenzhenList(false)
 				}
 			}, 1000 * 10)
@@ -59,12 +60,6 @@
 		}
 	};
 
-	const toRouter = (clinic) => {
-		uni.navigateTo({
-			url: "/pages/user/fenzhen/xindiantu?id=" + $props.id + '&clinic=' + clinic,
-		});
-	};
-
 	const timeShow = (time) => {
 		let time_array = time.split(":");
 		return `${time_array[0]}:${time_array[1]}`;
@@ -95,6 +90,44 @@
 		})
 	}
 
+	const toRouter = (clinic) => {
+		uni.navigateTo({
+			url: "/pages/user/fenzhen/xindiantu?id=" + $props.id + '&clinic=' + clinic,
+		});
+	};
+	const fenzhen_active = ref(-1)
+	const fenzhen_info = ref(false)
+	const infoShowClick = (clinic) => {
+		if (clinic !== fenzhen_active.value) {
+			fenzhen_info.value = false
+			getFenzhenInfo(clinic)
+		} else {
+			fenzhen_active.value = -1
+		}
+	}
+	const qijian = (item) => {
+		uni.navigateTo({
+			url: `/pages/user/fenzhen/qijian?id=${$props.id}&xmid=${item.id}&tj_number=${fenzhen_list.value.info.tj_number}`,
+		});
+	};
+
+	const getFenzhenInfo = async (clinic) => {
+		fenzhen_active.value = clinic
+		uni.showLoading();
+		const response = await $api("FenzhenInfo", {
+			id: $props.id,
+			clinic: clinic,
+		});
+		uni.hideLoading();
+		$response(response, () => {
+			fenzhen_info.value = response.data;
+		});
+	};
+
+	const useTimeShow = (time) => {
+		return Math.ceil(Number(time))
+	}
+
 	onShow(() => {
 		if (!!config_ref.value) {
 			mountedAction();
@@ -151,14 +184,32 @@
 			</view>
 			<view class="tip_wrapper">
 				<view class="tip_time_wrapper">
-					<view class="tip_time_text_wrapper">开始体检时间</view>
+					<view class="tip_time_text_wrapper">开始时间</view>
 					<view class="tip_time_value_wrapper">{{
             timeShow(fenzhen_list.info.start_time)
           }}</view>
-					<view class="tip_time_text_wrapper">— 预计结束时间</view>
+				</view>
+				<view class="tip_time_wrapper tip_endtime_wrapper">
+					<view class="tip_time_text_wrapper">预计结束</view>
 					<view class="tip_time_value_wrapper">{{
-            timeShow(fenzhen_list.info.end_time)
-          }}</view>
+				    timeShow(fenzhen_list.info.yuji_end_time)
+				  }}</view>
+					<view class="tip_time_text_wrapper">— 预计用时</view>
+					<view class="tip_time_value_wrapper">{{
+						useTimeShow(fenzhen_list.info.yuji_use_time)
+					}}</view>
+					<view class="tip_time_text_wrapper">分钟</view>
+				</view>
+				<view class="tip_time_wrapper tip_endtime_wrapper">
+					<view class="tip_time_text_wrapper">结束时间</view>
+					<view class="tip_time_value_wrapper">{{
+				    timeShow(fenzhen_list.info.end_time)
+				  }}</view>
+					<view class="tip_time_text_wrapper">— 实际用时</view>
+					<view class="tip_time_value_wrapper">{{
+						useTimeShow(fenzhen_list.info.use_time)
+					}}</view>
+					<view class="tip_time_text_wrapper">分钟</view>
 				</view>
 				<view class="tip_box_wrapper">
 					<view class="tip_icon_wrapper">
@@ -171,28 +222,50 @@
 			<view class="time_line_wrapper">
 				<view class="time_line_title_wrapper">自助导检</view>
 				<view class="time_line_box_wrapper">
-					<view class="time_line_item_wrapper" :class="[`time_line_item-${i.status}_wrapper`]"
-						v-for="(i, k) in fenzhen_list.list" :key="k">
-						<view class="time_line_item_time_wrapper">
-							<view v-if="!!i.time" class="time_line_item_time_value_wrapper">{{
-                i.time
-              }}</view>
-							<view class="time_line_item_time_dot_wrapper">
-								<view class="time_line_item_time_dot_in_wrapper"></view>
-							</view>
-							<view v-if="!!i.time" class="time_line_item_time_line_wrapper"></view>
-							<view v-if="!i.time" class="time_line_item_time_cover_wrapper"></view>
-						</view>
-						<view class="time_line_item_content_wrapper">
-							<view class="time_line_item_triangle_wrapper"></view>
-							<view class="time_line_item_flex_wrapper">
-								<view class="time_line_item_title_wrapper">{{ k + 1 }}.{{ i.name }}</view>
-								<view class="time_line_item_box_wrapper">{{ i.desc }}</view>
+					<view v-for="(i, k) in fenzhen_list.list" :key="k">
+						<view class="time_line_item_wrapper" :class="[`time_line_item-${i.status}_wrapper`]">
+							<view class="time_line_item_time_wrapper">
+								<view v-if="!!i.time" class="time_line_item_time_value_wrapper">{{
+						      i.time
+						    }}</view>
+								<view class="time_line_item_time_dot_wrapper">
+									<view class="time_line_item_time_dot_in_wrapper"></view>
+								</view>
+								<view v-if="!!i.time" class="time_line_item_time_line_wrapper"></view>
+								<view v-if="!i.time" class="time_line_item_time_cover_wrapper"></view>
 							</view>
-							<view v-if="!!i.time && !!i.tip" class="time_line_item_line_wrapper"></view>
-							<view v-if="!!i.time && !!i.tip" class="time_line_item_flex_wrapper">
-								<view class="time_line_item_text_wrapper">{{ i.tip }}</view>
-								<view v-if="i.more !== 0" class="time_line_item_more_wrapper" @click="toRouter(i.more)">查看详情>></view>
+							<view class="time_line_item_content_wrapper">
+								<view class="time_line_item_triangle_wrapper"></view>
+								<view class="time_line_item_flex_wrapper">
+									<view class="time_line_item_title_wrapper">{{ k + 1 }}.{{ i.name }}</view>
+									<view class="time_line_item_box_wrapper">{{ i.desc }}</view>
+								</view>
+								<view v-if="!!i.time && !!i.tip" class="time_line_item_line_wrapper"></view>
+								<view v-if="!!i.time && !!i.tip" class="time_line_item_flex_wrapper">
+									<view class="time_line_item_text_wrapper">{{ i.tip }}</view>
+									<view v-if="i.more !== 0" class="time_line_item_more_wrapper" @click="infoShowClick(i.more)">查看详情>>
+									</view>
+								</view>
+								
+								<view class="more_wrapper mt-20rpx" v-if="i.more === fenzhen_active && !!fenzhen_info">
+									<template v-for="(item, index) in fenzhen_info.list" :key="index">
+										<view class="between h-90rpx b-0 b-b-1 b-solid b-#EAEAEA" v-if="item.status == 1">
+											<view class="text-#000000 text-30rpx">{{ item.name }}</view>
+											<view class="center">
+												<text @click="qijian(item)"
+													class="rounded-full text-28rpx center w-105rpx h-48rpx text-#E95515 bg-#FAECE6">弃检</text>
+											</view>
+										</view>
+										<view class="between h-90rpx b-0 b-b-1 b-solid b-#EAEAEA" v-if="item.status == 4">
+											<view class="text-#000000 text-30rpx">{{ item.name }}</view>
+											<view class="center">
+												<text
+													class="rounded-full text-28rpx center w-105rpx h-48rpx mr-30rpx text-#239EA3 bg-#E5F3F2">完成</text>
+												<text class="text-#141414 text-28rpx">{{ item.time }}</text>
+											</view>
+										</view>
+									</template>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -207,6 +280,10 @@
 	</view>
 </template>
 <style scoped>
+	.more_wrapper {
+		padding: 20rpx;
+	}
+
 	.report_tip_wrapper {
 		font-weight: 500;
 		font-size: 28rpx;
@@ -513,6 +590,10 @@
 		line-height: 1;
 	}
 
+	.tip_endtime_wrapper {
+		margin-top: 20rpx;
+	}
+
 	.tip_wrapper {
 		width: calc(100% - 50px);
 		margin: 32rpx auto 0;