diff --git a/src/forge/Information/Component/addProjects.jsx b/src/forge/Information/Component/addProjects.jsx index e7e78e1ce..6a701625c 100644 --- a/src/forge/Information/Component/addProjects.jsx +++ b/src/forge/Information/Component/addProjects.jsx @@ -110,7 +110,7 @@ function AddProjects({id,visible,typeList,needAudit,role,onCancel,onFresh}){ } const res = response.data; if(res && res.code === 200){ - message.success((needAudit === 1 && role && role.role !== "Manager") ? "操作成功,请等待管理员审核" : "操作成功!"); + message.success((needAudit === 1 && role !== "Manager") ? "操作成功,请等待管理员审核" : "操作成功!"); Init(page,searchValue); onFresh(); }else{ diff --git a/src/forge/Information/Pages/project/cateDetail/index.jsx b/src/forge/Information/Pages/project/cateDetail/index.jsx index 3fa5ac138..c86773a13 100644 --- a/src/forge/Information/Pages/project/cateDetail/index.jsx +++ b/src/forge/Information/Pages/project/cateDetail/index.jsx @@ -1,7 +1,7 @@ import React, { Fragment, useEffect, useRef, useState } from 'react'; import { Spin, Pagination, Divider, message, Input } from 'antd'; import { Link } from 'react-router-dom'; -import { getProjectsLists } from '../../../api'; +import { getProjectsLists, getGlobal } from '../../../api'; import { projectCateConfig } from '../projectCateConfig'; import nodata from '../../../img/nodata.png'; import { getUniqueIdentifier, getUserName, getBrowserPlatform, getBrowserBrand } from '../../../utils'; @@ -118,6 +118,32 @@ function ProjectCateDetail(props) { }, [visibleSections.coreArea, visibleSections.projectList]); function getLists() { + if(searchName){ + getGlobal({ + extraSearchParam: { + projectTypeId: cateId + }, + keyword: searchName || "", + pageNum: page, + pageSize: pageSize, + types: ["zone_project"], + zoneId: id + }).then(result => { + if (result && result.data) { + setLists(result.data.rows.map(item=>{ + return{ + ...item, + projectProperties: item.extendData + } + })); + setTotal(result.data.total); + setLoading(false); + } + }).catch(() => { + setLoading(false); + }); + return + } getProjectsLists(id, { pageNum: page, pageSize: pageSize, @@ -132,6 +158,7 @@ function ProjectCateDetail(props) { }).catch(() => { setLoading(false); }); + } return ( @@ -243,7 +270,7 @@ function ProjectCateDetail(props) { {lists.map((item, key) => (
{sectionProjectTitle}
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index 289fc5fa1..27e54f853 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -342,7 +342,7 @@ function Index(props){