diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js index 90aeb7e..b31c4bf 100644 --- a/src/pages/audits/data.data.js +++ b/src/pages/audits/data.data.js @@ -10,7 +10,12 @@ export default { dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name') }, - + { + title: '拒绝原因', + dataIndex: 'remarks', + labelPosition: 'top', + isShow: (row) => row?.check_status == 4 + }, { title: '申请人', dataIndex: 'check.employee.name'}, { diff --git a/src/pages/task/detail.vue b/src/pages/task/detail.vue index fa29418..8a8ab03 100644 --- a/src/pages/task/detail.vue +++ b/src/pages/task/detail.vue @@ -27,6 +27,12 @@ const baseColums = [ return statusFun(value, 'task_hygienes', 'name') }, }, + { + title: '拒绝原因', + dataIndex: 'taskable.workflow_check.check_remarks', + labelPosition: 'top', + isShow: (row) => row?.taskable?.workflow_check.check_status == 4 + }, { title: '申请人', dataIndex: 'taskable.store_master.name', diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue index 2128a22..d284fb9 100644 --- a/src/pages/task/index.vue +++ b/src/pages/task/index.vue @@ -27,7 +27,7 @@ :key="item.id" :title="item.name" :status-text="item.taskable.status_text" - :status-color="statusFun(item.taskable.status, 'statusExpense' ,'color')" + :status-color="statusFun(item.taskable.status, 'task_hygienes' ,'color')" :body="[ {label: '任务时间: ', value: item.start_format + '-' + item.end_format} ]"