diff --git a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx index b39a4f0..6dd2b9e 100644 --- a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx +++ b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx @@ -9,6 +9,8 @@ import { getFavoritesList, removePublic, toPublic, updateReadStatus } from '../s interface FavoritesListProps { projectName?: string | null, bidMethodDict?: string | null, + businessModule?: string | null, + isPublic?: string | null, current?: string | null, tabs: string | null, } @@ -18,7 +20,7 @@ interface FavoritesListProps { * @returns */ const FavoritesList: React.FC = (props) => { - const { projectName, bidMethodDict, current, tabs } = props + const { projectName, bidMethodDict, current, businessModule, isPublic, tabs } = props const [spin, spinSet] = useState(false); //查询分页数据 @@ -54,7 +56,8 @@ const FavoritesList: React.FC = (props) => { dataIndex: 'businessModule', hideInTable: true, valueType: 'select', - valueEnum: proTableValueEnum(dictData['business_module=procurement_mode_1']) + valueEnum: proTableValueEnum(dictData['business_module=procurement_mode_1']), + initialValue: tabs === 'favoritesList' ? isNotEmpty(businessModule) ? businessModule : null : null, // { // 1: 建档, // 2: 资审招标, @@ -117,7 +120,8 @@ const FavoritesList: React.FC = (props) => { 1: { text: 已公开 }, - } + }, + initialValue: tabs === 'favoritesList' ? isNotEmpty(isPublic) ? isPublic : null : null, }, { @@ -214,7 +218,7 @@ const FavoritesList: React.FC = (props) => { */ const getReturnURL = () => { let projectURLParams = JSON.parse(projectParams); - let params = `${'?current=' + projectURLParams.current}${isEmpty(projectURLParams.projectName) ? '' : '&projectName=' + projectURLParams.projectName}${isEmpty(projectURLParams.bidMethodDict) ? '' : '&bidMethodDict=' + projectURLParams.bidMethodDict}&tabs=favoritesList`; + let params = `${'?current=' + projectURLParams.current}${isEmpty(projectURLParams.projectName) ? '' : '&projectName=' + projectURLParams.projectName}${isEmpty(projectURLParams.bidMethodDict) ? '' : '&bidMethodDict=' + projectURLParams.bidMethodDict}${isEmpty(projectURLParams.businessModule) ? '' : '&businessModule=' + projectURLParams.businessModule}${isEmpty(projectURLParams.isPublic) ? '' : '&isPublic=' + projectURLParams.isPublic}&tabs=favoritesList`; return getUrlRelativePath() + params; } @@ -227,7 +231,7 @@ const FavoritesList: React.FC = (props) => { bordered={false} size='small' actionRef={ref} - search={{ labelWidth: 'auto', span: 6 }} + search={{ labelWidth: 'auto', span: 6, defaultCollapsed: !(tabs === 'favoritesList' && isNotEmpty(isPublic)) }} loading={false} request={async (params) => { setProjectParams(JSON.stringify(params)); diff --git a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx index 02d3325..d748899 100644 --- a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx +++ b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx @@ -10,6 +10,8 @@ interface ProjectManageProps { projectName?: string | null, bidMethodDict?: string | null, current?: string | null, + businessModule?: string | null, + isPublic?: string | null, tabs: string | null, } /** @@ -18,7 +20,7 @@ interface ProjectManageProps { * @returns */ const ProjectManage: React.FC = (props) => { - const { projectName, bidMethodDict, current, tabs } = props + const { projectName, bidMethodDict, current, businessModule, isPublic, tabs } = props const [spin, spinSet] = useState(false); //查询分页数据 @@ -54,7 +56,8 @@ const ProjectManage: React.FC = (props) => { dataIndex: 'businessModule', hideInTable: true, valueType: 'select', - valueEnum: proTableValueEnum(dictData['business_module=procurement_mode_1']) + valueEnum: proTableValueEnum(dictData['business_module=procurement_mode_1']), + initialValue: tabs === 'projectList' ? isNotEmpty(businessModule) ? businessModule : null : null, }, { title: '项目名称', @@ -103,7 +106,8 @@ const ProjectManage: React.FC = (props) => { 1: { text: 已公开 }, - } + }, + initialValue: tabs === 'projectList' ? isNotEmpty(isPublic) ? isPublic : null : null, }, { @@ -144,7 +148,7 @@ const ProjectManage: React.FC = (props) => { */ const getReturnURL = () => { let projectURLParams = JSON.parse(projectParams); - let params = `${'?current=' + projectURLParams.current}${isEmpty(projectURLParams.projectName) ? '' : '&projectName=' + projectURLParams.projectName}${isEmpty(projectURLParams.bidMethodDict) ? '' : '&bidMethodDict=' + projectURLParams.bidMethodDict}&tabs=projectList`; + let params = `${'?current=' + projectURLParams.current}${isEmpty(projectURLParams.projectName) ? '' : '&projectName=' + projectURLParams.projectName}${isEmpty(projectURLParams.bidMethodDict) ? '' : '&bidMethodDict=' + projectURLParams.bidMethodDict}${isEmpty(projectURLParams.businessModule) ? '' : '&businessModule=' + projectURLParams.businessModule}${isEmpty(projectURLParams.isPublic) ? '' : '&isPublic=' + projectURLParams.isPublic}&tabs=projectList`; return getUrlRelativePath() + params; } /** @@ -181,7 +185,7 @@ const ProjectManage: React.FC = (props) => { bordered={false} size='small' actionRef={ref} - search={{ labelWidth: 'auto', span: 6 }} + search={{ labelWidth: 'auto', span: 6, defaultCollapsed: !(tabs === 'projectList' && isNotEmpty(isPublic)) }} loading={false} request={async (params) => { setProjectParams(JSON.stringify(params)); diff --git a/src/pages/Project/ProjectManage/Supervision/index.tsx b/src/pages/Project/ProjectManage/Supervision/index.tsx index 26db24d..4669b8d 100644 --- a/src/pages/Project/ProjectManage/Supervision/index.tsx +++ b/src/pages/Project/ProjectManage/Supervision/index.tsx @@ -12,6 +12,10 @@ const Index: React.FC<{}> = () => { const projectName = getUrlParam("projectName"); //url采购方式 const bidMethodDict = getURLInformation("bidMethodDict"); + //url项目阶段 + const businessModule = getURLInformation("businessModule"); + //url状态 + const isPublic = getURLInformation("isPublic"); //url分页信息 const current = getURLInformation("current"); //url标签信息 @@ -32,9 +36,9 @@ const Index: React.FC<{}> = () => { { mode === 'projectList' ? ( - + ) : ( - + ) }