From 350cd566a2f44822965e8da772beebd185d93f0f Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Fri, 3 May 2024 17:53:23 +0800 Subject: [PATCH] status --- src/pages/task/detail.vue | 7 ++++++- src/utils/status.js | 35 +++++++++-------------------------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/pages/task/detail.vue b/src/pages/task/detail.vue index 769d866..fa29418 100644 --- a/src/pages/task/detail.vue +++ b/src/pages/task/detail.vue @@ -17,10 +17,15 @@ import { http } from '@/utils/request' import { ref, computed } from 'vue' import { timeFormat } from '@climblee/uv-ui/libs/function' import BaseData from '@/pages/audits/base-data' +import statusFun from '@/utils/status' + const baseColums = [ { title: '审核状态', - dataIndex: 'taskable.status_text', + dataIndex: 'taskable.status', + format: (value) => { + return statusFun(value, 'task_hygienes', 'name') + }, }, { title: '申请人', diff --git a/src/utils/status.js b/src/utils/status.js index 30233f8..f18bf48 100644 --- a/src/utils/status.js +++ b/src/utils/status.js @@ -24,36 +24,19 @@ const data = { statusExpense2: [ { value: 1, name: '未开始', color: '#f56c6c' }, { value: 2, name: '待审核', color: '#f56c6c' }, - { value: 3, name: '审核通过', color: '#3c9cff' }, + { value: 3, name: '已通过', color: '#3c9cff' }, { value: 4, name: '未通过', color: '#999999' }, { value: 5, name: '已取消', color: '#999999' } ], //清洁任务 - task_hygienes: [{ - value: 1, - name: '未开始', - color: '#f56c6c' - }, { - value: 2, - name: '待完成', - color: '#f56c6c' - }, { - value: 3, - name: '审核中', - color: '#3c9cff' - }, { - value: 4, - name: '未通过', - color: '#999999' - }, { - value: 5, - name: '已完成', - color: '#3c9cff' - }, { - value: 6, - name: '未完成', - color: '#999999' - }], + task_hygienes: [ + { value: 1, name: '未开始', color: '#f56c6c' }, + { value: 2, name: '待完成', color: '#f56c6c' }, + { value: 3, name: '已完成', color: '#3c9cff' }, + { value: 4, name: '未完成', color: '#999999' }, + { value: 5, name: '审核中', color: '#3c9cff' }, + { value: 6, name: '未通过', color: '#999999' } + ], //总账录入 task_ledgers: [{ value: 1,