diff --git a/src/api/mes/deviceledger/index.ts b/src/api/mes/deviceledger/index.ts index a01141b3..32040d08 100644 --- a/src/api/mes/deviceledger/index.ts +++ b/src/api/mes/deviceledger/index.ts @@ -10,6 +10,7 @@ export interface DeviceLedgerVO { deviceName: string // 设备名称 deviceStatus: number // 设备状态 (0-正常, 1-停用, 2-维修, 3-报废) deviceBrand: string // 设备品牌 + sn?: string // 序列号 deviceModel: string // 设备型号 deviceSpec: string // 设备规格 deviceType: string | number // 设备类型 @@ -22,6 +23,7 @@ export interface DeviceLedgerVO { useDept?: string // 使用部门 deviceManager: string // 设备负责人 productionDate: string | number | Date // 设备生产日期 + outgoingTime?: string | number | Date // 出厂日期 factoryEntryDate: string | number | Date // 设备入厂日期 deviceRemark: string // 设备备注 remark: string // 备注 diff --git a/src/locales/en.ts b/src/locales/en.ts index 49418503..80c41672 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -1283,6 +1283,7 @@ export default { yes: 'Yes', no: 'No', productionDate: 'Production Date', + outgoingTime: 'Outgoing Date', factoryEntryDate: 'Factory Entry Date', deviceLocation: 'Location', deviceManagerName: 'Manager', @@ -1301,8 +1302,11 @@ export default { placeholderDeviceType: 'Please select type', placeholderDeviceModel: 'Please input model', placeholderDeviceSpec: 'Please input spec', + placeholderDeviceBrand: 'Please input device brand', + placeholderSn: 'Please input serial number', placeholderRatedCapacity: 'Please input rated capacity', placeholderProductionDate: 'Please select production date', + placeholderOutgoingTime: 'Please select outgoing date', placeholderFactoryEntryDate: 'Please select factory entry date', placeholderDeviceLocation: 'Please input location', placeholderDeviceManagerIds: 'Please select manager', @@ -1311,6 +1315,7 @@ export default { placeholderBeijianIds: 'Please select spare part', deviceNo: 'Device No', deviceBrand: 'Device Brand', + sn: 'Serial Number', supplier: 'Supplier', workshop: 'Workshop', systemOrg: 'System Org', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 6e9a3026..2f358e03 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1273,6 +1273,7 @@ export default { yes: '是', no: '否', productionDate: '生产日期', + outgoingTime: '出厂日期', factoryEntryDate: '入厂日期', deviceLocation: '位置', deviceManagerName: '责任人', @@ -1291,8 +1292,11 @@ export default { placeholderDeviceType: '请选择类型', placeholderDeviceModel: '请输入型号', placeholderDeviceSpec: '请输入规格型号', + placeholderDeviceBrand: '请输入设备品牌', + placeholderSn: '请输入序列号', placeholderRatedCapacity: '请输入额定产能', placeholderProductionDate: '请选择生产日期', + placeholderOutgoingTime: '请选择出厂日期', placeholderFactoryEntryDate: '请选择入厂日期', placeholderDeviceLocation: '请输入位置', placeholderDeviceManagerIds: '请选择责任人', @@ -1301,6 +1305,7 @@ export default { placeholderBeijianIds: '请选择备件', deviceNo: '设备编号', deviceBrand: '设备品牌', + sn: '序列号', supplier: '供应商', workshop: '所属车间', systemOrg: '所属系统组织', diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue index a0ac55a6..80e7076b 100644 --- a/src/views/mes/deviceledger/DeviceLedgerForm.vue +++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue @@ -76,11 +76,12 @@ - + + + + + + + - - + + + - - - + + + @@ -497,6 +506,7 @@ const initFormData = () => ({ deviceName: undefined, deviceStatus: undefined, deviceBrand: undefined, + sn: undefined, deviceModel: undefined, deviceSpec: undefined, isScheduled: 0, @@ -509,6 +519,7 @@ const initFormData = () => ({ systemOrg: undefined, deviceManagerIds: [] as number[], productionDate: undefined, + outgoingTime: undefined, factoryEntryDate: undefined, remark: undefined, componentIds: [] as number[], @@ -698,6 +709,8 @@ const buildPrintData = () => { deviceName: formData.value.deviceName, deviceSpec: formData.value.deviceSpec, deviceBrand: formData.value.deviceBrand, + sn: formData.value.sn, + outgoingTime: formData.value.outgoingTime, deviceModel: formData.value.deviceModel, deviceLocation: formData.value.deviceLocation, remark: formData.value.remark, @@ -762,6 +775,7 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number, def deviceLine: normalizeNumberish((detail as any)?.deviceLine), deviceManagerIds: parseIdsValue((detail as any)?.deviceManager), productionDate: normalizeYmd((detail as any)?.productionDate), + outgoingTime: normalizeYmd((detail as any)?.outgoingTime), factoryEntryDate: normalizeYmd((detail as any)?.factoryEntryDate), componentIds: parseIdsValue((detail as any)?.componentId), beijianIds: parseIdsValue((detail as any)?.beijianId), @@ -996,6 +1010,7 @@ const submitForm = async () => { deviceType: normalizeNumberish(formData.value.deviceType), deviceLine: normalizeNumberish((formData.value as any).deviceLine), productionDate: normalizeYmd(formData.value.productionDate), + outgoingTime: normalizeYmd((formData.value as any).outgoingTime), factoryEntryDate: normalizeYmd(formData.value.factoryEntryDate), deviceManager: formData.value.deviceManagerIds?.length ? formData.value.deviceManagerIds.join(',') : undefined, componentId: formData.value.componentIds?.length ? formData.value.componentIds.join(',') : undefined, diff --git a/src/views/mes/deviceledger/detail/index.vue b/src/views/mes/deviceledger/detail/index.vue index 6337d473..db15ad10 100644 --- a/src/views/mes/deviceledger/detail/index.vue +++ b/src/views/mes/deviceledger/detail/index.vue @@ -47,12 +47,18 @@ - + {{ detailData?.deviceSpec ?? '' }} + + {{ detailData?.deviceBrand ?? '' }} + + + {{ detailData?.sn ?? '' }} + {{ getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType) }} @@ -62,8 +68,8 @@ {{ deviceManagerName }} - - {{ formatDetailDate(detailData?.productionDate) }} + + {{ formatDetailDate(detailData?.outgoingTime) }} {{ formatDetailDate(detailData?.factoryEntryDate) }} @@ -463,10 +469,15 @@ const route = useRoute() const { delView } = useTagsViewStore() const { currentRoute } = useRouter() +type DeviceLedgerDetailVO = DeviceLedgerVO & { + sn?: string + outgoingTime?: string | number | Date +} + const deviceId = computed(() => Number(route.params.id)) const detailLoading = ref(false) const tableLoading = ref(false) -const detailData = ref() +const detailData = ref() const detailActiveTab = ref('check') const deviceTypeNameMap = ref>({}) @@ -568,6 +579,8 @@ const buildDetailPrintData = () => { deviceName: detailData.value?.deviceName, deviceSpec: detailData.value?.deviceSpec, deviceBrand: detailData.value?.deviceBrand, + sn: detailData.value?.sn, + outgoingTime: detailData.value?.outgoingTime, deviceModel: detailData.value?.deviceModel, deviceLocation: detailData.value?.deviceLocation, remark: detailData.value?.remark ?? detailData.value?.deviceRemark, diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue index d7fccea2..f7074eea 100644 --- a/src/views/mes/deviceledger/index.vue +++ b/src/views/mes/deviceledger/index.vue @@ -91,7 +91,7 @@
- + + + + + + + + + + @@ -194,11 +209,14 @@ prop="ratedCapacity" min-width="120px" /> + + - - + @@ -416,6 +434,9 @@ const queryParams = reactive({ deviceCode: undefined, deviceName: undefined, deviceStatus: undefined, + deviceBrand: undefined, + sn: undefined, + outgoingTime: undefined, deviceType: undefined as number | undefined, deviceLine: undefined as number | undefined, }) @@ -723,6 +744,9 @@ const getList = async () => { deviceCode: queryParams.deviceCode, deviceName: queryParams.deviceName, deviceStatus: queryParams.deviceStatus, + deviceBrand: queryParams.deviceBrand, + sn: queryParams.sn, + outgoingTime: queryParams.outgoingTime, deviceType: queryParams.deviceType, deviceLine: queryParams.deviceLine })