diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts index 2c17c0642..a7ca304ca 100644 --- a/src/api/mes/workstation/index.ts +++ b/src/api/mes/workstation/index.ts @@ -42,7 +42,7 @@ export const getEquipmentPage = async (params) => { const data = {...params} return await request.post({ url: '/mes/equipment/senior', data }) } else { - return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params }) + return await request.get({ url: `/mes/equipment/getEquipmentPage`, params }) } } // 查询选择设备列表 @@ -53,11 +53,11 @@ export const checkEquipmentPageList = async (params) => { const data = {...params} return await request.post({ url: '/mes/equipment/senior', data }) } else { - return await request.get({ url: `/mes/equipment/pageCheckListByWorkstationCode`, params }) + return await request.get({ url: `/mes/equipment/pageCheckList`, params }) } } // 添加设备关联 -export const createEquipmentRelation = async (equipmentCodes:string[]) => { +export const createEquipment = async (equipmentCodes:string[]) => { const data = { workstationCode : goalParams.workstationCode, equipmentCodes : equipmentCodes @@ -66,7 +66,7 @@ export const createEquipmentRelation = async (equipmentCodes:string[]) => { } // 删除设备关联 -export const deleteEquipmentRelation = async (equipmentCodes:string[]) => { +export const deleteEquipment = async (equipmentCodes:string[]) => { const data = { workstationCode : goalParams.workstationCode, equipmentCodes : equipmentCodes @@ -118,35 +118,25 @@ export const getOperstepsPage = async (params) => { const data = {...params} return await request.post({ url: '/mes/workstation-opersteps/senior', data }) } else { - return await request.get({ url: `/mes/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 }) - } else { - return await request.get({ url: `/mes/workstation-opersteps/pageCheckListByWorkstationCode`, params }) + return await request.get({ url: `/mes/workstation-opersteps/getWorkstationOperstepsPage`, params }) } } // 添加操作步骤关联 -export const createOperstepsRelation = async (codes:string[]) => { +export const createOpersteps = async (codes:string[]) => { const data = { workstationCode : goalParams.workstationCode, operstepsCodes : codes } - return await request.post({ url: `/mes/workstation-opersteps/createRelation`, data }) + return await request.post({ url: `/mes/workstation-opersteps/create`, data }) } // 删除操作步骤关联 -export const deleteOperstepsRelation = async (codes:string[]) => { +export const deleteOpersteps = async (codes:string[]) => { const data = { workstationCode : goalParams.workstationCode, operstepsCodes : codes } - return await request.post({ url: `/mes/workstation-opersteps/deleteRelation`, data }) + return await request.post({ url: `/mes/workstation-opersteps/delete`, data }) } @@ -157,7 +147,7 @@ export const getAbilityPage = async (params) => { const data = {...params} return await request.post({ url: '/mes/workstation-ability/senior', data }) } else { - return await request.get({ url: `/mes/workstation-ability/page`, params }) + return await request.get({ url: `/mes/workstation-ability/getWorkstationAbilityPage`, params }) } } // 添加能力关联 diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue index 38d0bfa1f..cb101fbad 100644 --- a/src/views/mes/workstation/index.vue +++ b/src/views/mes/workstation/index.vue @@ -94,8 +94,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import Detail from './components/Detail.vue' defineOptions({ name: 'Workstation' }) -let tabsDeleteApi = WorkstationApi.deleteEquipmentRelation -let tabsCreateApi = WorkstationApi.createEquipmentRelation +let tabsDeleteApi = WorkstationApi.deleteEquipment +let tabsCreateApi = WorkstationApi.createEquipment const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 @@ -243,14 +243,14 @@ const changeTabs = (data) =>{ if(data.prop == 'Equipment'){ apiPage.value = WorkstationApi.getEquipmentPage detailAllSchemas.value = Equipment.allSchemas - tabsDeleteApi = WorkstationApi.deleteEquipmentRelation - tabsCreateApi = WorkstationApi.createEquipmentRelation + tabsDeleteApi = WorkstationApi.deleteEquipment + tabsCreateApi = WorkstationApi.createEquipment tmpPopList = equipmentPopList.allSchemas }else if(data.prop == 'Opersteps'){ apiPage.value = WorkstationApi.getOperstepsPage detailAllSchemas.value = Opersteps.allSchemas - tabsDeleteApi = WorkstationApi.deleteOperstepsRelation - tabsCreateApi = WorkstationApi.createOperstepsRelation + tabsDeleteApi = WorkstationApi.deleteOpersteps + tabsCreateApi = WorkstationApi.createOpersteps tmpPopList = stepPopList.allSchemas }else if(data.prop == 'Ability'){ apiPage.value = WorkstationApi.getAbilityPage @@ -261,8 +261,8 @@ const changeTabs = (data) =>{ }else if(data.prop == 'Post'){ apiPage.value = WorkstationApi.getOperstepsPage detailAllSchemas.value = Opersteps.allSchemas - tabsDeleteApi = WorkstationApi.deleteOperstepsRelation - tabsCreateApi = WorkstationApi.createOperstepsRelation + tabsDeleteApi = WorkstationApi.deleteOpersteps + tabsCreateApi = WorkstationApi.createOpersteps tmpPopList = stepPopList.allSchemas } } diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts index 7770e3a73..9bdfc1c1a 100644 --- a/src/views/mes/workstation/workstation.data.ts +++ b/src/views/mes/workstation/workstation.data.ts @@ -10,6 +10,7 @@ import * as ProductionlineApi from "@/api/wms/productionline"; import * as ProcessApi from "@/api/mes/process"; import * as AbilityInfoApi from "@/api/mes/abilityInfo"; import {AbilityInfo} from "@/views/mes/abilityInfo/abilityInfo.data"; +import {getOperstepsPage} from "@/api/mes/opersteps"; // 表单校验 export const WorkstationRules = reactive({ @@ -354,10 +355,10 @@ export const stepPopList = useCrudSchemas(reactive([ multiple:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '选择操作步骤', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 + searchField: 'stepsCode', // 查询弹窗赋值字段 searchTitle: '选择操作步骤', // 查询弹窗标题 - searchAllSchemas: searchPop.allSchemas, // 查询弹窗所需类 - searchPage: WorkstationApi.checkOperstepsPageList, // 查询弹窗所需分页方法 + searchAllSchemas: Opersteps.allSchemas, // 查询弹窗所需类 + searchPage: getOperstepsPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: 'TRUE', diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index cfde65ded..eb4fe8576 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -839,6 +839,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ { label: '操作', field: 'action', + hiddenInMain:true, isDetail: false, isForm: false , table: { diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index a4f1f451e..297908077 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -738,6 +738,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 137787ca5..3eae17125 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -946,6 +946,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive([ { label: '操作', field: 'action', + hiddenInMain:true, isDetail: false, isForm: false , table: { diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 47d819512..907eaef3e 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -876,6 +876,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 74599137f..87e117682 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -876,6 +876,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 24fccc76d..0fdb4e951 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -875,6 +875,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 7218d1db0..4121421c6 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -876,6 +876,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index b779fb084..4d70c5a54 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -652,6 +652,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 163be4416..b0c562826 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1035,6 +1035,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 163be4416..b0c562826 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1035,6 +1035,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 02bec99c8..6b35d7e79 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -954,6 +954,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 0f1e1d79a..cb8d68d4c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -889,6 +889,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 00571e37b..01db023cf 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -1129,6 +1129,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts index 3b98cefbc..beeac40c4 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts @@ -792,6 +792,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts index 6d3453d75..15b95559c 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts @@ -615,6 +615,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index 8f1aa5341..96a8ec90e 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -770,6 +770,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 93c458118..e94139636 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -531,6 +531,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 1e10f60a9..c1977377e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -661,6 +661,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ field: 'action', isDetail: false, isForm: false, + hiddenInMain:true, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index 4b28f9835..667f66a0c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -718,6 +718,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false , diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index c4b0bd08d..69fe8457c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1022,6 +1022,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive( }, { label: '操作', + hiddenInMain:true, field: 'action', isDetail: false, isForm: false ,