diff --git a/src/locales/en.ts b/src/locales/en.ts index 82900d49..34e8de34 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -4367,7 +4367,12 @@ export default { detailTabRelatedPlan: 'Related Plans', detailTabQualityInfo: 'Quality Info', detailTabBaogongInfo: 'Work Report', - exportFilename: 'ProductionReport' + exportFilename: 'ProductionReport', + tableOperate: 'Operate', + detail: 'Detail' + }, + Detail: { + invalidId: 'Invalid parameter, task ID cannot be empty' }, BasicInfo: { buttonRefresh: 'Refresh', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 12eea406..6538189a 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -4578,7 +4578,12 @@ export default { detailTabRelatedPlan: '关联计划', detailTabQualityInfo: '质检信息', detailTabBaogongInfo: '报工信息', - exportFilename: '生产报表' + exportFilename: '生产报表', + tableOperate: '操作', + detail: '详情' + }, + Detail: { + invalidId: '参数错误,任务单ID不能为空' }, BasicInfo: { buttonRefresh: '刷新', diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 659eafb2..a35d03d5 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -672,6 +672,17 @@ const remainingRouter: AppRouteRecordRaw[] = [ activeMenu: '/mes/plan' }, component: () => import('@/views/mes/plan/index.vue') + }, + { + path: 'production-report/detail/:id', + name: 'MesProductionReportDetail', + meta: { + title: '生产报工详情', + noCache: true, + hidden: true, + activeMenu: '/mes/productionReport' + }, + component: () => import('@/views/mes/productionReport/detail/index.vue') } ] } diff --git a/src/views/mes/productionReport/detail/index.vue b/src/views/mes/productionReport/detail/index.vue new file mode 100644 index 00000000..d3fe5bbc --- /dev/null +++ b/src/views/mes/productionReport/detail/index.vue @@ -0,0 +1,152 @@ + + + + + + {{ detailData?.code ?? '' }} + + + {{ formatDetailDate(detailData?.orderDate) }} + + + {{ formatDetailDate(detailData?.deliveryDate ?? detailData?.finishDate) }} + + + + + + + {{ detailData?.isScheduled ? t('ProductionReport.Index.yes') : t('ProductionReport.Index.no') }} + + + + + + {{ productionProgress }}% + + + + {{ detailData?.remark ?? '' }} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/mes/productionReport/index.vue b/src/views/mes/productionReport/index.vue index ed786dd7..04815c51 100644 --- a/src/views/mes/productionReport/index.vue +++ b/src/views/mes/productionReport/index.vue @@ -90,8 +90,6 @@ :data="list" :stripe="true" :show-overflow-tooltip="true" - highlight-current-row - @current-change="handleCurrentChange" > @@ -128,6 +126,13 @@ + + + + {{ t('ProductionReport.Index.detail') }} + + + - - - - - - - - - - - - - - - - -