提交 05325b2a 作者: 龚洪江

修复:产品冲突解决

上级 2fafcea4
...@@ -7,7 +7,6 @@ import { MakeManageAPI, ProduceManageAPI } from '~/api'; ...@@ -7,7 +7,6 @@ import { MakeManageAPI, ProduceManageAPI } from '~/api';
import AddOrEditProduce from './components/addOrEditProduceModal'; import AddOrEditProduce from './components/addOrEditProduceModal';
import { InterDataType, InterReqType, PaginationProps } from '~/api/interface'; import { InterDataType, InterReqType, PaginationProps } from '~/api/interface';
import { addProductType, productListType } from '~/api/interface/produceManageType'; import { addProductType, productListType } from '~/api/interface/produceManageType';
import { categoryListType } from '~/api/interface/categoryManage';
import { MakeListType } from '~/api/interface/makeManage'; import { MakeListType } from '~/api/interface/makeManage';
import { PlusOutlined } from '@ant-design/icons'; import { PlusOutlined } from '@ant-design/icons';
import qs from 'query-string'; import qs from 'query-string';
...@@ -17,10 +16,6 @@ import SearchBox, { searchColumns } from '~/components/search-box'; ...@@ -17,10 +16,6 @@ import SearchBox, { searchColumns } from '~/components/search-box';
type produceListType = InterDataType<productListType>['list']; type produceListType = InterDataType<productListType>['list'];
//产品列表参数类型 //产品列表参数类型
type produceParametersType = Omit<InterReqType<productListType>, 'pageSize' | 'pageNo'>; type produceParametersType = Omit<InterReqType<productListType>, 'pageSize' | 'pageNo'>;
//目录返回类型
type directoryType = InterDataType<directoryListType>;
//分类返回类型
type categoryType = InterDataType<categoryListType>['list'];
//品牌返回类型 //品牌返回类型
type makeListType = InterDataType<MakeListType>['list']; type makeListType = InterDataType<MakeListType>['list'];
//新增编辑表单类型 //新增编辑表单类型
...@@ -100,14 +95,6 @@ function ProduceManage() { ...@@ -100,14 +95,6 @@ function ProduceManage() {
name: 'productName', name: 'productName',
}, },
{ {
label: '产品目录',
placeholder: '请输入产品名称',
type: 'select',
name: 'directoryId',
options: [],
onSelect: (value) => decSelectChange(value),
},
{
label: '产品类型', label: '产品类型',
placeholder: '请输入产品名称', placeholder: '请输入产品名称',
type: 'select', type: 'select',
...@@ -248,11 +235,6 @@ function ProduceManage() { ...@@ -248,11 +235,6 @@ function ProduceManage() {
? Number(searchParams.get('categoryId')) ? Number(searchParams.get('categoryId'))
: undefined, : undefined,
}); });
getDirectoryList();
if (searchParams.get('directoryId')) {
getCategoryListByDirectory(Number(searchParams.get('directoryId')));
}
getProduceList(query);
}, []); }, []);
return ( return (
...@@ -262,7 +244,7 @@ function ProduceManage() { ...@@ -262,7 +244,7 @@ function ProduceManage() {
search={searchColumnsData} search={searchColumnsData}
searchData={onFinish} searchData={onFinish}
child={ child={
<Button type='primary' onClick={handleAdd} icon={<PlusOutlined/>}> <Button type='primary' onClick={handleAdd} icon={<PlusOutlined />}>
新增产品 新增产品
</Button> </Button>
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论