diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js index c7eb76f..ca6d721 100644 --- a/src/pages/audits/data.data.js +++ b/src/pages/audits/data.data.js @@ -203,7 +203,7 @@ export default { { title: '加班日期', dataIndex: 'check.subject.date_format' }, { title: '开始时间', dataIndex: 'check.subject.start_format' }, { title: '结束时间', dataIndex: 'check.subject.end_format' }, - { title: '加班时长(时)', dataIndex: 'check.subject.hours' }, + { title: '加班时长', dataIndex: 'check.subject.hours' ,format: (value) => value + ' 小时'}, { title: '加班事由', dataIndex: 'check.subject.reason', labelPosition: 'top' }, { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, ] diff --git a/src/pages/overtime/detail.vue b/src/pages/overtime/detail.vue index 7157c45..d3eefef 100644 --- a/src/pages/overtime/detail.vue +++ b/src/pages/overtime/detail.vue @@ -57,7 +57,7 @@ const columns = [ { title: '加班日期', dataIndex: 'date_format' }, { title: '开始时间', dataIndex: 'start_format' }, { title: '结束时间', dataIndex: 'end_format' }, - { title: '加班时长(时)', dataIndex: 'hours' }, + { title: '加班时长', dataIndex: 'hours',format: (value) => value + ' 小时' }, { title: '请假事由', dataIndex: 'reason', labelPosition: 'top' }, ] diff --git a/src/pages/overtime/list.vue b/src/pages/overtime/list.vue index cbe920c..36b5c31 100644 --- a/src/pages/overtime/list.vue +++ b/src/pages/overtime/list.vue @@ -54,7 +54,7 @@ v-for="item in list" :key="item.id" title="加班报备" :status-text="statusFun( item.check_status,'statusExpense2','name')" - :status-color="statusFun( item.check_status,'statusExpense','color')" + :status-color="statusFun( item.check_status,'statusExpense2','color')" :body="[ { label:'申请人: ', value: item.check.subject.employee.name }, { label:'加班日期: ', value: item.check.subject.date_format },