diff --git a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx index 8287c43..2accfeb 100644 --- a/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx +++ b/src/pages/ElecEvaluation/MonitorScreen/ProjectMonitorRoom/index.tsx @@ -12,6 +12,7 @@ import { getWarnData } from "../Home/service"; import ScreenVideoPlay from "@/components/ElecBidEvaluation/ScreenVideoPlay"; import { pictureDisplayPath } from "@/utils/DownloadUtils"; import { getURLInformation } from "@/utils/CommonUtils"; +import { getDicData } from "@/utils/session"; const statusMap = ["未报道", "已报道"]; @@ -129,6 +130,8 @@ export default (props: any) => { const [backStrangerList, setBackStrangerList] = useState([]); //人数预警-回看 const [backNumberList, setBackNumberList] = useState([]); + //采购方式字典 + const [bidMethodObj, setBidMethodObj] = useState(); //监控视频Ref const videoRef = useRef(); //定时刷新间隔 @@ -235,8 +238,21 @@ export default (props: any) => { } }) } + //初始化字典 + const initDict = () => { + //采购方式字典 + const getDict: any = getDicData(); + const dictData = JSON.parse(getDict); + const bidMethodArray = dictData["procurement_mode=entrust"] as any[]; + let obj = {}; + for (let i = 0, length = bidMethodArray.length; i < length; i++) { + obj[bidMethodArray[i].code] = bidMethodArray[i].dicName; + } + setBidMethodObj(obj); + } useEffect(() => { + initDict(); getRoomData(); getWarnInfo(); getExpertList(); @@ -279,7 +295,7 @@ export default (props: any) => {
-

{basicInfo?.bidMethodDictName}

+

{bidMethodObj?.[basicInfo?.procurementMode]}

项目名称：{basicInfo?.projectName}

项目编号：{basicInfo?.projectNum}

标段名称：{basicInfo?.sectionName}

diff --git a/src/pages/MainPage/ProjectManager/Jury.js b/src/pages/MainPage/ProjectManager/Jury.js index dc40991..3e7419e 100644 --- a/src/pages/MainPage/ProjectManager/Jury.js +++ b/src/pages/MainPage/ProjectManager/Jury.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic } from 'antd'; +import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Modal } from 'antd'; import { history } from 'umi'; import { connect } from 'dva'; import './index.less'; @@ -10,6 +10,7 @@ import moment from 'moment'; import { jurySaveInfo, getSessionUserData } from '@/utils/session'; import NoticeDetail from '@/pages/notice/noticeList/components/NoticeDetail' import ExpertEnter from '@/pages/BidEvaluation/components/ExpertEnter'; +import { isInsertIdOrPhoto } from './service'; @connect(({ dashboard, loading }) => ({ ...dashboard, @@ -47,6 +48,7 @@ class Jury extends PureComponent { userlevel: "1",                       //网站自定义会员级别，1-N，可根据选择判断，取值显示到小能客户端 erpparam: "abc"                          //erpparam为erp功能的扩展字段，可选，购买erp功能后用于erp功能集成 } + this.isIdOrPhoto(); } onChange = (date, dateString) => { this.setState({ @@ -96,20 +98,35 @@ class Jury extends PureComponent { }) } talkXy = () => { - if(NTKF){ + if (NTKF) { NTKF.im_openInPageChat('bl_1000_1492484340268'); } else { message.warn('小优客服初始化失败，请联系系统管理员！') } } + //判断是否有身份证号或照片 + isIdOrPhoto = () => { + const { warning } = Modal; + isInsertIdOrPhoto().then(res => { + if (res?.code == 200) { + if (!res?.data) { + warning({ + title: '提示', + content: `您尚未维护身份证号与照片信息，请前往【我的工作台】->【专家个人信息管理】补充信息`, + centered: true, + }); + } + } + }) + } render() { const { datevalue, detailId, noticeDetail, recordData, enterVisible } = this.state; const { Juryuplist, Jurydownlist, staloading, tlist } = this.props; return ( <> { - START_ENV == 'UAT' || START_ENV == 'DEV' || START_ENV == 'sim' ? '' : - this.talkXy()}>咨询服务︵8:30|12:3013:00|17:00︶ + START_ENV == 'UAT' || START_ENV == 'DEV' || START_ENV == 'sim' ? '' : + this.talkXy()}>咨询服务︵8:30|12:3013:00|17:00︶ }
@@ -182,7 +199,7 @@ class Jury extends PureComponent {
{noticeDetail && { this.noticeModel() }} modalVisible={noticeDetail} />} {recordData == '' ? null : - { this.enterModel() }} onRefresh={() => { this.onRefresh() }} recordData={recordData} />} + { this.enterModel() }} onRefresh={() => { this.onRefresh() }} recordData={recordData} />} ) } diff --git a/src/pages/MainPage/ProjectManager/manager.js b/src/pages/MainPage/ProjectManager/manager.js index 73f80e5..dd9408e 100644 --- a/src/pages/MainPage/ProjectManager/manager.js +++ b/src/pages/MainPage/ProjectManager/manager.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { history } from 'umi'; -import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Empty, message } from 'antd'; +import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Empty, message, Modal } from 'antd'; // import PageHeaderWrapper from '@/components/PageHeaderWrapper'; import { connect } from 'dva'; import './index.less'; @@ -9,7 +9,7 @@ import { routerRedux } from 'dva/router'; import { RightOutlined } from '@ant-design/icons'; import moment from 'moment'; import { followUpAProjectManager, getSessionUserData } from '@/utils/session'; -import { getDefId } from './service'; +import { getDefId, isInsertIdOrPhoto } from './service'; import { getURLInformation } from '@/utils/CommonUtils'; import MessageDetail from '@/pages/SystemMessage/message/components/messageDetail' import NoticeDetail from '@/pages/notice/noticeList/components/NoticeDetail' @@ -71,7 +71,8 @@ class manager extends PureComponent { userlevel: "1",                       //网站自定义会员级别，1-N，可根据选择判断，取值显示到小能客户端 erpparam: "abc"                          //erpparam为erp功能的扩展字段，可选，购买erp功能后用于erp功能集成 } - this.approvalDetail() + this.approvalDetail(); + this.isIdOrPhoto(); } onChange = (date, dateString) => { this.setState({ @@ -156,6 +157,22 @@ class manager extends PureComponent { await followUpAProjectManager(data); history.push('/ProjectLayout/Manager/HomePageSectionList'); }; + //判断是否有身份证号或照片 + isIdOrPhoto = () => { + const { warning } = Modal; + isInsertIdOrPhoto().then(res => { + if (res?.code == 200) { + if (!res?.data) { + warning({ + title: '提示', + content: `您尚未维护身份证号与照片信息，请前往【我的工作台】->【代理机构信息管理】补充信息`, + centered: true, + }); + } + } + }) + } + render() { const { downlist, projectlist, staloading, tlist, trelist, idList, dateNum } = this.props; const { datevalue, messId, messageDetail, detailId, noticeDetail, questData, questVisible, mainDetail } = this.state; diff --git a/src/pages/MainPage/ProjectManager/service.ts b/src/pages/MainPage/ProjectManager/service.ts index db6d26e..0d084dc 100644 --- a/src/pages/MainPage/ProjectManager/service.ts +++ b/src/pages/MainPage/ProjectManager/service.ts @@ -20,3 +20,13 @@ export async function getCalendarData(params?: any) { params: params, }); } + +/** + * 判断当前登录人是否需要录入身份证或相片 + */ +export async function isInsertIdOrPhoto() { + return request("/api/biz-service-ebtp-rsms/v1/jury/user/photo/info", { + method: 'GET', + }); +} +