diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index cc75e6142..b950fd776 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -6,7 +6,9 @@ export interface WorkstationVO {
expireTime: Date
name: string
}
-
+export const goalParams = {
+ workstationCode:null
+}
// 查询工位列表
export const getWorkstationPage = async (params) => {
if (params.isSearch) {
@@ -49,21 +51,25 @@ export const importTemplate = () => {
}
// 查询班组列表
export const getTeamPage = async (params) => {
+ console.log(goalParams.workstationCode)
+ params.workstationCode = goalParams.workstationCode
if (params.isSearch) {
delete params.isSearch
const data = {...params}
- return await request.post({ url: '/wms/team/senior', data })
+ return await request.post({ url: '/mes/team/senior', data })
} else {
- return await request.get({ url: `/wms/team/page`, params })
+ return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
}
}
export const getEquipmentPage = async (params) => {
+ console.log(goalParams.workstationCode)
+ params.workstationCode = goalParams.workstationCode
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 })
+ return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
}
}
export const getProcessPage = async (params) => {
@@ -72,7 +78,7 @@ export const getProcessPage = async (params) => {
const data = {...params}
return await request.post({ url: '/wms/process/senior', data })
} else {
- return await request.get({ url: `/wms/process/page`, params })
+ return await request.get({ url: `/wms/process/pageListByWorkstationCode`, params })
}
}
export const getProductionPage = async (params) => {
@@ -81,6 +87,6 @@ export const getProductionPage = async (params) => {
const data = {...params}
return await request.post({ url: '/wms/production/senior', data })
} else {
- return await request.get({ url: `/wms/production/page`, params })
+ return await request.get({ url: `/wms/production/pageListByWorkstationCode`, params })
}
}
diff --git a/src/components/workstationBind/index.ts b/src/components/workstationBind/index.ts
index e7d199c89..d3fcb5cad 100644
--- a/src/components/workstationBind/index.ts
+++ b/src/components/workstationBind/index.ts
@@ -1,2 +1,3 @@
-import detail from './src/Detail.vue'
-export {detail }
+import Detail from './src/Detail.vue'
+
+export { Detail }
diff --git a/src/components/workstationBind/src/Detail.vue b/src/components/workstationBind/src/Detail.vue
index 5b39f255b..899d5fc31 100644
--- a/src/components/workstationBind/src/Detail.vue
+++ b/src/components/workstationBind/src/Detail.vue
@@ -12,72 +12,109 @@
{{ titleValueRef }} {{ titleNameRef }}
-
-
+
-
+
-
+
+
+
+
+
-
-
- 1
+
+
+
+
+
+
+
+
+
+
@@ -105,19 +142,16 @@