Merge branch 'master' of https://10.60.166.105:52302/coscoshipping/fe_service_ebtp_frontend

src/pages/BidEvaluation/Jury.js

@@ -226,7 +226,6 @@ class Jury extends PureComponent {
           // 再跳转
           if(txt==1){
             // sessionStorage.setItem("roomId",record.id)
-            // this.props.dispatch(routerRedux.push('/ProjectLayout/EvaRoom'))
             // history.push('/EvaRoom')
             window.open('/EvaRoom/Eva')
           }else{

src/pages/BidEvaluation/manager.js

@@ -7,7 +7,6 @@ import { getDictBidMethodDict, getProMethod, getRoomId, getDefId, getQuotationMe
 import { saveLeaderId, getJuryData, checkOpenBidSupplier, getPackageList, createReviewRoom, closingReviewRoom } from './components/service';
 import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getProId, getProSignDict } from '@/utils/session';
 import ReviewDevided from '@/pages/BidEvaluation/components/ReviewDevided';
 import CreateReviewRoom from '@/pages/BidEvaluation/components/CreateReviewRoom';
@@ -68,7 +67,6 @@ class manager extends PureComponent {
     sessionStorage.setItem("roomId", record.id)
     this.savePageAndParams();
     history.push(`/ProjectLayout/FlowConfig`)
-    // this.props.dispatch()
   }
   //查询评审室列表
   getManagerList = (params) => {
@@ -126,7 +124,6 @@ class manager extends PureComponent {
     sessionStorage.setItem("openTime", record.openTime)
     this.setState({ loading: true })
     await getQuotationMethodById(record.id)
-    // this.props.dispatch(routerRedux.push('/ProjectLayout/EvaRoom'))
     this.setState({ loading: false })
     window.open(`/EvaRoom`)
   }
@@ -134,7 +131,6 @@ class manager extends PureComponent {
   onJurySet = (record) => {
     this.savePageAndParams();
     history.push({ pathname: '/ProjectLayout/JudgingPanel', state: { roomId: record.id, secId: record.sectionId, openTime: record.openTime } });
-    // this.props.dispatch(routerRedux.push(`/ProjectLayout/JudgingPanel?roomId=${record.id}&secId=${record.sectionId}&openTime=${record.openTime}`));
   }
   //创建评审室
   onCreateClick = async () => {
@@ -429,8 +425,7 @@ class manager extends PureComponent {
   }
   // 跳转组建评委会
   onRedirectRate = () => {
-    // this.props.dispatch(history.push('/JudgingPanel/list'))
-    history.push(`/JudgingPanel/list`)
+    history.push('/JudgingPanel/list')
   }
 
   render() {

src/pages/BidEvaluation/supplier.js

@@ -3,7 +3,6 @@ import { Divider, Button, Form, Card, Tabs, Table, Tooltip, Input, Select, Row,
 import './index.less';
 import { connect } from "dva";
 import { getProId, getProMethod, getDefId, getQuotationMethodById, getSessionUserData } from '@/utils/session';
-// import { routerRedux } from 'dva/router';
 import { getURLInformation } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 import { getMaxTurnSortSupplier } from './components/service';
@@ -72,7 +71,6 @@ class supplier extends PureComponent {
       sessionStorage.setItem("isBxOneSecondCustom", "0")
     }
     this.setState({ loading: false })
-    // this.props.dispatch(routerRedux.push('/ProjectLayout/EvaRoom'))
     window.open('/EvaRoom')
   }
   render() {

src/pages/ElecEvaluation/ManuPlatformManage/index.tsx

@@ -2,7 +2,7 @@ import { isNotEmpty } from '@/utils/CommonUtils';
 import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import { Button, Spin, message, Popconfirm } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import ManuPlatformModal from './modal/ManuPlatformModal';
 import { getManuPlatformList, deleteManuPlatformInfo } from './service';
 
@@ -15,7 +15,7 @@ const ManuPlatformModalManage: React.FC<{}> = () => {
     const [spin, spinSet] = useState<boolean>(false);
     const [visible, setVisible] = useState<boolean>(false);
     const manuPlatformInfo = useRef<any>();
-    // const history = useHistory();
+     
     const manuPlatformModalRef = useRef<any>(null);
     //编辑
     const editManuPlatform = (record: any) => {

src/pages/ElecEvaluation/PlaceAreasManage/components/Areas.tsx

@@ -3,7 +3,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, Spin, message, Popconfirm } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import AreasModal from './modal/AreasModal';
 import { getAreasPage, deleteAreasInfo } from '../service';
 
@@ -21,7 +21,7 @@ const AreasManage: React.FC<{}> = () => {
         pageNo: 1,
         pageSize: 10
     });
-    // const history = useHistory();
+     
     const areasModalRef = useRef<any>(null);
     //编辑
     const editAreas = (record: any) => {

src/pages/ElecEvaluation/PlaceAreasManage/components/Place.tsx

@@ -3,7 +3,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, Spin, message, Popconfirm } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import PlaceModal from './modal/PlaceModal';
 import { getPlacePage, deletePlaceInfo } from '../service';
 import PcaSelect from './PcaSelect';
@@ -44,7 +44,7 @@ const PlaceManage: React.FC<{}> = () => {
         pageNo: 1,
         pageSize: 10
     });
-    // const history = useHistory();
+     
     const placeModalRef = useRef<any>(null);
     //编辑
     const editPlace = (record: any) => {

src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx

@@ -3,7 +3,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, Spin, message } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import ViewModal from '../../ViewModal';
 import { getPage } from '../../service';
 import { btnAuthority } from '@/utils/authority';
@@ -20,7 +20,7 @@ const OnlineSupervision: React.FC<{}> = () => {
         pageNo: 1,
         pageSize: 10
     });
-    // const history = useHistory();
+     
     const viewModalRef = useRef(null);
     //查看详情
     const viewDetails = (record: any) => {

src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx

@@ -3,7 +3,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, Spin } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import ViewModal from '../../ViewModal';
 import { getPage } from '../../service';
 import { btnAuthority } from '@/utils/authority';
@@ -21,7 +21,7 @@ const ReservedItems: React.FC<{}> = () => {
         pageNo: 1,
         pageSize: 10
     });
-    // const history = useHistory();
+     
     const viewModalRef = useRef(null);
 
     //查看详情

src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx

@@ -3,7 +3,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, Spin, message, Card } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import ViewModal from '../ViewModal';
 import { getPage } from '../service';
 import { btnAuthority } from '@/utils/authority';
@@ -20,7 +20,7 @@ const PostSupervision: React.FC<{}> = () => {
         pageNo: 1,
         pageSize: 10
     });
-    // const history = useHistory();
+     
     const viewModalRef = useRef(null);
 
     //查看详情

src/pages/Evaluation/BaseInf/index.tsx

@@ -6,7 +6,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table';
 import ReviewDevided from '@/pages/BidEvaluation/components/ReviewDevided';
 import { getRoomDataById } from '@/services/common';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
-
+import '@/assets/zjl_style.less'
 /**
  * 评审室内页-基本信息
  * @author wuxianhui

src/pages/Evaluation/BidDetailed/BidDetailedManager/BPR.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Pagination,Spin} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';
 

src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts

@@ -13,6 +13,13 @@ export async function getTabList(params: any) { // tab
     params
   });
 }
+// 预打分页面专有
+export async function getPreScoreTabList(params: any) { // tab
+  return request('/api/biz-service-ebtp-rsms/v1/eval/manager/findCategoryTabList', {
+    method: 'get',
+    params
+  });
+}
 
 // export async function getProgress(data: any) { // 我的进度
 //   return request('/v1/bid/eval/detail/evalProgress', {
@@ -41,6 +48,13 @@ export async function getScoreDetail(data: any) { // 评分数据
     data: data
   });
 }
+// 预打分页面专有
+export async function getPreScoreScoreDetail(data: any) { // 评分数据
+  return request('/api/biz-service-ebtp-rsms/v1/eval/manager/findReviewConfig', {
+    method: 'post',
+    data: data
+  });
+}
 
 export async function getRegister(params: any) { // 供应商动态列头
   return request('/api/biz-service-ebtp-rsms/v1/bid/eval/detail/findRegister', {
@@ -48,6 +62,13 @@ export async function getRegister(params: any) { // 供应商动态列头
     params
   });
 }
+// 预打分页面专有
+export async function getPreScoreRegister(params: any) { // 供应商动态列头
+  return request('/api/biz-service-ebtp-rsms/v1/eval/manager/findRegister', {
+    method: 'get',
+    params
+  });
+}
 
 // export async function submitDetail(data: any) { // 保存
 //   return request('/v1/bid/eval/detail', {
@@ -62,6 +83,13 @@ export async function submitDetail(data: any) { // 保存
     data: data
   });
 }
+// 预打分页面专有
+export async function getPreScoreSubmitDetail(data: any) { // 保存
+  return request('/api/biz-service-ebtp-rsms/v1/eval/manager/save', {
+    method: 'post',
+    data: data
+  });
+}
 
 // export async function updateJudgesStatus(data: any) { // 提交
 //   return request('/v1/bid/eval/summary/insertDeviatedWarn', {
@@ -132,6 +160,14 @@ export async function saveOffer(data: any) { // 自动报价保存
   });
 }
 
+// 预打分页面专有
+export async function getPreScoreSaveOffer(data: any) { // 自动报价保存
+  return request('/api/biz-service-ebtp-rsms/v1/eval/manager/save', {
+    method: 'post',
+    data: data
+  });
+}
+
 /**
  * 查询已报名的供应商
  * @param params 

src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/BPM.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Spin,Pagination} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';
 import { CheckOutlined, CloseOutlined } from '@ant-design/icons';

src/pages/MainPage/ProjectManager/Jury.js

@@ -4,7 +4,6 @@ import { history } from '@umijs/max';
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { jurySaveInfo, getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/disposalManager.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { auctionFollowUpAProjectManager, getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/index.less

@@ -87,6 +87,9 @@
       border-radius: 4px;
     }
   }
+  .cardtre {
+    height: 100%;
+  }
 }
 .topt::-webkit-scrollbar {
   width: 8px;

src/pages/MainPage/ProjectManager/manager.js

@@ -5,7 +5,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { followUpAProjectManager, getSessionUserData  } from '@/utils/session';

src/pages/MainPage/ProjectManager/managerAdmin.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/managerSubAdmin.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/participants.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/purchaseManager.js

@@ -20,7 +20,6 @@ import {
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { followUpAProjectManager, getRA, getSessionUserData } from '@/utils/session';

src/pages/MainPage/ProjectManager/supplier.js

@@ -5,7 +5,6 @@ import { history } from '@umijs/max';
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { followUpAProjectSupplier, getSessionUserData,  getRA } from '@/utils/session';

src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx

@@ -4,7 +4,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, Spin } from 'antd';
 import React, { useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import { getPage } from '../service';
 
 interface ProjectManageProps {
@@ -35,7 +35,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
     const procurementTypeEntrust = 'procurement_type=entrust';
     //采购方式
     const procurementModeEntrust = 'procurement_mode=entrust';
-    // const history = useHistory();
+     
 
     const columns: ProColumns<any>[] = [
         {

src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { queryingPagingData } from '@/utils/PageUtils';
 import { getDictNameByVal, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, multipleTypeTransform, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import { followUpAProjectManager, getDicData, projectDataItem, getSessionUserData } from '@/utils/session';
 import ExceptionHandling from './ExceptionHandling/ExceptionHandling';
 import { Button, Card, Col, Popover, Progress, Row, Tag, message } from 'antd';
@@ -37,7 +37,7 @@ const ProjectDocumentation: React.FC = () => {
   //获取字典
   const getDict: any = getDicData();
   const dictData = JSON.parse(getDict);
-  // const history = useHistory();
+   
   /**
    * proList信息
    */

src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx

@@ -14,7 +14,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, Card, PageHeader } from 'antd';
 import React, { useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import kefu from '@/assets/img/kefu.png'  //智慧客服
 import { submitHiddenForm, createHiddenForm } from '@/utils/CustomerService' //智慧客服
 const PurchasingManagerEnquiries: React.FC = () => {
@@ -30,7 +30,7 @@ const PurchasingManagerEnquiries: React.FC = () => {
   const procurementTypeEntrust = 'procurement_type=entrust';
   //采购方式
   const procurementModeEntrust = 'procurement_mode=entrust';
-  // const history = useHistory();
+   
   const columns: ProColumns<any>[] = [
     {
       title: '序号',

src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx

@@ -4,7 +4,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, message, Popconfirm, Spin, Space, Tag } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import { getFavoritesList, removePublic, toPublic, updateReadStatus } from '../service';
 
 interface FavoritesListProps {
@@ -43,7 +43,7 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
     const [selectedRows, setSelectedRows] = useState<any[]>([]);
 
 
-    // const history = useHistory();
+     
     const ref = useRef<ActionType>();
     const columns: ProColumns<any>[] = [
         {

src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx

@@ -4,7 +4,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import tableProps from '@/utils/tableProps';
 import { Button, message, Space, Spin, Tag } from 'antd';
 import React, { useRef, useState } from 'react';
-import { useHistory } from '@umijs/max';
+import { history } from '@umijs/max';
 import { getPage, removePublic, toPublic } from '../service';
 
 interface ProjectManageProps {
@@ -42,7 +42,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
     //选中
     const [selectedRows, setSelectedRows] = useState<any[]>([]);
 
-    // const history = useHistory();
+     
     const ref = useRef<ActionType>();
     const columns: ProColumns<any>[] = [
 

src/pages/ZBiXuan/EvaluationRoom/Config/FirstLimited/service.ts

@@ -23,4 +23,10 @@ export async function getParentConfig(params:any) {
   });
 };
 
+// 预打分检查
+export async function requestCheckPreScore(params:any) {
+  return request(`/api/biz-service-ebtp-resps/v1/tdoc/validTdocEndDateByRoomId?roomId=${params.roomId}`,{
+    method: 'POST',
+  });
+};
 

src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/BPR.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Pagination,Spin} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';
 

src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/BPR.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Pagination,Spin} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';