From f15cf2ce655140790822960c396c16dd2eee0afb Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Mon, 27 May 2024 01:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/make-card/detail.vue | 1 +
 src/pages/task/detail.vue      | 6 +++---
 src/pages/task/index.vue       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/make-card/detail.vue b/src/pages/make-card/detail.vue
index 1544571..8c87ea9 100644
--- a/src/pages/make-card/detail.vue
+++ b/src/pages/make-card/detail.vue
@@ -72,6 +72,7 @@ const detailColumns = [
   {
     title: "外勤事由",
     dataIndex: "outside_remarks",
+    labelPosition: 'top',
     isShow: (data) => data?.sign_type == 2
   },
   {
diff --git a/src/pages/task/detail.vue b/src/pages/task/detail.vue
index 4a51f28..3762356 100644
--- a/src/pages/task/detail.vue
+++ b/src/pages/task/detail.vue
@@ -1,9 +1,9 @@
 <template>
   <view class="px-base">
     <CuNavbar title="任务详情">
-      <template #right>
+      <!-- <template #right>
         <view class="text-sm text-white" @click="checkLogs">审核流程</view>
-      </template>
+      </template> -->
     </CuNavbar>
     <view class="mt-30rpx card-shadow bg-white rounded-19rpx px-base text-[#333333] text-27rpx">
       <BaseData :data="data" :colums="baseColums" />
@@ -57,7 +57,7 @@ const baseColums = [
     dataIndex: 'taskable.workflow_check.check_remarks',
     labelPosition: 'top',
     isShow: (row) => {
-      return row?.taskable?.status == 4
+      return row?.taskable?.workflow_check?.check_status == 4
     }
   },
 ]
diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue
index f0dbd6a..e5b4505 100644
--- a/src/pages/task/index.vue
+++ b/src/pages/task/index.vue
@@ -129,7 +129,7 @@ const applyClick = (item) => {
   const type = item.taskable_type
   const status = item.taskable.status
   let url
-  if (status === 2 || status == 4 || type=='task_ledgers') {
+  if (status === 2 || status == 4 || status == 6 || type=='task_ledgers') {
     const date = status != 3 || status != 5 ? `&date=${item.taskable.date}` : ''
     url = `/pages/task/${type}_submit?id=${item.id}${date}`
   } else {