From 65ee27e41e91896332b145e3a5fe38392b255673 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 20 Mar 2024 17:19:04 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=91=E5=AE=9A=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/workstation/index.ts | 27 +++++++++++ src/views/mes/workstation/index.vue | 7 +-- src/views/mes/workstation/workstation.data.ts | 48 +++++++++++++++++++ 3 files changed, 79 insertions(+), 3 deletions(-) diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts index d426cd3f4..cc75e6142 100644 --- a/src/api/mes/workstation/index.ts +++ b/src/api/mes/workstation/index.ts @@ -57,3 +57,30 @@ export const getTeamPage = async (params) => { return await request.get({ url: `/wms/team/page`, params }) } } +export const getEquipmentPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/mes/equipment/senior', data }) + } else { + return await request.get({ url: `/mes/equipment/page`, params }) + } +} +export const getProcessPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/process/senior', data }) + } else { + return await request.get({ url: `/wms/process/page`, params }) + } +} +export const getProductionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/production/senior', data }) + } else { + return await request.get({ url: `/wms/production/page`, params }) + } +} diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue index f734dd0ab..0f84fe596 100644 --- a/src/views/mes/workstation/index.vue +++ b/src/views/mes/workstation/index.vue @@ -78,6 +78,7 @@ import { } from "@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data"; import {PurchasereceiptRequestTabsList} from "@/utils/disposition/tabsList"; import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail"; +import {getEquipmentPage, getProcessPage, getProductionPage} from "@/api/mes/workstation"; defineOptions({ name: 'Workstation' }) const message = useMessage() // 消息弹窗 @@ -267,13 +268,13 @@ const changeTabs = (data) =>{ apiPage.value = WorkstationApi.getTeamPage detailAllSchemas.value = Team.allSchemas }else if(data.prop == 'Equipment'){ - apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage + apiPage.value = WorkstationApi.getEquipmentPage detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas }else if(data.prop == 'Process'){ - apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage + apiPage.value = WorkstationApi.getProcessPage detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas }else if(data.prop == 'Production'){ - apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage + apiPage.value = WorkstationApi.getProductionPage detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas } tabeKey.value = data.prop diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts index 9fdb28f31..fc98d70f5 100644 --- a/src/views/mes/workstation/workstation.data.ts +++ b/src/views/mes/workstation/workstation.data.ts @@ -120,3 +120,51 @@ export const Team = useCrudSchemas(reactive([ isForm: false } ])) +export const Equipment = useCrudSchemas(reactive([ + { + label: '代码', + field: 'code', + sort: 'custom', + isSearch: true, + isForm: false + }, + { + label: '名称', + field: 'name', + sort: 'custom', + isSearch: true, + isForm: false + } +])) +export const Process = useCrudSchemas(reactive([ + { + label: '代码', + field: 'code', + sort: 'custom', + isSearch: true, + isForm: false + }, + { + label: '名称', + field: 'name', + sort: 'custom', + isSearch: true, + isForm: false + } +])) +export const Production = useCrudSchemas(reactive([ + { + label: '代码', + field: 'code', + sort: 'custom', + isSearch: true, + isForm: false + }, + { + label: '名称', + field: 'name', + sort: 'custom', + isSearch: true, + isForm: false + } +]))