From 3f963397921fe0280cd6811e1401130c55736225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 14 Jul 2025 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9B=B4=E6=8E=A5=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E4=B8=BA=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8F=8F=E8=BF=B0=E5=92=8C=E5=A4=87=E6=B3=A8=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AF=8C=E6=96=87=E6=9C=AC=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/workbench/task/reportTaskDetail.vue | 4 ++--
 pages/workbench/task/task.vue             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/workbench/task/reportTaskDetail.vue b/pages/workbench/task/reportTaskDetail.vue
index 78f4182..4a98bac 100644
--- a/pages/workbench/task/reportTaskDetail.vue
+++ b/pages/workbench/task/reportTaskDetail.vue
@@ -57,12 +57,12 @@
 			
 			<!-- 任务描述 -->
 			<view class="section-title">任务描述</view>
-			<view v-if="taskDetail.content" class="content-text">{{ taskDetail.content }}</view>
+			<mp-html v-if="taskDetail.content" :content="taskDetail.content" class="content-text" />
 			<view v-else class="empty-content">暂无任务描述</view>
 			
 			<!-- 备注 -->
 			<view v-if="taskDetail.remark" class="section-title">备注</view>
-			<view v-if="taskDetail.remark" class="content-text">{{ taskDetail.remark }}</view>
+			<mp-html v-if="taskDetail.remark" :content="taskDetail.remark" class="content-text" />
 			
 			<!-- 报工进度（仅报工任务显示） -->
 			<view v-if="isReportTask" class="section-title">报工进度</view>
diff --git a/pages/workbench/task/task.vue b/pages/workbench/task/task.vue
index ae8c8c4..1308f9a 100644
--- a/pages/workbench/task/task.vue
+++ b/pages/workbench/task/task.vue
@@ -309,7 +309,7 @@ export default {
 			try {
 				const response = await updateTask({
 					taskId: task.taskId,
-					state: 1,
+					state: 2, // 2表示任务已完成
 					completedTime: new Date()
 				});
 				if (response.code === 200) {