预审短流程-开启评审室（取消评委会校验，信息展示）

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)

src/pages/BidEvaluation/manager.js

@@ -233,16 +233,6 @@ class manager extends PureComponent {
     const params = {
       id: record.id
     }
-    //TODO zyx假数据-start
-    // confirm({
-    //   title: '确认开启评审室？',
-    //   icon: <ExclamationCircleOutlined />,
-    //   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: <ExclamationCircleOutlined />,
+              content: <span style={{ color: "#b30000" }}>注意：应答的供应商少于2家</span>,
+              centered: true,
+              onOk() {
+                onOpenPreRoom(params)
+              },
+              onCancel() { },
+            });
+          } else if (methodDict == "procurement_mode_3" && checkOpenList?.length < 3) {
+            confirm({
+              title: '确认开启评审室？',
+              icon: <ExclamationCircleOutlined />,
+              content: <span style={{ color: "#b30000" }}>注意：应答的供应商少于3家</span>,
+              centered: true,
+              onOk() {
+                onOpenPreRoom(params)
+              },
+              onCancel() { },
+            });
+          } else {
+            confirm({
+              title: '确认开启评审室？',
+              icon: <ExclamationCircleOutlined />,
+              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: <ExclamationCircleOutlined />,
+    //           content: <span style={{ color: "#b30000" }}>注意：应答的供应商少于2家</span>,
+    //           centered: true,
+    //           onOk() {
+    //             onOpenPreRoom(params)
+    //           },
+    //           onCancel() { },
+    //         });
+    //       } else if (methodDict == "procurement_mode_3" && checkOpenList?.length < 3) {
+    //         confirm({
+    //           title: '确认开启评审室？',
+    //           icon: <ExclamationCircleOutlined />,
+    //           content: <span style={{ color: "#b30000" }}>注意：应答的供应商少于3家</span>,
+    //           centered: true,
+    //           onOk() {
+    //             onOpenPreRoom(params)
+    //           },
+    //           onCancel() { },
+    //         });
+    //       } else {
+    //         confirm({
+    //           title: '确认开启评审室？',
+    //           icon: <ExclamationCircleOutlined />,
+    //           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) &&
                   <Button type="text" key="1"
                     onClick={() => { this.onOpenBizassessroom(record) }}
                     hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"]) || proMethod == 'procurement_mode_9'}
@@ -499,6 +591,16 @@ class manager extends PureComponent {
                     开启{sectionType}
                   </Button>
               }
+              {
+                record.sectionStatus == 9 ? null :
+                  (status == 0 || status == 1 && record.roomType == 1) &&
+                  <Button type="text" key="1"
+                    onClick={() => { this.onOpenPreBizassessroom(record) }}
+                    hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"]) || proMethod == 'procurement_mode_9'}
+                  >
+                    开启{sectionType}
+                  </Button>
+              }
               {
                 record.sectionStatus == 9 ? null :
                   status == 0 || status == 1 &&

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<{}> = () => {
           <Descriptions.Item label={`${sectionType}次数`}>{data2.reviewMark == 1 ? data2.roomSort + data2.reviewSort : data2.roomSort}</Descriptions.Item>
           <Descriptions.Item label={`${sectionType}时间`}>{data2.openTime}</Descriptions.Item>
         </Descriptions>
-        {roleName == "ebtp-agency-project-manager" || roleName == "ebtp-purchase" ? (
+        {(roleName == "ebtp-agency-project-manager" || roleName == "ebtp-purchase") ? (
           <>
-            <h3 className="first-title">评委会信息</h3>
+            {!data2.preBidShortProjectStatus && data2.roomType == 1 && (
-            <div>
+              <>
-              <ProTable
+                <h3 className="first-title">评委会信息</h3>
-                pagination={false}
+                <div>
-                columns={columns}
+                  <ProTable
-                dataSource={tableData}
+                    pagination={false}
-                size="small"
+                    columns={columns}
-                options={false}
+                    dataSource={tableData}
-                search={false}
+                    size="small"
-                rowKey="id"
+                    options={false}
-              />
+                    search={false}
-            </div>
+                    rowKey="id"
-            <h3 className="first-title" style={{ marginTop: '8px' }}>评审分工信息</h3>
+                  />
-            <div>
+                </div>
-              {/* <Button type="primary" onClick={() => setRateVisible(true)}>评审分工</Button> */}
+                <h3 className="first-title" style={{ marginTop: '8px' }}>评审分工信息</h3>
-              <ProTable
+                <div>
-                pagination={false}
+                  {/* <Button type="primary" onClick={() => setRateVisible(true)}>评审分工</Button> */}
-                columns={dividedColumns}
+                  <ProTable
-                dataSource={dividedTableData}
+                    pagination={false}
-                size="small"
+                    columns={dividedColumns}
-                options={false}
+                    dataSource={dividedTableData}
-                search={false}
+                    size="small"
-                rowKey="id"
+                    options={false}
-              />
+                    search={false}
-            </div>
+                    rowKey="id"
+                  />
+                </div>
+              </>)}
             <div className="baseinf-bottom-btn">
               <Button type="primary" size='large' disabled={juryConfigStatus == 1} onClick={() => onSubmit()}>开始{sectionType}</Button>
             </div>

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' });