From 847a7773ef1a8ad418c6934d35b5f205a97c04d0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 06 十二月 2025 17:03:24 +0800
Subject: [PATCH] fix:在任务状态更新时，需要更新日志到旧系统
---
app/pagesTask/detail.vue | 309 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 253 insertions(+), 56 deletions(-)
diff --git a/app/pagesTask/detail.vue b/app/pagesTask/detail.vue
index 781b0d4..277d825 100644
--- a/app/pagesTask/detail.vue
+++ b/app/pagesTask/detail.vue
@@ -28,19 +28,54 @@
<view class="label">鎵ц杞﹁締</view>
<view class="value">{{ getVehicleInfo(taskDetail) }}</view>
</view>
- <view class="info-item">
- <view class="label">鎵ц浜哄憳</view>
- <view class="value">{{ taskDetail.assigneeName || '鏈垎閰�' }}</view>
+ </view>
+
+ <!-- 鎵ц浜哄憳鍒楄〃 -->
+ <view class="detail-section">
+ <view class="section-title">鎵ц浜哄憳</view>
+ <view v-if="taskDetail.assignees && taskDetail.assignees.length > 0" class="assignee-list">
+ <view
+ class="assignee-item"
+ v-for="(assignee, index) in taskDetail.assignees"
+ :key="'assignee-' + (assignee.userId || assignee.userName || index)"
+ >
+ <view class="assignee-index">{{ index + 1 }}</view>
+ <view class="assignee-info">
+ <view class="assignee-name">
+ {{ assignee.userName }}
+ <view v-if="assignee.isPrimary === '1'" class="primary-badge">
+ <uni-icons type="star-filled" size="12" color="#ff9500"></uni-icons>
+ <text>璐熻矗浜�</text>
+ </view>
+ </view>
+ <view class="assignee-role">
+ <view
+ class="role-tag"
+ :class="{
+ 'role-driver': assignee.userType === 'driver',
+ 'role-doctor': assignee.userType === 'doctor',
+ 'role-nurse': assignee.userType === 'nurse'
+ }"
+ >
+ {{ getUserTypeLabel(assignee.userType) }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view v-else class="empty-assignee">
+ <uni-icons type="info" size="40" color="#ccc"></uni-icons>
+ <text>鏆傛棤鎵ц浜哄憳</text>
</view>
</view>
<view class="detail-section">
<view class="section-title">鏃堕棿淇℃伅</view>
<view class="info-item">
- <view class="label">璁″垝寮�濮嬫椂闂�</view>
+ <view class="label">棰勭害鏃堕棿</view>
<view class="value">{{ displayPlannedStartTime }}</view>
</view>
- <view class="info-item">
+ <view class="info-item" v-if="taskDetail.plannedEndTime">
<view class="label">璁″垝缁撴潫鏃堕棿</view>
<view class="value">{{ displayPlannedEndTime }}</view>
</view>
@@ -96,12 +131,12 @@
</view>
</view>
- <view class="detail-section" v-if="taskDetail.taskDescription">
+ <view class="detail-section" v-if="taskDetail.taskDescription && taskDetail.taskType !== 'EMERGENCY_TRANSFER'">
<view class="section-title">浠诲姟鎻忚堪</view>
<view class="description">{{ taskDetail.taskDescription }}</view>
</view>
- <view class="detail-section" v-if="taskDetail.remark">
+ <view class="detail-section" v-if="taskDetail.remark && taskDetail.taskType !== 'EMERGENCY_TRANSFER'">
<view class="section-title">澶囨敞淇℃伅</view>
<view class="description">{{ taskDetail.remark }}</view>
</view>
@@ -215,8 +250,8 @@
<view class="section-title">鏀粯璁板綍</view>
<view
class="payment-record-item"
- v-for="payment in paymentInfo.paidPayments"
- :key="payment.id"
+ v-for="(payment, index) in paymentInfo.paidPayments"
+ :key="'payment-' + (payment.id || index)"
>
<view class="payment-header">
<view
@@ -414,6 +449,7 @@
import { checkVehicleActiveTasks } from '@/api/task'
import { getPaymentInfo } from '@/api/payment'
import { formatDateTime } from '@/utils/common'
+ import { validateTaskForDepart, validateTaskForSettlement, getTaskVehicleId, checkTaskCanDepart } from '@/utils/taskValidator'
import AttachmentUpload from './components/AttachmentUpload.vue'
export default {
@@ -466,28 +502,48 @@
if (!this.taskDetail || !this.taskDetail.plannedStartTime) {
return '鏈缃�'
}
- return formatDateTime(this.taskDetail.plannedStartTime, 'YYYY-MM-DD HH:mm')
+ const formatted = formatDateTime(this.taskDetail.plannedStartTime, 'YYYY-MM-DD HH:mm')
+ // 濡傛灉骞翠唤鏄�1900,琛ㄧず鏃犳晥鏃ユ湡,鏄剧ず涓烘湭璁剧疆
+ if (formatted && formatted.startsWith('1900')) {
+ return '鏈缃�'
+ }
+ return formatted
},
// 鏄剧ず璁″垝缁撴潫鏃堕棿
displayPlannedEndTime() {
if (!this.taskDetail || !this.taskDetail.plannedEndTime) {
return '鏈缃�'
}
- return formatDateTime(this.taskDetail.plannedEndTime, 'YYYY-MM-DD HH:mm')
+ const formatted = formatDateTime(this.taskDetail.plannedEndTime, 'YYYY-MM-DD HH:mm')
+ // 濡傛灉骞翠唤鏄�1900,琛ㄧず鏃犳晥鏃ユ湡,鏄剧ず涓烘湭璁剧疆
+ if (formatted && formatted.startsWith('1900')) {
+ return '鏈缃�'
+ }
+ return formatted
},
// 鏄剧ず瀹為檯寮�濮嬫椂闂�
displayActualStartTime() {
if (!this.taskDetail || !this.taskDetail.actualStartTime) {
return '鏈缃�'
}
- return formatDateTime(this.taskDetail.actualStartTime, 'YYYY-MM-DD HH:mm')
+ const formatted = formatDateTime(this.taskDetail.actualStartTime, 'YYYY-MM-DD HH:mm')
+ // 濡傛灉骞翠唤鏄�1900,琛ㄧず鏃犳晥鏃ユ湡,鏄剧ず涓烘湭璁剧疆
+ if (formatted && formatted.startsWith('1900')) {
+ return '鏈缃�'
+ }
+ return formatted
},
// 鏄剧ず瀹為檯缁撴潫鏃堕棿
displayActualEndTime() {
if (!this.taskDetail || !this.taskDetail.actualEndTime) {
return '鏈缃�'
}
- return formatDateTime(this.taskDetail.actualEndTime, 'YYYY-MM-DD HH:mm')
+ const formatted = formatDateTime(this.taskDetail.actualEndTime, 'YYYY-MM-DD HH:mm')
+ // 濡傛灉骞翠唤鏄�1900,琛ㄧず鏃犳晥鏃ユ湡,鏄剧ず涓烘湭璁剧疆
+ if (formatted && formatted.startsWith('1900')) {
+ return '鏈缃�'
+ }
+ return formatted
}
},
onLoad(options) {
@@ -511,12 +567,12 @@
getTask(this.taskId).then(response => {
this.taskDetail = response.data || response
// 璋冭瘯锛氭墦鍗拌繑鍥炵殑鏁版嵁
- 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)
- console.log('杞繍浠诲姟淇℃伅 (emergencyInfo):', this.taskDetail.emergencyInfo)
+ // 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)
+ // console.log('杞繍浠诲姟淇℃伅 (emergencyInfo):', this.taskDetail.emergencyInfo)
// 濡傛灉鏄浆杩愪换鍔★紝鍔犺浇鏀粯淇℃伅
if (this.taskDetail.taskType === 'EMERGENCY_TRANSFER') {
@@ -580,9 +636,9 @@
return remaining > 0 ? remaining.toFixed(2) : '0.00'
},
- // 鑾峰彇杞﹁締淇℃伅
+ // 鑾峰彇杞﹁締淇℃伅锛堜慨澶嶏細闃叉 assignedVehicles 涓� null锛�
getVehicleInfo(task) {
- if (task.assignedVehicles && task.assignedVehicles.length > 0) {
+ if (task.assignedVehicles && Array.isArray(task.assignedVehicles) && task.assignedVehicles.length > 0) {
const firstVehicle = task.assignedVehicles[0]
let vehicleInfo = firstVehicle.vehicleNo || '鏈煡杞︾墝'
if (task.assignedVehicles.length > 1) {
@@ -685,8 +741,27 @@
return typeMap[type] || '鏈煡绫诲瀷'
},
+ // 鑾峰彇鐢ㄦ埛绫诲瀷鏍囩
+ getUserTypeLabel(userType) {
+ const typeMap = {
+ 'driver': '鍙告満',
+ 'doctor': '鍖荤敓',
+ 'nurse': '鎶ゅ＋'
+ }
+ return typeMap[userType] || userType || '鏈煡'
+ },
+
// 澶勭悊缁撶畻
handleSettlement() {
+ // 鏍￠獙浠诲姟鏄惁鍙互缁撶畻
+ const validation = validateTaskForSettlement(this.taskDetail)
+ if (!validation.valid) {
+ this.$modal.confirm(`${validation.message}锛岄渶瑕佸厛淇敼浠诲姟鍚庢墠鑳界粨绠椼�傛槸鍚︾幇鍦ㄥ幓淇敼锛焋).then(() => {
+ this.handleEdit()
+ }).catch(() => {})
+ return
+ }
+
uni.navigateTo({
url: '/pagesTask/settlement?taskId=' + this.taskId
})
@@ -738,60 +813,84 @@
},
// 妫�鏌ヨ溅杈嗙姸鎬佸苟鍑哄彂
- checkVehicleAndDepart() {
- // 鑾峰彇浠诲姟杞﹁締ID
- const vehicleId = this.getVehicleId();
- if (!vehicleId) {
- this.$modal.showToast('鏈壘鍒颁换鍔¤溅杈嗕俊鎭�');
- return;
- }
-
+ async checkVehicleAndDepart() {
// 鏄剧ず鍔犺浇鎻愮ず
uni.showLoading({
- title: '妫�鏌ヨ溅杈嗙姸鎬�...'
+ title: '妫�鏌ヤ换鍔＄姸鎬�...'
});
- checkVehicleActiveTasks(vehicleId).then(response => {
+ try {
+ // 璋冪敤宸ュ叿绫绘鏌ヤ换鍔℃槸鍚﹀彲浠ュ嚭鍙戯紙鍖呭惈鍩烘湰鏍￠獙鍜屽啿绐佹鏌ワ級
+ const checkResult = await checkTaskCanDepart(this.taskDetail)
+
uni.hideLoading();
- const activeTasks = response.data || [];
+ console.log('鍑哄彂妫�鏌ョ粨鏋�:', checkResult);
+ console.log('valid:', checkResult.valid);
+ console.log('conflicts:', checkResult.conflicts);
- // 杩囨护鎺夊綋鍓嶄换鍔℃湰韬�
- const otherActiveTasks = activeTasks.filter(task => task.taskId !== this.taskId);
-
- if (otherActiveTasks.length > 0) {
- // 杞﹁締鏈夊叾浠栨鍦ㄨ繘琛屼腑鐨勪换鍔�
- const task = otherActiveTasks[0];
- const taskStatus = this.getStatusText(task.taskStatus);
- const message = `璇ヨ溅杈嗗凡鏈夋鍦ㄨ浆杩愪腑鐨勪换鍔★紒
-
-浠诲姟鍗曞彿锛�${task.taskCode}
-浠诲姟鐘舵�侊細${taskStatus}
-
-璇峰厛瀹屾垚褰撳墠浠诲姟鍚庡啀鍑哄彂鏂颁换鍔°�俙;
+ if (!checkResult.valid) {
+ // 鏍￠獙澶辫触锛屾樉绀烘彁绀轰俊鎭苟鎻愪緵璺宠浆閫夐」
+ const conflicts = checkResult.conflicts || [];
+ const conflictInfo = conflicts.length > 0 ? conflicts[0] : null;
- uni.showModal({
- title: '鎻愮ず',
- content: message,
- showCancel: false,
- confirmText: '鎴戠煡閬撲簡'
- });
+ console.log('鍐茬獊淇℃伅:', conflictInfo);
+
+ // 濡傛灉鏈夊啿绐佷换鍔′俊鎭紝鎻愪緵璺宠浆鎸夐挳
+ if (conflictInfo && conflictInfo.taskId) {
+ console.log('鏄剧ず甯﹁烦杞寜閽殑寮圭獥锛屼换鍔D:', conflictInfo.taskId);
+
+ const conflictTaskId = conflictInfo.taskId;
+ const message = checkResult.message || conflictInfo.message || '瀛樺湪鍐茬獊浠诲姟';
+
+ uni.showModal({
+ title: '鎻愮ず',
+ content: message,
+ confirmText: '鍘诲鐞�',
+ cancelText: '鐭ラ亾浜�',
+ success: function(res) {
+ console.log('寮圭獥鐐瑰嚮缁撴灉:', res);
+ if (res.confirm) {
+ // 鐢ㄦ埛鐐瑰嚮"鐜板湪鍘诲鐞�"锛岃烦杞埌鍐茬獊浠诲姟璇︽儏椤�
+ console.log('鍑嗗璺宠浆鍒颁换鍔¤鎯呴〉:', conflictTaskId);
+ uni.redirectTo({
+ url: `/pagesTask/detail?id=${conflictTaskId}`
+ });
+ }
+ },
+ fail: function(err) {
+ console.error('鏄剧ず寮圭獥澶辫触:', err);
+ }
+ });
+ } else {
+ // 娌℃湁鍐茬獊浠诲姟ID锛屽彧鏄剧ず鎻愮ず
+ console.log('鏄剧ず鏅�氭彁绀哄脊绐�');
+ uni.showModal({
+ title: '鎻愮ず',
+ content: checkResult.message || '浠诲姟鏍￠獙澶辫触',
+ showCancel: false,
+ confirmText: '鐭ラ亾浜�',
+ fail: function(err) {
+ console.error('鏄剧ず寮圭獥澶辫触:', err);
+ }
+ });
+ }
return;
}
- // 杞﹁締娌℃湁鍏朵粬姝ｅ湪杩涜涓殑浠诲姟锛屽彲浠ュ嚭鍙�
+ // 鎵�鏈夋鏌ラ�氳繃锛屽彲浠ュ嚭鍙�
this.$modal.confirm('纭畾瑕佸嚭鍙戝悧锛�').then(() => {
this.updateTaskStatus('DEPARTING', '浠诲姟宸插嚭鍙�')
}).catch(() => {});
- }).catch(error => {
+ } catch (error) {
uni.hideLoading();
- console.error('妫�鏌ヨ溅杈嗙姸鎬佸け璐�:', error);
+ console.error('妫�鏌ヤ换鍔＄姸鎬佸け璐�:', error);
// 妫�鏌ュけ璐ユ椂锛屼粛鐒跺厑璁稿嚭鍙�
- this.$modal.confirm('妫�鏌ヨ溅杈嗙姸鎬佸け璐ワ紝鏄惁缁х画鍑哄彂锛�').then(() => {
+ this.$modal.confirm('妫�鏌ヤ换鍔＄姸鎬佸け璐ワ紝鏄惁缁х画鍑哄彂锛�').then(() => {
this.updateTaskStatus('DEPARTING', '浠诲姟宸插嚭鍙�')
}).catch(() => {});
- });
+ }
},
// 鑾峰彇浠诲姟杞﹁締ID
@@ -1205,6 +1304,104 @@
}
}
+ // 鎵ц浜哄憳鍒楄〃鏍峰紡
+ .assignee-list {
+ .assignee-item {
+ display: flex;
+ align-items: center;
+ padding: 20rpx;
+ margin-bottom: 15rpx;
+ background-color: #f9f9f9;
+ border-radius: 10rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .assignee-index {
+ width: 50rpx;
+ height: 50rpx;
+ border-radius: 50%;
+ background-color: #007AFF;
+ color: white;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 24rpx;
+ font-weight: bold;
+ margin-right: 20rpx;
+ flex-shrink: 0;
+ }
+
+ .assignee-info {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+
+ .assignee-name {
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ color: #333;
+ font-weight: 500;
+
+ .primary-badge {
+ display: inline-flex;
+ align-items: center;
+ gap: 4rpx;
+ margin-left: 12rpx;
+ padding: 4rpx 12rpx;
+ background-color: #fff3e0;
+ border-radius: 6rpx;
+
+ text {
+ font-size: 20rpx;
+ color: #ff9500;
+ font-weight: normal;
+ }
+ }
+ }
+
+ .assignee-role {
+ .role-tag {
+ display: inline-block;
+ padding: 4rpx 12rpx;
+ border-radius: 6rpx;
+ font-size: 22rpx;
+ color: white;
+
+ &.role-driver {
+ background-color: #007AFF;
+ }
+
+ &.role-doctor {
+ background-color: #34C759;
+ }
+
+ &.role-nurse {
+ background-color: #AF52DE;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .empty-assignee {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 60rpx 0;
+ color: #999;
+
+ text {
+ margin-top: 20rpx;
+ font-size: 28rpx;
+ }
+ }
+
.info-item {
display: flex;
margin-bottom: 20rpx;
--
Gitblit v1.9.1