diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts index 482b551d5..e397ff645 100644 --- a/src/api/mes/workstation/index.ts +++ b/src/api/mes/workstation/index.ts @@ -50,7 +50,6 @@ export const importTemplate = () => { return request.download({ url: '/mes/workstation/get-import-template' }) }// 查询班组列表 export const getTeamPage = async (params) => { - console.log(goalParams.workstationCode) params.workstationCode = goalParams.workstationCode if (params.isSearch) { delete params.isSearch @@ -89,7 +88,6 @@ export const deleteTeamRelation = async (teamCodes:string[]) => { return await request.post({ url: `/mes/team/deleteRelation`, data }) } export const getEquipmentPage = async (params) => { - console.log(goalParams.workstationCode) params.workstationCode = goalParams.workstationCode if (params.isSearch) { delete params.isSearch @@ -101,7 +99,6 @@ export const getEquipmentPage = async (params) => { } // 查询选择设备列表 export const checkEquipmentPageList = async (params) => { - console.log(goalParams.workstationCode) params.workstationCode = goalParams.workstationCode if (params.isSearch) { delete params.isSearch @@ -130,6 +127,7 @@ export const deleteEquipmentRelation = async (equipmentCodes:string[]) => { return await request.post({ url: `/mes/equipment/deleteRelation`, data }) } export const getProcessPage = async (params) => { + params.workstationCode = goalParams.workstationCode if (params.isSearch) { delete params.isSearch const data = {...params} @@ -139,6 +137,7 @@ export const getProcessPage = async (params) => { } } export const checkProcessPageList = async (params) => { + params.workstationCode = goalParams.workstationCode if (params.isSearch) { delete params.isSearch const data = {...params} @@ -167,21 +166,23 @@ export const deleteProcessRelation = async (processCodes:string[]) => { export const getOperstepsPage = async (params) => { + params.workstationCode = goalParams.workstationCode if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/mes/workstation-opersteps/senior', data }) + return await request.post({ url: '/strategy/workstation-opersteps/senior', data }) } else { - return await request.get({ url: `/mes/workstation-opersteps/pageListByWorkstationCode`, params }) + return await request.get({ url: `/strategy/workstation-opersteps/pageListByWorkstationCode`, params }) } } export const checkOperstepsPageList = async (params) => { + params.workstationCode = goalParams.workstationCode if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/mes/workstation-opersteps/senior', data }) + return await request.post({ url: '/strategy/workstation-opersteps/senior', data }) } else { - return await request.get({ url: `/mes/workstation-opersteps/pageCheckListByWorkstationCode`, params }) + return await request.get({ url: `/strategy/workstation-opersteps/pageCheckListByWorkstationCode`, params }) } } // 添加操作步骤关联 @@ -190,7 +191,7 @@ export const createOperstepsRelation = async (processCodes:string[]) => { workstationCode : goalParams.workstationCode, processCodes : processCodes } - return await request.post({ url: `/mes/workstation-opersteps/createRelation`, data }) + return await request.post({ url: `/strategy/workstation-opersteps/createRelation`, data }) } // 删除操作步骤关联 @@ -199,5 +200,5 @@ export const deleteOperstepsRelation = async (processCodes:string[]) => { workstationCode : goalParams.workstationCode, processCodes : processCodes } - return await request.post({ url: `/mes/workstation-opersteps/deleteRelation`, data }) + return await request.post({ url: `/strategy/workstation-opersteps/deleteRelation`, data }) } diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue index f9a70ace0..0ee83a64d 100644 --- a/src/views/mes/workstation/index.vue +++ b/src/views/mes/workstation/index.vue @@ -67,7 +67,7 @@ /> { workstationCode:row.workstationCode } await selectOperstepsList() - OperstepsListRef.value.open('create', row, null,'viewDetail')//查看明细数据 + operstepsListRef.value.open('create', row, null,'viewDetail')//查看明细数据 } } diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts index 00ec5cec7..13f7e68e8 100644 --- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts +++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts @@ -184,6 +184,9 @@ export const MesBarCode = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, isForm: false, }, {