diff --git a/src/api/mes/deviceledger/index.ts b/src/api/mes/deviceledger/index.ts index 8e6d7a19..ad15f090 100644 --- a/src/api/mes/deviceledger/index.ts +++ b/src/api/mes/deviceledger/index.ts @@ -33,6 +33,7 @@ export interface DeviceLedgerVO { inspectionList?: any[] maintainList?: any[] creator?: string // 创建人 + creatorName?: string createTime?: string | number | Date updateTime?: string | number | Date sort: number // 排序 @@ -45,8 +46,12 @@ export const DeviceLedgerApi = { return await request.get({ url: `/mes/device-ledger/page`, params }) }, - getDeviceLedgerList: async (params: any) => { - return await request.get({ url: `/mes/device-ledger/list`, params }) + getDeviceLedgerList: async () => { + return await request.get({ url: `/mes/device-ledger/list` }) + }, + + getDeviceLedgerListByNoUsed: async () => { + return await request.get({ url: `/mes/device-ledger/noUsedlist` }) }, // 查询设备类型详情 diff --git a/src/api/mes/machine/index.ts b/src/api/mes/machine/index.ts index 1f6e1ea4..e0c77761 100644 --- a/src/api/mes/machine/index.ts +++ b/src/api/mes/machine/index.ts @@ -58,7 +58,7 @@ export const MachineComponentApi = { }, // 查询产线和机台列表 - getPipelineAndMachineList: async (params) => { - return await request.get({ url: `/mes/machine-component/listPipelineAndMachine`, params }) + getPipelineAndMachineList: async () => { + return await request.get({ url: `/mes/machine-component/listPipelineAndMachine` }) }, } diff --git a/src/api/mes/organization/index.ts b/src/api/mes/organization/index.ts index fb0b8a1b..55aeb120 100644 --- a/src/api/mes/organization/index.ts +++ b/src/api/mes/organization/index.ts @@ -40,8 +40,8 @@ export type DeviceParameterAnalysisNodeVO = { // 产线工位 API export const OrganizationApi = { // 查询产线工位列表 - getOrganizationList: async (params) => { - return await request.get({ url: `/mes/organization/list`, params }) + getOrganizationList: async () => { + return await request.get({ url: `/mes/organization/list` }) }, getListOrgWorker: async (params) => { return await request.get({ url: `/mes/organization/listOrgWorker`, params }) diff --git a/src/locales/en.ts b/src/locales/en.ts index 9d67620d..bf173948 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -552,7 +552,9 @@ export default { moldName: 'Name', moldRemark: 'Remark', fileUrl: 'File', - serialNumber: 'No.' + serialNumber: 'No.', + dvName: 'Device Name', + dvId: 'Please select device' }, // Critical Component EquipmentKeyItems: { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 59c3d96f..bc05d55f 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -548,7 +548,9 @@ export default { moldName: '名称', moldRemark: '备注', fileUrl: '资料', - serialNumber: '序号' + serialNumber: '序号', + dvName: '关联采集设备', + dvId: '请选择设备' }, // 设备关键件 EquipmentKeyItems: { diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue index f32770c4..497c0481 100644 --- a/src/views/mes/deviceledger/DeviceLedgerForm.vue +++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue @@ -137,11 +137,17 @@ - - - + + + + + - + + + + + diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index 6549c18b..b0120875 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -128,7 +128,11 @@ const formData = ref({ roleIds: [] }) const formRules = reactive({ - username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }], + username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' },{ + pattern: /^[a-zA-Z0-9_\-@.]+$/, + message: '用户名只能包含英文、数字、下划线、连字符、@和点', + trigger: 'blur' + }], nickname: [{ required: true, message: '工号不能为空', trigger: 'blur' }], password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }], deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],