diff --git a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx index cee82de..68907c6 100644 --- a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx +++ b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx @@ -80,11 +80,24 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { const proceedingTypeByBidMethodDict = getProceedingTypeByBidMethodDict(bidMethodDict); const proceedingTypeByDefId = getProceedingTypeByDefId(getDefId()) const [spinning, setSping] = useState(false);//加载遮罩 + const type = window.location.pathname.includes("SupplierQuestionsOrObjectionsDing");//获取url判断投标、定标提疑 + const [proceedingTypeSelect] = useState(() => { - let arr = proceedingTypeByDefId.map((item: any) => - - ); - return arr; + //根据浏览器rul获取type值false为招标阶段提疑 true为定标阶段提疑 + //招标阶段 事项类别对应 招标文件异议、招标文件疑问 定标阶段事项类别对应 中标公示疑问、中标公示异议、中标结果疑问、中标结果异议 + if (!type) { + let arr = proceedingTypeByDefId.slice(-2) // 截取最后两个元素 + .map((item: any) => + + ); + return arr; + }else { + let arr = proceedingTypeByDefId.slice(0, 4) // 截取前四个元素 + .map((item: any) => + + ); + return arr; + } }); const [proceedingTypeColumns] = useState(() => { let obj = {}; @@ -191,8 +204,6 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { }) }, []); - - /** * 查看 * @param data @@ -235,7 +246,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { } /** * 根据id删除数据 - * @param id + * @param id */ const deleteDataBasedOnId = (id: any) => { setVisibleDelete(false); @@ -246,7 +257,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { } /** * 提交 - * @param data 数据 + * @param data 数据 */ const submit = (data: any) => { setVisibleSubmit(true); @@ -254,7 +265,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { } /** * 提交 - * @param data + * @param data */ const submitDataBasedOnId = (data: any) => { setVisibleSubmit(false); @@ -278,7 +289,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { /** * 弹出层关闭 - * @param data + * @param data */ const handleCancel = () => { setVisible(false); @@ -291,7 +302,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { } /** * 表单提交 - * @param data + * @param data */ const onFinish = (data: any) => { setVisible(false); @@ -484,14 +495,16 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { rowKey="id" size="small" pagination={{ defaultPageSize: 10 }} - params={{ projectId: projectId, roomType: roomType, dissentType: "1" }} + params={{ projectId: projectId, roomType: roomType, dissentType: "1" ,type:type}} actionRef={actionRef} columns={columns} request={params => queryingPagingData('/api/biz-service-ebtp-tender/v1/clarifydissent/supplier_dissents', 'post', params)} search={false} options={false} toolBarRender={() => [ - , ]} @@ -516,4 +529,4 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => { ) } -export default SupplierQuestionsOrObjections; \ No newline at end of file +export default SupplierQuestionsOrObjections; diff --git a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/utils.ts b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/utils.ts index 350bbe2..7fc934a 100644 --- a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/utils.ts +++ b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/utils.ts @@ -19,12 +19,12 @@ export function getProceedingTypeByBidMethodDict(bidMethodDict: string): any[] { case 'procurement_mode_1': case 'procurement_mode_2': arr = [ - getProceedingType('1', '异议评标结果'), - getProceedingType('2', '异议开标过程'), - getProceedingType('3', '异议中标公示'), - getProceedingType('4', '异议中标结果'), - getProceedingType('5', '提疑资格预审文件'), - getProceedingType('6', '提疑招标文件'), + getProceedingType('1', '中标公示疑问'), + getProceedingType('2', '中标公示异议'), + getProceedingType('3', '中标结果疑问'), + getProceedingType('4', '中标结果异议'), + getProceedingType('5', '招标文件异议'), + getProceedingType('6', '招标文件疑问'), ] break; case 'procurement_mode_3': @@ -78,11 +78,12 @@ export function getProceedingTypeByDefId(defId: string): any[] { case 'bid_centralized_prequalification_bid': case 'bid_invitation': arr = [ - getProceedingType('1', '异议评标结果'), - getProceedingType('2', '异议开标结果'), - getProceedingType('3', '异议中标公示'), - getProceedingType('4', '异议中标结果'), - getProceedingType('6', '提疑招标文件'), + getProceedingType('1', '中标公示疑问'), + getProceedingType('2', '中标公示异议'), + getProceedingType('3', '中标结果疑问'), + getProceedingType('4', '中标结果异议'), + getProceedingType('5', '招标文件异议'), + getProceedingType('6', '招标文件疑问'), ] break; case 'comparison_one_prequalification':