diff --git a/src/models/bidev.js b/src/models/bidev.js
index 067150e..20ea160 100644
--- a/src/models/bidev.js
+++ b/src/models/bidev.js
@@ -1,4 +1,4 @@
-import { fetchManagerList,openBizassessroom,openOffBizassessroom,resetVerificationCode,fetchJuryList,fetchSupplierList
+import { fetchManagerList,openBizassessroom,openPreBizassessroom,openOffBizassessroom,resetVerificationCode,fetchJuryList,fetchSupplierList
,fetchJuryMemInfo,updateJuryMemInfo,validateVerificationCode,fetchbidslist
,fetchPreSupplierList,fetchPreList,fetchPreListt,bxmultifetchPreListt,pushRedirectRe,getCheckedByRoomId,checkOpenBidSupplier,zmmultiOpenBizassessroom } from '../services/bidev';
import { message } from 'antd';
@@ -43,6 +43,23 @@ export default {
}
callback();
},
+ // 开启预审评审室
+ *openPreBizassessroom({payload,callback}, { call, put }){
+ const response =yield call(openPreBizassessroom,payload)
+ if(response?.code==200){
+ // 查询招标代理列表
+ const params={
+ pageNo:1,
+ pageSize:10,
+ // roomType:2,
+ roomType: getURLInformation('roomType'),
+ tpId:getProId()//项目id
+ }
+ yield put({ type: 'fetchManagerList', payload: {...params} });
+ message.success("开启成功!")
+ }
+ callback();
+ },
// 开启线下评审室
*openOffBizassessroom({payload,callback}, { call, put }){
const response =yield call(openOffBizassessroom,payload)
diff --git a/src/pages/BidEvaluation/manager.js b/src/pages/BidEvaluation/manager.js
index 0faa1a5..c628645 100644
--- a/src/pages/BidEvaluation/manager.js
+++ b/src/pages/BidEvaluation/manager.js
@@ -233,16 +233,6 @@ class manager extends PureComponent {
const params = {
id: record.id
}
- //TODO zyx假数据-start
- // confirm({
- // title: '确认开启评审室?',
- // icon: ,
- // centered: true,
- // onOk() {
- // onOpenRoom(params)
- // },
- // onCancel() { },
- // });
this.props.dispatch({
type: "bidev/checkOpenBidSupplier",
payload: params.id,
@@ -288,6 +278,93 @@ class manager extends PureComponent {
}
}
})
+ }
+ onOpenPreBizassessroom = async (record) => {
+ const { onOpenPreRoom } = this
+ const { proMethod } = this.state
+ const params = {
+ id: record.id
+ }
+ //TODO zyx假数据-start
+ let methodDict = proMethod == null ? "procurement_mode_1" : proMethod
+ if (methodDict == "procurement_mode_5" && checkOpenList?.length < 2) {
+ confirm({
+ title: '确认开启评审室?',
+ icon: ,
+ content: 注意:应答的供应商少于2家,
+ centered: true,
+ onOk() {
+ onOpenPreRoom(params)
+ },
+ onCancel() { },
+ });
+ } else if (methodDict == "procurement_mode_3" && checkOpenList?.length < 3) {
+ confirm({
+ title: '确认开启评审室?',
+ icon: ,
+ content: 注意:应答的供应商少于3家,
+ centered: true,
+ onOk() {
+ onOpenPreRoom(params)
+ },
+ onCancel() { },
+ });
+ } else {
+ confirm({
+ title: '确认开启评审室?',
+ icon: ,
+ centered: true,
+ onOk() {
+ onOpenPreRoom(params)
+ },
+ onCancel() { },
+ });
+ }
+ // this.props.dispatch({
+ // type: "bidev/checkOpenBidSupplier",
+ // payload: params.id,
+ // callback: (response) => {
+ // let checkOpenList = response.data
+ // let methodDict = proMethod == null ? "procurement_mode_1" : proMethod
+ // if (checkOpenList?.length == 0) {
+ // message.error("应答的供应商为0家,不能开启评审!")
+ // } else {
+ // if (methodDict == "procurement_mode_5" && checkOpenList?.length < 2) {
+ // confirm({
+ // title: '确认开启评审室?',
+ // icon: ,
+ // content: 注意:应答的供应商少于2家,
+ // centered: true,
+ // onOk() {
+ // onOpenPreRoom(params)
+ // },
+ // onCancel() { },
+ // });
+ // } else if (methodDict == "procurement_mode_3" && checkOpenList?.length < 3) {
+ // confirm({
+ // title: '确认开启评审室?',
+ // icon: ,
+ // content: 注意:应答的供应商少于3家,
+ // centered: true,
+ // onOk() {
+ // onOpenPreRoom(params)
+ // },
+ // onCancel() { },
+ // });
+ // } else {
+ // confirm({
+ // title: '确认开启评审室?',
+ // icon: ,
+ // centered: true,
+ // onOk() {
+ // onOpenPreRoom(params)
+ // },
+ // onCancel() { },
+ // });
+ // }
+ // }
+ // }
+ // })
//TODO zyx假数据-end
}
onOpenRoom = (params) => {
@@ -317,6 +394,21 @@ class manager extends PureComponent {
})
}
}
+ onOpenPreRoom = (params) => {
+ const { defId } = this.state
+ this.setState({
+ loading: true
+ })
+ this.props.dispatch({
+ type: "bidev/openPreBizassessroom",
+ payload: { ...params },
+ callback: () => {
+ this.setState({
+ loading: false
+ })
+ }
+ })
+ }
onOpenOffBizassessroom = async (record) => {
// const {checkOpenList} = this.props
@@ -491,7 +583,7 @@ class manager extends PureComponent {
<>
{
record.sectionStatus == 9 ? null :
- status == 0 || status == 1 &&
+ (status == 0 || status == 1 && record.roomType == 2) &&
}
+ {
+ record.sectionStatus == 9 ? null :
+ (status == 0 || status == 1 && record.roomType == 1) &&
+
+ }
{
record.sectionStatus == 9 ? null :
status == 0 || status == 1 &&
diff --git a/src/pages/Evaluation/BaseInf/index.tsx b/src/pages/Evaluation/BaseInf/index.tsx
index 78efb5c..d22a4ab 100644
--- a/src/pages/Evaluation/BaseInf/index.tsx
+++ b/src/pages/Evaluation/BaseInf/index.tsx
@@ -168,12 +168,12 @@ const Index: React.FC<{}> = () => {
},
{
title: '签到状态',
- width: reserveStatus != 1?'20%':'10%',
+ width: reserveStatus != 1 ? '20%' : '10%',
render: (value, record) => (record.status == 1 ? "未签到" : record.status == 2 ? "已签到" : "已申请回避"),
},
{
title: '签到时间',
- width: reserveStatus != 1?'30%':'20%',
+ width: reserveStatus != 1 ? '30%' : '20%',
valueType: 'dateTime',
dataIndex: 'loginTime',
},
@@ -239,33 +239,36 @@ const Index: React.FC<{}> = () => {
{data2.reviewMark == 1 ? data2.roomSort + data2.reviewSort : data2.roomSort}
{data2.openTime}
- {roleName == "ebtp-agency-project-manager" || roleName == "ebtp-purchase" ? (
+ {(roleName == "ebtp-agency-project-manager" || roleName == "ebtp-purchase") ? (
<>
-
评委会信息
-
- 评审分工信息
-
- {/*
*/}
-
-
+ {!data2.preBidShortProjectStatus && data2.roomType == 1 && (
+ <>
+ 评委会信息
+
+ 评审分工信息
+
+ {/*
*/}
+
+
+ >)}
diff --git a/src/services/bidev.js b/src/services/bidev.js
index cebd7ac..765e551 100644
--- a/src/services/bidev.js
+++ b/src/services/bidev.js
@@ -10,7 +10,12 @@ export async function openBizassessroom(params) {
return request(`/api/biz-service-ebtp-process/v1/bizassessroom/openRoom/${params.id}`,
{ method: 'POST' });
}
-// 开启评审
+// 开启预审评审
+export async function openPreBizassessroom(params) {
+ return request(`/api/biz-service-ebtp-process/v1/bizassessroom/openPreRoom/${params.id}`,
+ { method: 'POST' });
+}
+// 开启线下评审
export async function openOffBizassessroom(params) {
return request(`/api/biz-service-ebtp-process/v1/bizassessroom/openOffRoom/${params.id}`,
{ method: 'POST' });