diff --git a/src/pages/expense-account/detail.vue b/src/pages/expense-account/detail.vue index 68c88e3..b028471 100644 --- a/src/pages/expense-account/detail.vue +++ b/src/pages/expense-account/detail.vue @@ -22,6 +22,8 @@ import BaseData from '@/pages/audits/base-data.vue' import { ref } from 'vue' import { onLoad ,onShow} from '@dcloudio/uni-app' import { http } from '@/utils/request' +import statusFun from '@/utils/status' + const modalRef = ref(null) const actions = ref([ { name: '修改', value: 'edit', disabled: false }, @@ -32,7 +34,8 @@ const actions = ref([ const colums = [ { title: '审核状态', - dataIndex: 'workflow_check.check_status_text', + dataIndex: 'workflow_check.check_status', + format: (value) => statusFun(value, 'statusExpense', 'name') }, { title: '申请人', @@ -70,11 +73,9 @@ const colums = [ }, { title: '未通过原因', - dataIndex: 'remarks', + dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', - isShow: (item) => { - return item?.check_status == 4 - }, + isShow: (item) => item?.workflow_check.check_status == 4, }, ] const actionSheet = ref(null) diff --git a/src/pages/expense-account/index.vue b/src/pages/expense-account/index.vue index f5259bd..3944593 100644 --- a/src/pages/expense-account/index.vue +++ b/src/pages/expense-account/index.vue @@ -30,7 +30,7 @@ :key="item.id" :title="item.type?.name" :status-text="statusFun(item.workflow_check?.check_status, 'statusExpense', 'name')" - :status-color="statusFun(item.workflow_check?.check_status,'statusExpense','color')" + :status-color="statusFun(item.workflow_check?.check_status, 'statusExpense', 'color')" :body="[ { label: '报销金额: ', value: item.expense }, { label: '报销原因: ', value: item.reason }, @@ -55,8 +55,8 @@ v-for="item in list" :key="item.id" :title="item.check.subject.type?.name" - :status-text="statusFun( item.check_status,'statusExpense2','name')" - :status-color="statusFun( item.check_status,'statusExpense2','color')" + :status-text="statusFun(item.check_status, 'statusExpense2', 'name')" + :status-color="statusFun(item.check_status, 'statusExpense2', 'color')" :body="[ { label: '申请人: ', value: item.check.subject.employee.name }, { label: '报销金额: ', value: item.check.subject.expense }, diff --git a/src/utils/status.js b/src/utils/status.js index a74e752..cf5d679 100644 --- a/src/utils/status.js +++ b/src/utils/status.js @@ -21,7 +21,7 @@ const data = { { value: 4, name: '未通过', color: '#999999' }, { value: 5, name: '已取消', color: '#999999' } ], - //清洁任务 + // 清洁任务 task_hygienes: [ { value: 1, name: '未开始', color: '#f56c6c' }, { value: 2, name: '待完成', color: '#f56c6c' }, @@ -64,30 +64,6 @@ const data = { { value: 4, name: '已通过', color: '#3c9cff' }, { value: 5, name: '未通过', color: '#999999' } ], - // 不卡申请 - workflow_check: [ - { - value: 1, - name: '待提审', - color: '#f56c6c' - }, { - value: 2, - name: '审核中', - color: '#f56c6c' - }, { - value: 3, - name: '已通过', - color: '#3c9cff' - }, { - value: 4, - name: '审核未通过', - color: '#999999' - }, { - value: 5, - name: '已取消', - color: '#999999' - } - ], shore_task_status: [{ value: 1, name: '未开始',