diff --git a/src/locales/en.ts b/src/locales/en.ts index 34e8de34..de7ad477 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -1335,7 +1335,10 @@ export default { qrcodeEmpty: 'No QR code', validatorDeviceCodeRequired: 'Code can not be empty', gjTitle: 'Select key components', - bjTitle: 'Select spare parts' + bjTitle: 'Select spare parts', + Detail: { + invalidId: 'Invalid device ID' + } }, // Critical Component EquipmentKeyItems: { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 6538189a..de80fcf7 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1249,7 +1249,7 @@ export default { statusDisabled: '不启用', deviceType: '类型', deviceSpec: '规格型号', - /* deviceModel: '型号',*/ + deviceModel: '型号', isSchedueld: '是否排产', ratedCapacity: '额定产能', yes: '是', @@ -1324,7 +1324,10 @@ export default { qrcodeEmpty: '暂无二维码', validatorDeviceCodeRequired: '编码不能为空', gjTitle: '选择关键件', - bjTitle: '选择备件' + bjTitle: '选择备件', + Detail: { + invalidId: '无效的设备ID' + } }, // 设备关键件 EquipmentKeyItems: { diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index a35d03d5..e6609c3f 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -683,6 +683,17 @@ const remainingRouter: AppRouteRecordRaw[] = [ activeMenu: '/mes/productionReport' }, component: () => import('@/views/mes/productionReport/detail/index.vue') + }, + { + path: 'device-ledger/detail/:id', + name: 'MesDeviceLedgerDetail', + meta: { + title: '设备台账详情', + noCache: true, + hidden: true, + activeMenu: '/mes/deviceledger' + }, + component: () => import('@/views/mes/deviceledger/detail/index.vue') } ] } diff --git a/src/views/mes/deviceledger/detail/index.vue b/src/views/mes/deviceledger/detail/index.vue new file mode 100644 index 00000000..360de443 --- /dev/null +++ b/src/views/mes/deviceledger/detail/index.vue @@ -0,0 +1,938 @@ + + + + + diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue index a49541c8..76c94b6c 100644 --- a/src/views/mes/deviceledger/index.vue +++ b/src/views/mes/deviceledger/index.vue @@ -245,459 +245,6 @@ - - -
-
{{ - t('EquipmentManagement.EquipmentLedger.detail') - }} -
- - - -
- - - {{ detailData?.deviceCode ?? '' }} - - - {{ detailData?.deviceName ?? '' }} - - - - - - - {{ detailData?.deviceModel ?? '' }} - - - {{ detailData?.deviceSpec ?? '' }} - - - {{ - getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType) - }} - - - - - - - {{ detailData?.deviceLocation ?? '' }} - - - {{ detailData?.deviceManagerName ?? '' }} - - - {{ formatDetailDate(detailData?.productionDate) }} - - - {{ - formatDetailDate(detailData?.factoryEntryDate) - }} - - {{ - detailData?.remark ?? detailData?.deviceRemark ?? '' - }} - - - {{ detailData?.creatorName ?? '' }} - - - {{ formatDetailDate(detailData?.createTime) }} - - - {{ formatDetailDate(detailData?.updateTime) }} - - - - - - - - -
- -
- - -
- - {{ - t('common.query') - }} - - {{ t('common.reset') }} - - - {{ t('action.export') }} - -
- - - - - - - -
- -
- - {{ - t('common.query') - }} - - {{ t('common.reset') }} - - - {{ t('action.export') }} - -
- - - - - - - -
- -
- - {{ - t('common.query') - }} - - {{ t('common.reset') }} - - - {{ t('action.export') }} - -
- - - - -
-
-
- {{ row.subjectCode ?? '-' }} - {{ - row.subjectName ?? '-' - }} -
-
-
- {{ - t('EquipmentManagement.EquipmentLedger.projectName') - }} - {{ - row.subjectContent ?? '-' - }} -
-
- {{ - t('EquipmentManagement.EquipmentLedger.repairResult') - }} - - - {{ getResultLabel(row.repairResult ?? row.result) }} - - -
-
- {{ - t('EquipmentManagement.EquipmentLedger.remark') - }} - {{ - row.remark ?? '-' - }} -
-
- {{ - t('EquipmentManagement.EquipmentLedger.finishDate') - }} - {{ - String(formatHistoryTime(row.finishDate)).split(' ')[0] - }} -
-
- - - -
-
-
-
-
-
-
- -
- - - {{ t('action.export') }} - -
- - - - - - - -
- -
- - - {{ t('action.export') }} - -
- - - - - - - -
- - - - - - - - - -
-
@@ -706,18 +253,13 @@