diff --git a/src/api/mes/md/workstation/index.ts b/src/api/mes/md/workstation/index.ts index cdec65e8a..ffd16f01f 100644 --- a/src/api/mes/md/workstation/index.ts +++ b/src/api/mes/md/workstation/index.ts @@ -9,6 +9,7 @@ export interface MdWorkstationVO { workshopId: number // 所在车间 ID workshopName: string // 所在车间名称 processId: number // 工序 ID + processName: string // 工序名称 warehouseId: number // 线边库 ID locationId: number // 库区 ID areaId: number // 库位 ID @@ -23,10 +24,6 @@ export const MdWorkstationApi = { return await request.get({ url: `/mes/md-workstation/page`, params }) }, - // 查询工作站精简列表 - getWorkstationSimpleList: async () => { - return await request.get({ url: `/mes/md-workstation/simple-list` }) - }, // 查询工作站详情 getWorkstation: async (id: number) => { diff --git a/src/views/mes/md/workstation/components/MdWorkshopSelect.vue b/src/views/mes/md/workstation/components/MdWorkshopSelect.vue index a3cafa362..5258fa9b1 100644 --- a/src/views/mes/md/workstation/components/MdWorkshopSelect.vue +++ b/src/views/mes/md/workstation/components/MdWorkshopSelect.vue @@ -1,24 +1,34 @@ - + - - - - {{ item.name }} - - 编号: {{ item.code }} - + + + + 编码:{{ selectedItem.code || '-' }} + 名称:{{ selectedItem.name || '-' }} + 面积:{{ selectedItem.area != null ? selectedItem.area + ' ㎡' : '-' }} + 负责人:{{ selectedItem.chargeUserName || '-' }} - - + + + + + {{ item.name }} + + 编号: {{ item.code }} + + + + + diff --git a/src/views/mes/md/workstation/components/MdWorkstationSelect.vue b/src/views/mes/md/workstation/components/MdWorkstationSelect.vue index 730645c0c..ca232658d 100644 --- a/src/views/mes/md/workstation/components/MdWorkstationSelect.vue +++ b/src/views/mes/md/workstation/components/MdWorkstationSelect.vue @@ -1,37 +1,66 @@ - + - - - - {{ item.name }} - - 编号: {{ item.code }} - - - - + + + + 编码:{{ selectedItem.code }} + 名称:{{ selectedItem.name }} + 所在车间:{{ selectedItem.workshopName || '-' }} + 所属工序:{{ selectedItem.processName || '-' }} + 地点:{{ selectedItem.address || '-' }} + + + + + + + + + diff --git a/src/views/mes/md/workstation/components/MdWorkstationSelectDialog.vue b/src/views/mes/md/workstation/components/MdWorkstationSelectDialog.vue new file mode 100644 index 000000000..fd6296a85 --- /dev/null +++ b/src/views/mes/md/workstation/components/MdWorkstationSelectDialog.vue @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + 确 定 + 取 消 + + + + + + +