diff --git a/src/api/mes/md/client/index.ts b/src/api/mes/md/client/index.ts index 135beabcd..010821321 100644 --- a/src/api/mes/md/client/index.ts +++ b/src/api/mes/md/client/index.ts @@ -32,9 +32,6 @@ export const MdClientApi = { return await request.get({ url: `/mes/md-client/page`, params }) }, - - - // 查询客户详情 getClient: async (id: number) => { return await request.get({ url: `/mes/md-client/get?id=` + id }) diff --git a/src/api/mes/md/workstation/index.ts b/src/api/mes/md/workstation/index.ts index ffd16f01f..af55df009 100644 --- a/src/api/mes/md/workstation/index.ts +++ b/src/api/mes/md/workstation/index.ts @@ -24,7 +24,6 @@ export const MdWorkstationApi = { return await request.get({ url: `/mes/md-workstation/page`, params }) }, - // 查询工作站详情 getWorkstation: async (id: number) => { return await request.get({ url: `/mes/md-workstation/get?id=` + id }) diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts index b5c2b054b..941567725 100644 --- a/src/api/mes/pro/workorder/index.ts +++ b/src/api/mes/pro/workorder/index.ts @@ -78,5 +78,5 @@ export const ProWorkOrderApi = { // 确认工单 confirmWorkOrder: async (id: number) => { return await request.put({ url: `/mes/pro/work-order/confirm?id=` + id }) - }, + } } diff --git a/src/api/mes/tm/tool/index.ts b/src/api/mes/tm/tool/index.ts index 48a775d86..fd8e58920 100644 --- a/src/api/mes/tm/tool/index.ts +++ b/src/api/mes/tm/tool/index.ts @@ -48,10 +48,5 @@ export const TmToolApi = { // 导出工具台账 Excel exportTool: async (params: any) => { return await request.download({ url: `/mes/tm/tool/export-excel`, params }) - }, - - // 查询工具台账精简列表 - getToolSimpleList: async () => { - return await request.get({ url: `/mes/tm/tool/simple-list` }) } } diff --git a/src/api/mes/wm/batch/index.ts b/src/api/mes/wm/batch/index.ts index eb00fa1a1..ed3167ed2 100644 --- a/src/api/mes/wm/batch/index.ts +++ b/src/api/mes/wm/batch/index.ts @@ -54,5 +54,5 @@ export const BatchApi = { // 向后追溯 getBackwardList: async (code: string) => { return await request.get({ url: `/mes/wm/batch/backward-list`, params: { code } }) - }, + } } diff --git a/src/api/mes/wm/materialStock/index.ts b/src/api/mes/wm/materialStock/index.ts index 723dbc161..9368f2de2 100644 --- a/src/api/mes/wm/materialStock/index.ts +++ b/src/api/mes/wm/materialStock/index.ts @@ -45,5 +45,5 @@ export const WmMaterialStockApi = { // 导出库存台账 Excel exportMaterialStock: async (params: any) => { return await request.download({ url: '/mes/wm/material-stock/export-excel', params }) - }, + } } diff --git a/src/views/mes/md/workstation/WorkstationToolList.vue b/src/views/mes/md/workstation/WorkstationToolList.vue index 17231d60f..3d5539cfd 100644 --- a/src/views/mes/md/workstation/WorkstationToolList.vue +++ b/src/views/mes/md/workstation/WorkstationToolList.vue @@ -65,7 +65,7 @@ + + diff --git a/src/views/mes/tm/tool/components/TmToolSelectDialog.vue b/src/views/mes/tm/tool/components/TmToolSelectDialog.vue new file mode 100644 index 000000000..9df4cb122 --- /dev/null +++ b/src/views/mes/tm/tool/components/TmToolSelectDialog.vue @@ -0,0 +1,314 @@ + + + + + + diff --git a/src/views/mes/tm/tool/components/TmToolTypeSelect.vue b/src/views/mes/tm/tool/components/TmToolTypeSelect.vue deleted file mode 100644 index 60f346797..000000000 --- a/src/views/mes/tm/tool/components/TmToolTypeSelect.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - diff --git a/src/views/mes/tm/tool/index.vue b/src/views/mes/tm/tool/index.vue index 254cce293..e271d948b 100644 --- a/src/views/mes/tm/tool/index.vue +++ b/src/views/mes/tm/tool/index.vue @@ -1,165 +1,167 @@