diff --git a/src/api/mes/criticalComponent/index.ts b/src/api/mes/criticalComponent/index.ts index 859192d8..e249417e 100644 --- a/src/api/mes/criticalComponent/index.ts +++ b/src/api/mes/criticalComponent/index.ts @@ -10,6 +10,7 @@ export interface CriticalComponentVO { remark?: string qrcodeUrl?: string createTime?: string + images?: string } export const CriticalComponentApi = { diff --git a/src/api/mes/deviceledger/index.ts b/src/api/mes/deviceledger/index.ts index 3ffcc733..6370fcf4 100644 --- a/src/api/mes/deviceledger/index.ts +++ b/src/api/mes/deviceledger/index.ts @@ -42,6 +42,7 @@ export interface DeviceLedgerVO { createTime?: string | number | Date updateTime?: string | number | Date sort: number // 排序 + images?: string // 图片 } // 设备类型 API diff --git a/src/locales/en.ts b/src/locales/en.ts index 6e50e660..3429f5c7 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -1295,7 +1295,8 @@ export default { qrcodeLoadError: 'Failed to load QR code', qrcodeEmpty: 'No QR code', validatorCodeRequired: 'Code can not be empty', - validatorNameRequired: 'Name can not be empty' + validatorNameRequired: 'Name can not be empty', + images:'images' }, // Maintenance Project (Project Maintenance) DvSubject: { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 87853fe5..6553f0d7 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -771,7 +771,7 @@ export default { save: '保存', detail: '详情', export: '导出', - import: '导入', + import: '', approve: '审批', unapprove: '反审批', generate: '生成', @@ -972,7 +972,7 @@ export default { actions: '操作', password: '用户密码', role: '角色', - import: '用户导入', + import: '用户', importDragText: '将文件拖到此处,或', importClickText: '点击上传', importUpdateSupport: '是否更新已经存在的用户数据', @@ -1291,7 +1291,8 @@ export default { qrcodeLoadError: '二维码加载失败', qrcodeEmpty: '暂无二维码', validatorCodeRequired: '编码不能为空', - validatorNameRequired: '名称不能为空' + validatorNameRequired: '名称不能为空', + images:'图片' }, // 项目维护 DvSubject: { diff --git a/src/views/mes/criticalComponent/CriticalComponentForm.vue b/src/views/mes/criticalComponent/CriticalComponentForm.vue index ea457acb..16d24fc8 100644 --- a/src/views/mes/criticalComponent/CriticalComponentForm.vue +++ b/src/views/mes/criticalComponent/CriticalComponentForm.vue @@ -52,6 +52,13 @@ type="number" /> + + + + + + + + + + import { CriticalComponentApi, CriticalComponentVO } from '@/api/mes/criticalComponent' import QrcodeActionCard from '@/components/QrcodeActionCard/index.vue' +import UploadImg from "@/components/UploadFile/src/UploadImg.vue"; defineOptions({ name: 'CriticalComponentForm' }) @@ -107,7 +122,8 @@ const formData = ref>({ description: undefined, count: undefined, remark: undefined, - qrcodeUrl: undefined + qrcodeUrl: undefined, + images: undefined }) const validateCode = (_rule, value, callback) => { @@ -182,7 +198,8 @@ const open = async (type: 'create' | 'update', id?: number) => { description: detail?.description, count: detail?.count, remark: detail?.remark, - qrcodeUrl: detail?.qrcodeUrl + qrcodeUrl: detail?.qrcodeUrl, + images: detail?.images } } finally { formLoading.value = false diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue index a49541c8..e1eed447 100644 --- a/src/views/mes/deviceledger/index.vue +++ b/src/views/mes/deviceledger/index.vue @@ -317,7 +317,7 @@ -
+ + +
+
+ +
+
+ + +
+
+
@@ -1484,6 +1506,26 @@ onMounted(async () => {