diff --git a/frontend/config/routes.ts b/frontend/config/routes.ts index 64830e7..8e74a01 100644 --- a/frontend/config/routes.ts +++ b/frontend/config/routes.ts @@ -40,7 +40,8 @@ { path: '/base/materials', name: '原料管理', component: './materials/index' }, { path: '/base/bucket', name: '桶管理', component: './bucket/index' }, { path: '/base/final', name: '成品管理', component: './final/index' }, - { path: '/base/dict',name:'数据字典',component:'./dict/index'} + { path: '/base/dict',name:'数据字典',component:'./dict/index'}, + { path: '/base/manufacturing', name: '产线设备管理', component: './manufacturing/index' }, ] }, diff --git a/frontend/src/api/dictType/dto.d.ts b/frontend/src/api/dictType/dto.d.ts index c8f26a4..d12b187 100644 --- a/frontend/src/api/dictType/dto.d.ts +++ b/frontend/src/api/dictType/dto.d.ts @@ -120,6 +120,9 @@ declare namespace dictData { * 名称 */ name?: null | string; + typeId?: null|string, + typeCode?: null | string , + id?: null | string } /** * 查询分页输入参数 diff --git a/frontend/src/pages/dict/index.tsx b/frontend/src/pages/dict/index.tsx index 7687cf1..16f77c1 100644 --- a/frontend/src/pages/dict/index.tsx +++ b/frontend/src/pages/dict/index.tsx @@ -362,7 +362,7 @@ export default () => { ]} /> - { + { setIsModalOpen(false); @@ -478,12 +478,13 @@ export default () => { - + diff --git a/frontend/src/pages/manufacturing/index.tsx b/frontend/src/pages/manufacturing/index.tsx index f05aa81..d812c3e 100644 --- a/frontend/src/pages/manufacturing/index.tsx +++ b/frontend/src/pages/manufacturing/index.tsx @@ -8,7 +8,7 @@ import { Button, Modal, Form, Input, message, Popconfirm, Upload, UploadProps, S import { useEffect, useRef, useState } from 'react'; import RecipeInfoAPI from '@/api/recipeService' // import MaterialsInfoAPI from '@/api/materialService' -import GroupInfoAPI from '@/api/groupService' +import {dictDataApi} from '@/api/dictType/service' import DeviceInfoAPI from '@/api/DeviceInfo' // 料仓接口 import StockInfoAPI from '@/api/StockService'; @@ -424,9 +424,17 @@ const Index = () => { useEffect(() => { const areList = async () => { - const data = await GroupInfoAPI.selectlist() + const jsonData: dictData.queryParms = { + typeCode: "cxfz", + } + const data:MyResponse.Content = await dictDataApi.List(jsonData) // console.log(data); - + if (data.statusCode===200) { + const list:any[] = data.data + list.map((res)=>{ + res.title = res.id + }) + } setare(data.data) } areList(); @@ -807,7 +815,7 @@ const Index = () => { // setIsModalGroupFormOpen(false) // }} > - 删除分组 + 删除产线 ,