From 3182b11ff4ad27a6d290b615fa314dc28944e8f9 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Thu, 5 May 2022 15:05:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?5.5=20=E4=BF=AE=E6=94=B9=E5=8D=95=E8=BD=AE?= =?UTF-8?q?=E6=8B=9B=E5=8B=9F=E5=92=8C=E5=A4=9A=E8=BD=AE=E6=8B=9B=E5=8B=9F?= =?UTF-8?q?=E5=85=AC=E7=A4=BA=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Calibration/BidPublicityResult/index.tsx | 20 +++++++++---------- .../Calibration/BidPublicityResult/index.tsx | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx index 9e957d4..9e89a66 100644 --- a/src/pages/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/Calibration/BidPublicityResult/index.tsx @@ -52,7 +52,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { const [approvalVisible, setApprovalVisible] = useState(false);//选择流程弹窗控制参数 const [approvalData, setApprovalData] = useState([]);//选择流程数据存储 - let name1 = "中标"; + let name1 = "中标候选人"; let name2 = "评标"; let name3 = "开标"; let name4 = "标段"; @@ -62,35 +62,35 @@ const BidPublicityResult: React.FC<{}> = (props) => { let defId = getDefId(); if (proDict == "procurement_mode_1" || proDict == "procurement_mode_2") { TpPackageName = "招标"; - name1 = "中标"; + name1 = "中标候选人"; name2 = "评标"; name3 = "开标"; name4 = "标段"; name5 = '定标'; } else if (proDict == "procurement_mode_3") { TpPackageName = "比选"; - name1 = "中选"; + name1 = "中选候选人"; name2 = "评审"; name3 = "评审开始" name4 = "采购包"; name5 = '评审结果'; } else if (proDict == "procurement_mode_5" || proDict == "procurement_mode_6" || proDict == "procurement_mode_9") { TpPackageName = "谈判"; - name1 = "中选"; + name1 = "中选候选人"; name2 = "评审"; name3 = "评审开始"; name4 = "采购包"; name5 = '评审结果'; } else if (proDict == "procurement_mode_4") { TpPackageName = "招募"; - name1 = "中选"; + name1 = "招募结果"; name2 = "评审"; name3 = "评审开始" name4 = "包件"; name5 = '评审结果'; } else if (proDict == "procurement_mode_7") { TpPackageName = "询价"; - name1 = "中选"; + name1 = "中选候选人"; name2 = "评审"; name3 = "评审开始"; name4 = "采购包"; @@ -282,7 +282,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { message.warn(`没有可关联的${name4}！`) } else { setPkId(""); - setUpdateChange(`新建${name1}候选人公示`) + setUpdateChange(`${proDict == "procurement_mode_4" ? '新增' : '新建'}${name1}公示`) setType("new"); setUpdateVisible(true); } @@ -293,14 +293,14 @@ const BidPublicityResult: React.FC<{}> = (props) => { } /*编辑招标公示*/ const toEdit = (props: any) => { - setUpdateChange(`编辑${name1}候选人公示`) + setUpdateChange(`编辑${name1}公示`) setPkId(props.id); setType("edit"); setUpdateVisible(true); } /*查看招标公示*/ const toRead = (props: any) => { - setUpdateChange(`查看${name1}候选人公示`) + setUpdateChange(`查看${name1}公示`) setType("read"); setPkId(props.id); setUpdateVisible(true); @@ -440,7 +440,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { size={"small"} loading={pageloading} toolBarRender={() => [ - , + , , diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx index fd4e4c1..bd30a51 100644 --- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx @@ -69,15 +69,15 @@ const BidPublicityResult: React.FC<{}> = (props) => { title: '起草时间', dataIndex: 'createDate', // dataIndex: 'annoStartTime', - key:"annoStartTime", - align:'left', + key: "annoStartTime", + align: 'left', valueType: 'dateTime', }, { title: '公示状态', dataIndex: 'status', - key:"status", - align:'left', + key: "status", + align: 'left', // valueEnum: { // 1: { text: '起草', status: '' }, // 2: { text: '已提交', status: '' }, @@ -219,7 +219,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { if (res.data.length == 0) { message.warn("没有可关联的包件！") } else { - setUpdateChange('新建中选候选人公示') + setUpdateChange('新增招募结果公示') setType("new"); setUpdateVisible(true); } @@ -231,14 +231,14 @@ const BidPublicityResult: React.FC<{}> = (props) => { } /*编辑招标公示*/ const toEdit = (props: any) => { - setUpdateChange('编辑中选候选人公示') + setUpdateChange('编辑招募结果公示') setPkId(props.id); setType("edit"); setUpdateVisible(true); } /*查看招标公示*/ const toRead = (props: any) => { - setUpdateChange('查看中选候选人公示') + setUpdateChange('查看招募结果公示') setType("read"); setPkId(props.id); setUpdateVisible(true); @@ -317,9 +317,9 @@ const BidPublicityResult: React.FC<{}> = (props) => { setPageloading(true); //获取流程列表 getApprProcessList(record.id).then(res => { - if(res?.code == 200) { + if (res?.code == 200) { const data = res?.data - if(data?.approval == true) {//打开选择流程界面 + if (data?.approval == true) {//打开选择流程界面 setRecordData(record) setApprovalData(data?.list) setApprovalVisible(true) @@ -358,7 +358,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { size={"small"} loading={pageloading} toolBarRender={() => [ - , + , , ]} search={false} From 9eba94ed191714ff4f486d476a519dd4f9d5ab45 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 9 May 2022 15:12:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?5.9=20=E4=BF=AE=E6=94=B9=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E7=AD=89=E7=BA=A7=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ViewBlacklistFormModal.tsx | 9 +-------- .../components/ViewInvoiceFormModal.tsx | 5 +---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx index 6203217..05d3c99 100644 --- a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx +++ b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx @@ -68,14 +68,7 @@ const ViewBlacklistFormModal: React.FC = (props) => return a; } }, - { - title: '黑名单等级', dataIndex: 'lv', render: (_, record) => { - if (record.isBlack == "1") { - return (isEmpty(record.lv) || record.lv == "1") ? '一级' : '二级'; - } - return ''; - } - }, + { title: '黑名单等级', dataIndex: 'lvName', }, { title: '黑名单开始时间', dataIndex: 'startTime', }, { title: '黑名单结束时间', dataIndex: 'endTime', }, { title: '黑名单期限', dataIndex: 'term', }, diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx index 951eb09..916669b 100644 --- a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx +++ b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx @@ -32,10 +32,7 @@ const ViewInvoiceFormModal: React.FC = (props) => { dataIndex: 'ouName', }, { title: '黑名单等级', - dataIndex: 'reserved5', - render: (_: any, record: any) => { - return (isEmpty(record.reserved5) || record.reserved5 == "1") ? '一级' : '二级'; - } + dataIndex: 'lvName', }, { title: '黑名单开始时间', dataIndex: 'startTime', From 44bb739e3e8d430d2b878fcaf13c7d459fe64460 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 9 May 2022 15:30:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?5.9=20=E6=BE=84=E6=B8=85=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=97=B6=E9=97=B4=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0roomType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClarifyTheList/components/ClarifyTheList.tsx | 3 ++- src/pages/Tender/ProjectManager/ClarifyTheList/service.ts | 7 ++++--- .../ClarifyTheList/components/ClarifyTheList.tsx | 3 ++- .../Tender/ProjectManager/ClarifyTheList/service.ts | 5 +++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx b/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx index 4ad878e..ccca394 100644 --- a/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx +++ b/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx @@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => { } function afterSave() { let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : []; + let params = { roomType }; if (isNotEmpty(packageIds) && packageIds.length !== 0) { //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系 - getClarifyAnnoList(packageIds).then(res => { + getClarifyAnnoList(packageIds, params).then(res => { if (res.code === 200) { //招标文件获取开始时间 let docStartTimes = res.data.map((item: any) => item.docStartTime); diff --git a/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts b/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts index 16e7696..48c94f7 100644 --- a/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts +++ b/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts @@ -98,7 +98,7 @@ export async function clarifyReply(id: any) { * 查询标段 * @param projectId */ -export function getSections(projectId: any, roomType:any) { +export function getSections(projectId: any, roomType: any) { return request('/api/biz-service-ebtp-tender/v1/clarifydissent/packages/' + projectId + '?roomType=' + roomType, { method: 'put' }); @@ -107,9 +107,10 @@ export function getSections(projectId: any, roomType:any) { * 根据标段id查询公告 * @param data */ -export function getClarifyAnnoList(data: any) { +export function getClarifyAnnoList(data: any, params: any) { return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', { method: 'post', - data: data + data: data, + params: params, }); } \ No newline at end of file diff --git a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx index 29920dc..8a7b301 100644 --- a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx +++ b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx @@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => { return; } let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : []; + let params = { roomType }; if (isNotEmpty(packageIds) && packageIds.length !== 0) { //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系 - getClarifyAnnoList(packageIds).then(res => { + getClarifyAnnoList(packageIds, params).then(res => { if (res.code == 200) { getRoomList({ sectionIdList: packageIds }).then((res2) => { if (res2.code == 200) { diff --git a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts index 6686bee..77f7470 100644 --- a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts +++ b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts @@ -107,10 +107,11 @@ export function getSections(projectId: any, roomType: any) { * 根据标段id查询公告 * @param data */ -export function getClarifyAnnoList(data: any) { +export function getClarifyAnnoList(data: any, params: any) { return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', { method: 'post', - data: data + data: data, + params: params, }); } /** From 6e6a1da11ed7c0ff1de9f57445f334329894a685 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Wed, 11 May 2022 09:39:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?5.11=20resetVerificationCode=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/bidev.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/bidev.js b/src/services/bidev.js index cc30a8e..c8d0c7b 100644 --- a/src/services/bidev.js +++ b/src/services/bidev.js @@ -18,7 +18,7 @@ export async function zmmultiOpenBizassessroom(params) { export async function resetVerificationCode(params) { return request(`/api/biz-service-ebtp-process/v1/bizassessroom/update/captcha/${params.id}`, - {method: 'put'}); + {method: 'post'}); } export async function fetchJuryList(params) {