From 1626d13ec8b1a63676e63cf95c5004c4118da3b3 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 14:59:48 +0800
Subject: [PATCH] feat:移除app 中我的栏目中不要的功能

---
 app/pages/task/detail.vue |  102 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/app/pages/task/detail.vue b/app/pages/task/detail.vue
index f58d624..e4cdcbc 100644
--- a/app/pages/task/detail.vue
+++ b/app/pages/task/detail.vue
@@ -16,12 +16,12 @@
         </view>
         <view class="info-item">
           <view class="label">浠诲姟绫诲瀷</view>
-          <view class="value">{{ getTaskTypeText(taskDetail.taskType) }}</view>
+          <view class="value">{{ displayTaskType }}</view>
         </view>
         <view class="info-item">
           <view class="label">浠诲姟鐘舵��</view>
-          <view class="value status" :class="taskDetail.taskStatus === 'PENDING' ? 'pending' : taskDetail.taskStatus === 'DEPARTING' ? 'in_progress' : taskDetail.taskStatus === 'ARRIVED' ? 'in_progress' : taskDetail.taskStatus === 'RETURNING' ? 'in_progress' : taskDetail.taskStatus === 'IN_PROGRESS' ? 'in_progress' : taskDetail.taskStatus === 'COMPLETED' ? 'completed' : taskDetail.taskStatus === 'CANCELLED' ? 'cancelled' : ''">
-            {{ getStatusText(taskDetail.taskStatus) }}
+          <view class="value status" :class="statusClass">
+            {{ displayTaskStatus }}
           </view>
         </view>
         <view class="info-item">
@@ -38,25 +38,25 @@
         <view class="section-title">鏃堕棿淇℃伅</view>
         <view class="info-item">
           <view class="label">璁″垝寮�濮嬫椂闂�</view>
-          <view class="value">{{ formatDateTime(taskDetail.plannedStartTime) }}</view>
+          <view class="value">{{ displayPlannedStartTime }}</view>
         </view>
         <view class="info-item">
           <view class="label">璁″垝缁撴潫鏃堕棿</view>
-          <view class="value">{{ formatDateTime(taskDetail.plannedEndTime) }}</view>
+          <view class="value">{{ displayPlannedEndTime }}</view>
         </view>
         <view class="info-item" v-if="taskDetail.actualStartTime">
           <view class="label">瀹為檯寮�濮嬫椂闂�</view>
-          <view class="value">{{ formatDateTime(taskDetail.actualStartTime) }}</view>
+          <view class="value">{{ displayActualStartTime }}</view>
         </view>
         <view class="info-item" v-if="taskDetail.actualEndTime">
           <view class="label">瀹為檯缁撴潫鏃堕棿</view>
-          <view class="value">{{ formatDateTime(taskDetail.actualEndTime) }}</view>
+          <view class="value">{{ displayActualEndTime }}</view>
         </view>
       </view>
       
       <view class="detail-section">
         <view class="section-title">浣嶇疆淇℃伅</view>
-        <!-- 鎬ユ晳杞繍浠诲姟锛氭樉绀鸿浆鍑�/杞叆鍖婚櫌鍦板潃 -->
+        <!-- 杞繍浠诲姟锛氭樉绀鸿浆鍑�/杞叆鍖婚櫌鍦板潃 -->
         <template v-if="taskDetail.taskType === 'EMERGENCY_TRANSFER' && taskDetail.emergencyInfo">
           <view class="info-item" v-if="taskDetail.emergencyInfo.hospitalOutAddress">
             <view class="label">杞嚭鍖婚櫌</view>
@@ -106,7 +106,7 @@
         <view class="description">{{ taskDetail.remark }}</view>
       </view>
       
-      <!-- 鎬ユ晳杞繍浠诲姟鐗规湁淇℃伅 -->
+      <!-- 杞繍浠诲姟鐗规湁淇℃伅 -->
       <view class="detail-section" v-if="taskDetail.taskType === 'EMERGENCY_TRANSFER' && taskDetail.emergencyInfo">
         <view class="section-title">鎮h�呬俊鎭�</view>
         <view class="info-item" v-if="taskDetail.emergencyInfo.patientName">
@@ -135,7 +135,7 @@
         </view>
       </view>
       
-      <!-- 鎬ユ晳杞繍 - 杞嚭鍖婚櫌淇℃伅 -->
+      <!-- 杞繍 - 杞嚭鍖婚櫌淇℃伅 -->
       <view class="detail-section" v-if="taskDetail.taskType === 'EMERGENCY_TRANSFER' && taskDetail.emergencyInfo">
         <view class="section-title">杞嚭鍖婚櫌淇℃伅</view>
         <view class="info-item" v-if="taskDetail.emergencyInfo.hospitalOutName">
@@ -156,7 +156,7 @@
         </view>
       </view>
       
-      <!-- 鎬ユ晳杞繍 - 杞叆鍖婚櫌淇℃伅 -->
+      <!-- 杞繍 - 杞叆鍖婚櫌淇℃伅 -->
       <view class="detail-section" v-if="taskDetail.taskType === 'EMERGENCY_TRANSFER' && taskDetail.emergencyInfo">
         <view class="section-title">杞叆鍖婚櫌淇℃伅</view>
         <view class="info-item" v-if="taskDetail.emergencyInfo.hospitalInName">
@@ -177,7 +177,7 @@
         </view>
       </view>
       
-      <!-- 鎬ユ晳杞繍 - 璐圭敤淇℃伅 -->
+      <!-- 杞繍 - 璐圭敤淇℃伅 -->
       <view class="detail-section" v-if="taskDetail.taskType === 'EMERGENCY_TRANSFER' && taskDetail.emergencyInfo">
         <view class="section-title">璐圭敤淇℃伅</view>
         <view class="info-item" v-if="taskDetail.emergencyInfo.transferDistance">
@@ -315,12 +315,69 @@
 
 <script>
   import { getTask, changeTaskStatus } from '@/api/task'
+  import { formatDateTime } from '@/utils/common'
   
   export default {
     data() {
       return {
         taskDetail: null,
         taskId: null
+      }
+    },
+    computed: {
+      // 鏄剧ず浠诲姟绫诲瀷
+      displayTaskType() {
+        if (!this.taskDetail || !this.taskDetail.taskType) {
+          return '鏈缃�'
+        }
+        return this.getTaskTypeText(this.taskDetail.taskType)
+      },
+      // 鏄剧ず浠诲姟鐘舵��
+      displayTaskStatus() {
+        if (!this.taskDetail || !this.taskDetail.taskStatus) {
+          return '鏈缃�'
+        }
+        return this.getStatusText(this.taskDetail.taskStatus)
+      },
+      // 鐘舵�佹牱寮忕被
+      statusClass() {
+        if (!this.taskDetail || !this.taskDetail.taskStatus) {
+          return ''
+        }
+        const status = this.taskDetail.taskStatus
+        if (status === 'PENDING') return 'pending'
+        if (['DEPARTING', 'ARRIVED', 'RETURNING', 'IN_PROGRESS'].includes(status)) return 'in_progress'
+        if (status === 'COMPLETED') return 'completed'
+        if (status === 'CANCELLED') return 'cancelled'
+        return ''
+      },
+      // 鏄剧ず璁″垝寮�濮嬫椂闂�
+      displayPlannedStartTime() {
+        if (!this.taskDetail || !this.taskDetail.plannedStartTime) {
+          return '鏈缃�'
+        }
+        return formatDateTime(this.taskDetail.plannedStartTime, 'YYYY-MM-DD HH:mm')
+      },
+      // 鏄剧ず璁″垝缁撴潫鏃堕棿
+      displayPlannedEndTime() {
+        if (!this.taskDetail || !this.taskDetail.plannedEndTime) {
+          return '鏈缃�'
+        }
+        return formatDateTime(this.taskDetail.plannedEndTime, 'YYYY-MM-DD HH:mm')
+      },
+      // 鏄剧ず瀹為檯寮�濮嬫椂闂�
+      displayActualStartTime() {
+        if (!this.taskDetail || !this.taskDetail.actualStartTime) {
+          return '鏈缃�'
+        }
+        return formatDateTime(this.taskDetail.actualStartTime, 'YYYY-MM-DD HH:mm')
+      },
+      // 鏄剧ず瀹為檯缁撴潫鏃堕棿
+      displayActualEndTime() {
+        if (!this.taskDetail || !this.taskDetail.actualEndTime) {
+          return '鏈缃�'
+        }
+        return formatDateTime(this.taskDetail.actualEndTime, 'YYYY-MM-DD HH:mm')
       }
     },
     onLoad(options) {
@@ -338,7 +395,9 @@
         getTask(this.taskId).then(response => {
           this.taskDetail = response.data || response
           // 璋冭瘯锛氭墦鍗拌繑鍥炵殑鏁版嵁
-          console.log('浠诲姟璇︽儏鏁版嵁:', this.taskDetail)
+          console.log('浠诲姟璇︽儏瀹屾暣鏁版嵁:', JSON.stringify(this.taskDetail, null, 2))
+          console.log('浠诲姟绫诲瀷瀛楁鍊�:', this.taskDetail.taskType)
+          console.log('浠诲姟鐘舵�佸瓧娈靛��:', this.taskDetail.taskStatus)
           console.log('鍑哄彂鍦板潃:', this.taskDetail.departureAddress)
           console.log('鐩殑鍦板潃:', this.taskDetail.destinationAddress)
         }).catch(error => {
@@ -374,7 +433,7 @@
       
       // 鑾峰彇璺濈淇℃伅锛氭牴鎹换鍔$被鍨嬭繑鍥炰笉鍚屽瓧娈�
       getDistanceInfo(task) {
-        // 鎬ユ晳杞繍锛氫紭鍏堜娇鐢╰ransferDistance
+        // 杞繍锛氫紭鍏堜娇鐢╰ransferDistance
         if (task.taskType === 'EMERGENCY_TRANSFER' && task.emergencyInfo && task.emergencyInfo.transferDistance) {
           return task.emergencyInfo.transferDistance
         }
@@ -389,19 +448,6 @@
       // 杩斿洖涓婁竴椤�
       goBack() {
         uni.navigateBack()
-      },
-      
-      // 鏍煎紡鍖栨棩鏈熸椂闂�
-      formatDateTime(dateTime) {
-        if (!dateTime) return '鏈缃�'
-        const date = new Date(dateTime)
-        return date.toLocaleString('zh-CN', {
-          year: 'numeric',
-          month: '2-digit',
-          day: '2-digit',
-          hour: '2-digit',
-          minute: '2-digit'
-        })
       },
       
       // 鑾峰彇鐘舵�佹枃鏈�
@@ -424,7 +470,7 @@
           'MAINTENANCE': '缁翠慨淇濆吇',
           'FUEL': '鍔犳补',
           'OTHER': '鍏朵粬',
-          'EMERGENCY_TRANSFER': '鎬ユ晳杞繍',
+          'EMERGENCY_TRANSFER': '杞繍浠诲姟',
           'WELFARE': '绂忕杞�'
         }
         return typeMap[type] || '鏈煡绫诲瀷'

--
Gitblit v1.9.1