diff --git a/docs/frontend-page-resource-manifest.json b/docs/frontend-page-resource-manifest.json index 75770a3..539c3aa 100644 --- a/docs/frontend-page-resource-manifest.json +++ b/docs/frontend-page-resource-manifest.json @@ -408,7 +408,7 @@ "name": "personal-center_overtime-application", "path": "/personal-center/overtime-application", "component": "view.personal-center_overtime-application", - "title": "加班申请", + "title": "业务学习", "routeTitle": "personal-center_overtime-application", "i18nKey": "route.personal-center_overtime-application", "icon": "mdi:clock-plus-outline", @@ -422,7 +422,7 @@ "redirect": null, "props": null, "meta": { - "title": "加班申请", + "title": "业务学习", "i18nKey": "route.personal-center_overtime-application", "icon": "mdi:clock-plus-outline", "localIcon": null, diff --git a/src/constants/dict.ts b/src/constants/dict.ts index fbd022a..4ca7efc 100644 --- a/src/constants/dict.ts +++ b/src/constants/dict.ts @@ -113,9 +113,9 @@ export const RDMS_REQ_CAN_DELETE_STATUS_DICT_CODE = 'rdms_req_can_delete_status' export const RDMS_WORKLOG_DIFFICULTY_DICT_CODE = 'rdms_task_item_worklog_difficulty'; /** - * 加班时长快捷选项字典编码 + * 学习时长快捷选项字典编码 * - * 对应业务字段:加班申请中的 overtimeDuration + * 对应业务字段:业务学习中的 overtimeDuration * 来源口径:`overtime-application-design.md` 明确时长下拉字典为 rdms_overtime_duration */ export const RDMS_OVERTIME_DURATION_DICT_CODE = 'rdms_overtime_duration'; diff --git a/src/constants/status-tag.ts b/src/constants/status-tag.ts index f1804e3..d9e450a 100644 --- a/src/constants/status-tag.ts +++ b/src/constants/status-tag.ts @@ -104,7 +104,7 @@ const statusTagTypeRegistry: Record> completed: 'success', cancelled: 'danger' }, - // 加班申请 + // 业务学习 overtimeApplication: { pending: 'warning', approved: 'success', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index e887148..0385a2e 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -175,7 +175,7 @@ const local: App.I18n.Schema = { 'personal-center_work-report_project': '项目半月报', 'personal-center_my-performance': '我的绩效', 'personal-center_my-application': '我的申请', - 'personal-center_overtime-application': '加班申请', + 'personal-center_overtime-application': '业务学习', 'personal-center_pending-approval': '待我审批', feedback: '意见反馈', infra: '基础设施', diff --git a/src/views/personal-center/overtime-application/index.vue b/src/views/personal-center/overtime-application/index.vue index 0a2903d..31f27e0 100644 --- a/src/views/personal-center/overtime-application/index.vue +++ b/src/views/personal-center/overtime-application/index.vue @@ -180,7 +180,7 @@ const { columns, columnChecks, data, loading, getDataByPage, mobilePagination, r { prop: 'index', type: 'index', label: '序号', width: 64 }, { prop: 'overtimeDate', - label: '加班日期', + label: '学习日期', width: 120, formatter: row => formatOvertimeDate(row.overtimeDate) } @@ -191,17 +191,17 @@ const { columns, columnChecks, data, loading, getDataByPage, mobilePagination, r } cols.push( - { prop: 'overtimeDuration', label: '加班时长', width: 110, showOverflowTooltip: true }, + { prop: 'overtimeDuration', label: '学习时长', width: 110, showOverflowTooltip: true }, { prop: 'overtimeReason', - label: '加班原因', + label: '学习原因', minWidth: 180, className: 'overtime-application__cell-ellipsis', formatter: row => formatEmptyText(row.overtimeReason) }, { prop: 'overtimeContent', - label: '加班内容', + label: '学习内容', minWidth: 200, className: 'overtime-application__cell-ellipsis', formatter: row => formatEmptyText(row.overtimeContent) @@ -357,7 +357,7 @@ async function handleExport() { return; } - downloadBlob(blob, `加班申请_${dayjs().format('YYYY-MM-DD')}.xls`); + downloadBlob(blob, `业务学习_${dayjs().format('YYYY-MM-DD')}.xls`); } async function loadSubordinateTree() { @@ -485,7 +485,7 @@ watch(