diff --git a/config/ZhaoBiao/router_menubProject.config.ts b/config/ZhaoBiao/router_menubProject.config.ts index 0d8e63b..7590ed1 100644 --- a/config/ZhaoBiao/router_menubProject.config.ts +++ b/config/ZhaoBiao/router_menubProject.config.ts @@ -46,6 +46,19 @@ export default [ path: '/ProjectLayout/Supplier/HomePageSectionList', component: './Project/ProjectManage/Supplier/HomePageSectionList', }, + /** + * 项目建档 + */ + { + // 项目建档列表 + path: '/ProjectLayout/ProjectFiles', + component: './ProjectFiles', + }, + { + // 项目建档新增 + path: '/ProjectLayout/ProjectFiles/file', + component: './ProjectFiles/file', + }, ...bid, ...tender, ...open, diff --git a/src/models/dashboard.js b/src/models/dashboard.js index aa2c614..31027cd 100644 --- a/src/models/dashboard.js +++ b/src/models/dashboard.js @@ -1,7 +1,6 @@ import { fetchDowntlist, fetchprojectRecords, fetchJuryUpList, fetchJuryDownlist, fetchSupplierUpList, fetchDisposalList, fetchParticipants, - fetchSupplierDownLeftList, fetchSupplierDownRightList, fetchtlist, fetchtlistre, fetchtPageList, fetchtShotList, fetchtClarify, - fetchProjectFileList + fetchSupplierDownLeftList, fetchSupplierDownRightList, fetchtlist, fetchtlistre, fetchtPageList, fetchtShotList, fetchtClarify } from '../services/dashboard'; import { message } from 'antd'; import { getProId } from '@/utils/session'; @@ -198,13 +197,13 @@ export default { yield put({ type: 'save', payload: { downlist: response.data } }) } }, - *fetchProjectFileList({ payload, callback }, { call, put }) { - const response = yield call(fetchProjectFileList, payload) - console.log(123) - if (response.code == 200) { - yield put({ type: 'save', payload: { projectInProgressList: response.data.records } }) - } - }, + // *fetchProjectFileList({ payload, callback }, { call, put }) { + // const response = yield call(fetchProjectFileList, payload) + // console.log(123) + // if (response.code == 200) { + // yield put({ type: 'save', payload: { projectInProgressList: response.data.records } }) + // } + // }, *fetchprojectRecords({ payload, callback }, { call, put }) { const response = yield call(fetchprojectRecords, payload) if (response.code == 200 && response.data.length > 0) { diff --git a/src/pages/MainPage/ProjectManager/purchaseManager.js b/src/pages/MainPage/ProjectManager/purchaseManager.js index b37b5b2..917713f 100644 --- a/src/pages/MainPage/ProjectManager/purchaseManager.js +++ b/src/pages/MainPage/ProjectManager/purchaseManager.js @@ -274,7 +274,11 @@ class manager extends PureComponent { render: (text, record) => ( <> diff --git a/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/index.tsx b/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/index.tsx index e8dcf73..467ccbd 100644 --- a/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/index.tsx +++ b/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/index.tsx @@ -1,10 +1,11 @@ import React, { useEffect, useRef, useState } from 'react'; import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table'; -import { getSectionList } from './service'; +import { getSectionList ,getRegisterInfo } from './service'; import { changeDict } from './utils'; import { getDefId, getDicData, getProId, getProMethod } from '@/utils/session'; -import { Card } from 'antd'; +import {Card, Typography} from 'antd'; import '@/assets/zjl_style.less'; +const { Text } = Typography; import { getBidOpenTime, getStartReviewTime, @@ -31,6 +32,15 @@ const HomePageSectionList: React.FC<{}> = () => { const [isReviewRule, setIsReviewRule] = useState(false); //进度环节有无 true-有 false-无 const [isProcess, setIsProcess] = useState(true); + const [data,setData] = useState({ + companyName: '', + contactName: '', + contactTelephone: '', + contactFax: '', + contactAddress:'', + contactEmail:'', + fixedLine: '' + }); //资审开标时间有无 true-有 false-无 const [preBidOpen, setPreBidOpen] = useState({ preBidOpenName: '资审开标时间', @@ -48,7 +58,20 @@ const HomePageSectionList: React.FC<{}> = () => { const [operationSele, setOperationSele] = useState({ sectionName: '采购包跟进', }); + + let registerInfo: any = {}; + const fetchData = async () =>{ + getRegisterInfo(getProId()).then((res: any) => { + console.log(res.data) + registerInfo = res.data + setData(res.data); + }); + } useEffect(() => { + + fetchData(); + + //初始化column字段显示 if (defId == 'bid_prequalification') { //公开招标（预审+后审） @@ -154,7 +177,7 @@ const HomePageSectionList: React.FC<{}> = () => { const columns: ProColumns[] = [ { - title: '序号', + title: '序号112233', render: (_: any, record: any, index: any) => { return index + 1; }, @@ -238,7 +261,51 @@ const HomePageSectionList: React.FC<{}> = () => { ]; return ( - +
+ + {/* 报名单位名称 - 独占一行 */} +
+ 报名单位名称 + {data.companyName} +
+ + {/* 使用Flex布局实现统一对齐 */} +
+ {/* 联系人名称和联系人地址 - 优化对齐 */} +
+ 联系人名称 + {data.contactName} +
+ +
+ 联系人地址 + {data.contactAddress} +
+ + {/* 联系电话和联系人邮箱 - 优化对齐 */} +
+ 联系电话 + {data.contactTelephone} +
+ +
+ 联系人邮箱 + {data.contactEmail} +
+ + {/* 固话和传真 - 优化对齐 */} +
+ 固话 + {data.fixedLine} +
+ +
+ 传真 + {data.contactFax} +
+
+ + = () => { //调用分页方法 request={async (params) => await getSectionList(getProId()).then(async (response: any) => { - let data = response.data; - let param = { - sectionIds: data.map((ele: any) => ele.id), - }; - //获取资审开标时间&开标时间 - await getBidOpenTime({ ...param }).then(async (res) => { - if (res.code == 200) { - const openTimeData = res.data; - //获取开始评审时间 - await getStartReviewTime({ ...param }).then((resp) => { - if (resp.code == 200) { - data.forEach((e: any) => { - e.preOpenTime = - openTimeData[`${e.id}_1`] == undefined ? '未定' : openTimeData[`${e.id}_1`]; - e.openTime = - openTimeData[`${e.id}_2`] == undefined ? '未定' : openTimeData[`${e.id}_2`]; - e.time = "未定"; - if (resp.data.length == 0) { - } else { - resp.data.forEach((ele: any) => { - if (ele.sectionId == e.id) { - e.time = ele.openTime; - } - }); - } - }); - } - }); - } - }); - return { - data: getDataInPage(params.pageSize, params.current, data), - success: response.success, - total: data.length, - pageSize: params.pageSize, - current: params.current, - }; + let data = response.data; + let param = { + sectionIds: data.map((ele: any) => ele.id), + }; + //获取资审开标时间&开标时间 + await getBidOpenTime({ ...param }).then(async (res) => { + if (res.code == 200) { + const openTimeData = res.data; + //获取开始评审时间 + await getStartReviewTime({ ...param }).then((resp) => { + if (resp.code == 200) { + data.forEach((e: any) => { + e.preOpenTime = + openTimeData[`${e.id}_1`] == undefined ? '未定' : openTimeData[`${e.id}_1`]; + e.openTime = + openTimeData[`${e.id}_2`] == undefined ? '未定' : openTimeData[`${e.id}_2`]; + e.time = "未定"; + if (resp.data.length == 0) { + } else { + resp.data.forEach((ele: any) => { + if (ele.sectionId == e.id) { + e.time = ele.openTime; + } + }); + } + }); + } + }); + } + }); + return { + data: getDataInPage(params.pageSize, params.current, data), + success: response.success, + total: data.length, + pageSize: params.pageSize, + current: params.current, + }; }) } rowKey="id" @@ -295,6 +362,7 @@ const HomePageSectionList: React.FC<{}> = () => { dateFormatter="string" /> +
); }; diff --git a/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/service.ts b/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/service.ts index 8e7812a..40205fe 100644 --- a/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/service.ts +++ b/src/pages/Project/ProjectManage/Supplier/HomePageSectionList/service.ts @@ -28,3 +28,15 @@ export async function getSectionList(params: any) { method: 'GET', }); } + +/** + * 查询标段列表 + * @method POST + */ +export async function getRegisterInfo(params: any) { + return request('/api/biz-service-ebtp-tender/v1/supplier_register/packages/supplied/getSupplierRegisterInfo/' + params, { + method: 'GET', + }); +} + + diff --git a/src/pages/ProjectFiles/entrustIndex.tsx b/src/pages/ProjectFiles/entrustIndex.tsx index d63e5b3..ba6ce42 100644 --- a/src/pages/ProjectFiles/entrustIndex.tsx +++ b/src/pages/ProjectFiles/entrustIndex.tsx @@ -95,7 +95,7 @@ const ProjectFiles: React.FC = () => { {(