main
ihzero 2024-05-27 01:00:09 +08:00
parent ea604057f4
commit f15cf2ce65
3 changed files with 5 additions and 4 deletions

View File

@ -72,6 +72,7 @@ const detailColumns = [
{ {
title: "外勤事由", title: "外勤事由",
dataIndex: "outside_remarks", dataIndex: "outside_remarks",
labelPosition: 'top',
isShow: (data) => data?.sign_type == 2 isShow: (data) => data?.sign_type == 2
}, },
{ {

View File

@ -1,9 +1,9 @@
<template> <template>
<view class="px-base"> <view class="px-base">
<CuNavbar title="任务详情"> <CuNavbar title="任务详情">
<template #right> <!-- <template #right>
<view class="text-sm text-white" @click="checkLogs"></view> <view class="text-sm text-white" @click="checkLogs"></view>
</template> </template> -->
</CuNavbar> </CuNavbar>
<view class="mt-30rpx card-shadow bg-white rounded-19rpx px-base text-[#333333] text-27rpx"> <view class="mt-30rpx card-shadow bg-white rounded-19rpx px-base text-[#333333] text-27rpx">
<BaseData :data="data" :colums="baseColums" /> <BaseData :data="data" :colums="baseColums" />
@ -57,7 +57,7 @@ const baseColums = [
dataIndex: 'taskable.workflow_check.check_remarks', dataIndex: 'taskable.workflow_check.check_remarks',
labelPosition: 'top', labelPosition: 'top',
isShow: (row) => { isShow: (row) => {
return row?.taskable?.status == 4 return row?.taskable?.workflow_check?.check_status == 4
} }
}, },
] ]

View File

@ -129,7 +129,7 @@ const applyClick = (item) => {
const type = item.taskable_type const type = item.taskable_type
const status = item.taskable.status const status = item.taskable.status
let url 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}` : '' const date = status != 3 || status != 5 ? `&date=${item.taskable.date}` : ''
url = `/pages/task/${type}_submit?id=${item.id}${date}` url = `/pages/task/${type}_submit?id=${item.id}${date}`
} else { } else {