3.10 工程代码同步master

src/pages/BidEvaluation/Jury.js

@@ -3,11 +3,17 @@ import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message
 import './index.less';
 import { connect } from "dva";
 import { history } from "umi"
+import { number } from 'prop-types';
+import { getURLInformation } from '@/utils/CommonUtils';
+import '@/assets/zjl_style.less'
+import ExpertEnter from "./components/ExpertEnter"
+import CommitmentModal from "./components/CommitmentModal"
 // import bookt from "../../assets/bookt.doc";
 
 const FormItem=Form.Item;
 const formRef = React.createRef();
 const DescriptionsItem=Descriptions.Item;
+const proTypeCode = getURLInformation('proTypeCode') == undefined || getURLInformation('proTypeCode') == null || getURLInformation('proTypeCode') == '' ? [] : getURLInformation('proTypeCode')?.split(",")
 @connect(({ bidev,loading }) => ({
   ...bidev,
   JurylistLoading:loading.effects['bidev/fetchJuryList'],
@@ -22,9 +28,35 @@ class Jury extends PureComponent {
     room:[],
     bookflag:false,
     display:false,
+    sectionName:"采购包",
+    sectionType:"评审",
+    roleName: "投标人",
+    // visible: false,
+    commitmentVisible: false
   }
   componentDidMount(){
-    // console.log(this.props.match.params.roomType)
+     //确定显示字段名称
+     let sectionName = "采购包";
+     let sectionType = "评审";
+     let roleName = "投标人"
+     let proMethod = proTypeCode?.length == 0 ? null : proTypeCode[0];
+     if(proMethod == "procurement_mode_1" || proMethod == "procurement_mode_2") {
+         sectionName= "标段";
+         sectionType= "评标";
+     } else if(proMethod == "procurement_mode_5" || proMethod == "procurement_mode_6") {
+       sectionName= "采购包";
+       sectionType= "谈判";
+       roleName="供应商"
+     } else if(proMethod == "procurement_mode_4") {
+       sectionName= "包件";
+       roleName="供应商"
+     }
+     this.setState({
+       sectionName,
+       sectionType,
+       roleName
+     })
+
     this.setState({
       bookflag:true
     })
@@ -35,7 +67,8 @@ class Jury extends PureComponent {
       pageSize:10,
       // roomType:this.props.match.params.roomType,
       // tpId: getProId(),//项目id
-      checked:false
+      // checked:false
+      bidMethodDict: proTypeCode
     }
     dispatch({
       type:"bidev/fetchJuryList",
@@ -43,34 +76,6 @@ class Jury extends PureComponent {
     })
   }
 
-  columns=[
-    { title: '序号', dataIndex: 'id', width: '10%',
-      render:(text, record, index)=>{
-        return (index+1)
-    }},
-    { title: '项目名称', dataIndex: 'projectName', width: '10%'},
-    { title: '标段名称', dataIndex: 'sectionName', width: '10%'},
-    { title: '标段编号', dataIndex: 'sectionNum', width: '10%'},
-    { title: '评标次数', dataIndex: 'roomSort', width: '10%',
-      render:(text, record, index)=>{
-      return <>第{text}次评标</>
-    }},
-    { title: '评标开始时间', dataIndex: 'openTime', width: '10%'},
-    { title: '操作', dataIndex: 'operation', width: '10%',
-      render:(text, record, index)=>{
-      return <><a className="buttont"onClick={()=>{this.onRateShow(record)}}>进入评审室</a></>
-  }}
-  ]
-
-  bidscolumns=[
-    { title: '序号', dataIndex: 'id', width: '10%',
-      align:"center",
-      render:(text, record, index)=>{
-        return (index+1)
-    }},
-    { title: '投标人名称', dataIndex: 'bidUserName',align:"center", width: '90%'}
-  ]
-
   onRateShow=(record)=>{
     this.setState({
       room:record
@@ -85,7 +90,6 @@ class Jury extends PureComponent {
       type:"bidev/getCheckedByRoomId",
       payload: {...roomId},
       callback:(response) => {
-        console.log(response)
         if(response.data == false) {
           this.setState({display: true})
         } else {
@@ -100,6 +104,7 @@ class Jury extends PureComponent {
         if(txt=="success"){
           sessionStorage.setItem('projectData',JSON.stringify(record))
           sessionStorage.setItem('roomId',record.id)
+          sessionStorage.setItem("groupId",record.chatGroupId)
           this.setState({
             ratevisible:true,
             tpId:record.tpId
@@ -112,14 +117,13 @@ class Jury extends PureComponent {
   onRe2ndPageOut=()=>{
     const { validateFields,getFieldValue }=formRef.current;
     const { JuryInfo,checked }=this.props;
-    validateFields(['name','phone',
+    validateFields(['name','mobile',
                     // 'certificate',
     'verificationCode']).then(
       (values) => {
-        console.log(values);
         const params={
           name:values.name,
-          phone:values.phone,
+          mobile:values.mobile,
           id:JuryInfo.id
         }
         this.props.dispatch({
@@ -139,9 +143,9 @@ class Jury extends PureComponent {
                 callback:(response,txt)=>{
                   if(txt=="success"){
                     const { display }=this.state;
-                    console.log(display)
                     if(display == true) {
-                      history.push('/EvaRoom')
+                      // history.push('/EvaRoom')
+                      window.open('/EvaRoom/Eva')
                       this.setState({
                         ratevisible:false,
                       })
@@ -198,6 +202,9 @@ class Jury extends PureComponent {
   }
   windowopen=()=>{
     // window.open(response.data, '_blank')
+    this.setState({
+      commitmentVisible:true
+    })
   }
   handleRedirect=(txt)=>{
     const { checked,room }=this.state;
@@ -220,14 +227,14 @@ class Jury extends PureComponent {
           if(txt==1){
             // sessionStorage.setItem("roomId",record.id)
             // this.props.dispatch(routerRedux.push('/ProjectLayout/EvaRoom'))
-            history.push('/EvaRoom')
+            // history.push('/EvaRoom')
+            window.open('/EvaRoom/Eva')
           }else{
             this.setState({
-              ratevisible:false
+              ratevisible:false,
+              bookflag:true
             })
           }
-        }else{
-          message.error(response.message)
         }
       }
     })
@@ -239,7 +246,7 @@ class Jury extends PureComponent {
   }
   render(){
     const { JuryList,JurylistLoading,JuryInfo,bidslistLoading,bidslist}=this.props;
-    const { pageNo,pageSize,tpId,ratevisible,bookflag,checked,display }=this.state;
+    const { pageNo,pageSize,tpId,ratevisible,bookflag,checked,display,sectionName,sectionType,roleName }=this.state;
     const pagination = {
       current: pageNo,
       total: JuryList && JuryList.total ,
@@ -279,38 +286,76 @@ class Jury extends PureComponent {
         })
       }
     }
+    const columns=[
+      { title: '序号', dataIndex: 'id', width: 50,
+        render:(text, record, index)=>{
+          return (index+1)
+      }},
+      { title: '项目名称', dataIndex: 'projectName'},
+      { title: `${sectionName}名称`, dataIndex: 'sectionName'},
+      { title: `${sectionName}编号`, dataIndex: 'sectionNum'},
+      { title: `${sectionType}次数`, dataIndex: 'roomSort', width: 100,
+        render:(text, record, index)=>{
+        return <>第{text}次{sectionType}</>
+      }},
+      { title: `${sectionType}开始时间`, dataIndex: 'openTime'},
+      { title: '操作', dataIndex: 'operation', width: 120,
+        render:(text, record, index)=>{
+        return <><Button type="text" onClick={()=>{this.onRateShow(record)}}>进入{sectionType}室</Button></>
+    }}
+    ]
+    
+    const bidscolumns=[
+      { title: '序号', dataIndex: 'id', width: '10%',
+        align:"center",
+        render:(text, record, index)=>{
+          return (index+1)
+      }},
+      { title: `${roleName}名称`, dataIndex: 'bidUserName',align:"center", width: '90%'}
+    ]
+
     const formItemLayout = {
-      labelCol: { span: 5 },
+      labelCol: { span: 6 },
       wrapperCol: { span: 13 }
     };
     const renderBookt=()=>{
-      return <div className="bookt"><Descriptions title={<div className="zul">专家信息</div>} bordered column={2}>
-              <DescriptionsItem label="姓名">{JuryInfo!="" && JuryInfo.name}</DescriptionsItem>
-              <DescriptionsItem label="手机号">{JuryInfo!="" && JuryInfo.phone}</DescriptionsItem>
-              <DescriptionsItem label="身份证号">{JuryInfo!="" && JuryInfo.certificate}</DescriptionsItem>
+      return (
+              <Card bodyStyle={{padding: "13px 24px 24px"}}>
+              <div className="first-title">专家信息</div>
+              <Descriptions column={3}>
+              <DescriptionsItem label="姓名" style={{padding:'1px 1px 0px'}}>{JuryInfo!="" && JuryInfo.name}</DescriptionsItem>
+              <DescriptionsItem label="手机号" style={{padding:'1px 1px 0px'}}>{JuryInfo!="" && JuryInfo.mobile}</DescriptionsItem>
+              <DescriptionsItem label="身份证号" style={{padding:'1px 1px 0px'}}>{JuryInfo!="" && JuryInfo.certificate}</DescriptionsItem>
               </Descriptions>
-              <div className="zul" style={{marginTop:"10px",marginBottom:"20px"}}>投标人信息</div>
+              {/* <div className="zul" style={{marginTop:"10px",marginBottom:"20px"}}>投标人信息</div> */}
+              <div className="first-title">{roleName}信息</div>
               <Table
                 loading={bidslistLoading}
-                columns={this.bidscolumns}
+                columns={bidscolumns}
                 dataSource={bidslist!="" && bidslist}
                 pagination={true}
+                size="small"
                 // className="table"
-                bordered
               />
-              <span style={{marginLeft:"39%",fontSize:"15px",fontWeight:"bold"}}><Checkbox onChange={this.onChange} checked={checked}></Checkbox><span style={{marginLeft:"10px"}}>我已读并同意了此承诺书</span><span style={{color:"#2D2DFF",fontSize:"20px",cursor:"pointer"}} onClick={()=>{this.windowopen()}}>《承诺书协议》</span></span><br/><br/>
-              <span style={{marginLeft:"39%",marginTop:"10px"}}><Button type="danger" onClick={()=>{this.handleRedirect(2)}}>申请回避</Button><Button style={{marginLeft:"30px"}} type="danger" onClick={()=>{this.handleRedirect(1)}}>确定</Button></span>
-              </div>
+              <div style={{display: 'flex',justifyContent:'center'}}><span style={{fontSize:"14px",fontWeight:"bold",marginTop: 16}}><Checkbox onChange={this.onChange} checked={checked}></Checkbox><span style={{marginLeft:"8px"}}>我已读并同意了此承诺书</span><span style={{color:"#b30000",fontSize:"14px",cursor:"pointer"}} onClick={()=>{this.windowopen()}}>《承诺书协议》</span></span></div>
+              <div style={{display: 'flex',justifyContent:'center'}}><span style={{marginTop:"16px"}}><Button type="primary" onClick={()=>{this.handleRedirect(1)}}>确定</Button><Button style={{marginLeft: 8}} type="primary" onClick={()=>{this.handleRedirect(2)}}>申请回避</Button></span></div>
+              </Card>
+              )
     }
     return <>
+      {/* <Button onClick={() => {
+        sessionStorage.setItem('projectData',JSON.stringify(data))
+        sessionStorage.setItem('roomId',data.id)
+        this.setState({visible: true})
+      }}>进入评审室</Button> */}
     {bookflag?
-    <Card title="评审室">
+    <Card title={`${sectionType}室`} bodyStyle={{ padding: '24px 24px 0px' }} style={{ borderRadius: 6 }}>
     <Table
       loading={JurylistLoading}
-      columns={this.columns}
+      size='small'
+      columns={columns}
       dataSource={JuryList!="" && JuryList.records}
       pagination={pagination}
-      bordered
     /></Card>:
     renderBookt()}
     <div className="zry">
@@ -321,18 +366,16 @@ class Jury extends PureComponent {
         onCancel={()=>{this.onRateOut()}}
         onOk={()=>{this.onRe2ndPageOut()}}
         // title="信息确认"
-        heade
         visible={ratevisible}
-        style={{width:"55%"}}
+        width={500}
       >
         <Form
           ref={formRef}
-          labelCol={{ span: 5 }}
+          labelCol={{ span: 6 }}
           wrapperCol={{ span: 13 }}
           preserve={false}
       >
-      <span className="zul">专家信息确认</span>
-      <div className="divider"></div>
+      <h3 className="first-title">专家信息确认</h3>
       <FormItem
                 label="姓名"
                 initialValue={JuryInfo!="" && JuryInfo.name}
@@ -343,42 +386,45 @@ class Jury extends PureComponent {
                     message: '请输入姓名',
                   },
                 ]}
-      ><Input placeholder="请输入姓名" disabled={this.state.display}/></FormItem>
+      ><Input placeholder="请输入姓名" readOnly={this.state.display} bordered={!this.state.display}/></FormItem>
       <FormItem
               label="电话"
-              initialValue={JuryInfo!="" && JuryInfo.phone}
-              name="phone"
+              initialValue={JuryInfo!="" && JuryInfo.mobile}
+              name="mobile"
               rules={[
                 {
                   required: !this.state.display,
                   message: '请输入电话',
                 },
+                {
+                  pattern: /(^[1][3,4,5,6,7,8,9][0-9]{9}$)|(^(([0\+]\d{2,3}-)?(0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$)/,
+                  message: '输入的电话号码不正确',
+                },
               ]}
-      ><Input placeholder="请输入电话" disabled={this.state.display}/></FormItem>
+      ><Input placeholder="请输入电话" readOnly={this.state.display} bordered={!this.state.display}/></FormItem>
       <FormItem
               label="身份证号"
               initialValue={JuryInfo!="" && JuryInfo.certificate}
               name="certificate"
-              rules={[
-                {
-                  required: !this.state.display,
-                  message: '请输入身份证号',
-                },
-              ]}
-      ><Input placeholder="请输入身份证号" disabled/></FormItem>
-      <span className="zul">评标室校验码</span>
-        <div className="divider"></div>
+      ><Input placeholder="请输入身份证号" readOnly bordered={false}/></FormItem>
+      <h3 className="first-title">{sectionType}室校验码</h3>
         <FormItem label="校验码" {...formItemLayout} name="verificationCode"
         rules={[
           {
             required: true,
             message: '请输入校验码',
-          }
+          },
+          {
+            pattern: /^[0-9]\d*$/,
+            message: '校验码必须是数字',
+          },
         ]}>
-        <Input placeholder="请输入校验码"/></FormItem>
+        <Input placeholder="请输入校验码" maxLength={6}/></FormItem>
       </Form>
       </Modal>
       </div>
+      {/* <ExpertEnter recordData={data} modalVisible={this.state.visible} onCancel={() => this.setState({visible: false})}/> */}
+      <CommitmentModal modalVisible={this.state.commitmentVisible} onCancel={() => this.setState({commitmentVisible: false})}/>
     </>
   }
 }