提交 e68cfd9f 作者: 龚洪江

修复:采购订单筛选

上级 a0f43900
const DataDashboards = () => {
return <div className='data-dashboards'></div>;
};
export default DataDashboards;
...@@ -88,6 +88,7 @@ const ProcurementOrderList = () => { ...@@ -88,6 +88,7 @@ const ProcurementOrderList = () => {
pageSize: 10, pageSize: 10,
totalCount: 0, totalCount: 0,
}); });
const [loading, setLoading] = useState<boolean>(false);
const tableColumns: ColumnsType<procurementOrderListType[0]> = [ const tableColumns: ColumnsType<procurementOrderListType[0]> = [
{ {
title: '商品', title: '商品',
...@@ -244,11 +245,13 @@ const ProcurementOrderList = () => { ...@@ -244,11 +245,13 @@ const ProcurementOrderList = () => {
}; };
// 采购订单列表 // 采购订单列表
const getListPurchaseOrder = (query?: procurementOrderParamsType) => { const getListPurchaseOrder = (query?: procurementOrderParamsType) => {
setLoading(true);
OrderManageAPI.getListPurchaseOrder({ OrderManageAPI.getListPurchaseOrder({
pageSize: pagination.pageSize, pageSize: pagination.pageSize,
pageNo: pagination.pageNo, pageNo: pagination.pageNo,
...query, ...query,
}).then(({ result }) => { }).then(({ result }) => {
setLoading(false);
pagination.totalCount = result.totalCount; pagination.totalCount = result.totalCount;
setPagination({ ...pagination }); setPagination({ ...pagination });
setTableData(result.list || []); setTableData(result.list || []);
...@@ -278,7 +281,10 @@ const ProcurementOrderList = () => { ...@@ -278,7 +281,10 @@ const ProcurementOrderList = () => {
const searchSuccess = (value: any) => { const searchSuccess = (value: any) => {
pagination.pageNo = 1; pagination.pageNo = 1;
pagination.pageSize = 10; pagination.pageSize = 10;
const reqData = { ...filterObjAttr(value, ['rangeTime']), ...query }; const reqData = {
...filterObjAttr(value, ['rangeTime']),
statusCode: tranStatusList[statusCodeButtonIndex].value,
};
setQuery({ ...reqData }); setQuery({ ...reqData });
getListPurchaseOrder(reqData); getListPurchaseOrder(reqData);
}; };
...@@ -407,6 +413,7 @@ const ProcurementOrderList = () => { ...@@ -407,6 +413,7 @@ const ProcurementOrderList = () => {
columns={tableColumns} columns={tableColumns}
dataSource={tableData} dataSource={tableData}
rowKey='id' rowKey='id'
loading={loading}
pagination={{ pagination={{
total: pagination.totalCount, total: pagination.totalCount,
pageSize: pagination.pageSize, pageSize: pagination.pageSize,
......
...@@ -36,11 +36,12 @@ import { ...@@ -36,11 +36,12 @@ import {
VerifiedOutlined, VerifiedOutlined,
AccountBookOutlined, AccountBookOutlined,
EnvironmentOutlined, EnvironmentOutlined,
BarChartOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { AgnosticIndexRouteObject } from '@remix-run/router';
import { Spin } from 'antd'; import { Spin } from 'antd';
// 数据看板
const DataBoardView = React.lazy(() => import('~/pages/dataDashboards'));
// 登录 // 登录
import LoginView from '~/pages/common/login'; import LoginView from '~/pages/common/login';
...@@ -185,7 +186,7 @@ const RealNameAuthView = React.lazy(() => import('~/pages/systemManage/realNameA ...@@ -185,7 +186,7 @@ const RealNameAuthView = React.lazy(() => import('~/pages/systemManage/realNameA
// const CouponDetailed = React.lazy(() => import('src/pages/couponManage/couponDetailed')); //优惠券明细 // const CouponDetailed = React.lazy(() => import('src/pages/couponManage/couponDetailed')); //优惠券明细
export interface RouteObjectType { export interface RouteObjectType {
path: AgnosticIndexRouteObject['path']; path: string;
element: any; element: any;
errorElement?: React.ReactNode | null; errorElement?: React.ReactNode | null;
children?: Array<RouteObject & RouteObjectType>; children?: Array<RouteObject & RouteObjectType>;
...@@ -228,6 +229,17 @@ export const whiteRouterList: Array<RouteObject & RouteObjectType> = [ ...@@ -228,6 +229,17 @@ export const whiteRouterList: Array<RouteObject & RouteObjectType> = [
// 路由数组 // 路由数组
export const routerList: Array<RouteObjectType> = [ export const routerList: Array<RouteObjectType> = [
{ {
path: '/dataDashboards',
element: withLoadingComponent(<DataBoardView />),
errorElement: <ErrorPage />,
meta: {
icon: <BarChartOutlined />,
title: '数据看板',
id: 300,
develop: true,
},
},
{
path: '/customManage', path: '/customManage',
element: <LayoutView />, element: <LayoutView />,
errorElement: <ErrorPage />, errorElement: <ErrorPage />,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论