diff --git a/src/components/BiddingRoom/index.js b/src/components/BiddingRoom/index.js index 393f814..1566588 100644 --- a/src/components/BiddingRoom/index.js +++ b/src/components/BiddingRoom/index.js @@ -32,6 +32,8 @@ const BiddingRoom = (props) => { const IPassDecode = getIPassDecode(); //获取用户数据 let data = getSessionUserData(); + //获取比选一阶段二次项目,自定义流程,当前供应商 + const isBxOneSecondCustom = sessionStorage.getItem("isBxOneSecondCustom"); //获取评审室id const roomId = getRoomId(); const [list, setList] = useState(); @@ -328,7 +330,7 @@ const BiddingRoom = (props) => { //供应商是否用ipass解密判断 IPassDecode == 0 ? null : supplierList.splice(2, 1) //供应商是否显示评审进展判断(招标类不显示) - isBidProcess ? supplierList.splice(1, 1) : null + isBidProcess && (isBxOneSecondCustom != "1") ? supplierList.splice(1, 1) : null //项目经理澄清说明判断 NoClarification.findIndex(item => item == defId) == -1 ? null : managerList.splice(5, 1) //专家算数错误调整判断 diff --git a/src/components/LayLeftMenu/index.tsx b/src/components/LayLeftMenu/index.tsx index b1a3d1f..ef6e4e5 100644 --- a/src/components/LayLeftMenu/index.tsx +++ b/src/components/LayLeftMenu/index.tsx @@ -43,6 +43,8 @@ const Index: React.FC<{}> = () => { const [singUserId, singUserIdSet] = useState([]); //评审专家id const userId = getSessionUserData().userId; const role = getSessionRoleData().roleCode; + //获取比选一阶段二次项目,自定义流程,当前供应商 + const isBxOneSecondCustom = sessionStorage.getItem("isBxOneSecondCustom"); function showConfirm(mes?: any, confirmFlag?: boolean) { //环节流转提示 mes == '是否开启' ? (mes = mes + instTurnName + '?') : mes; @@ -407,7 +409,7 @@ const Index: React.FC<{}> = () => { } const footer = chooseTurn ? { footer: } : {}; - + const closeFc = async () => { chooseGysSet(false); chooseTurnSet(false); @@ -454,6 +456,7 @@ const Index: React.FC<{}> = () => { selectedKeys={selectedKeysTransfer} onChange={onChange} onSelectChange={onSelectChange} + disabled={isBxOneSecondCustom == "1"} selectAllLabels={[, (info: { selectedCount: number, totalCount: number }) => <> { info.selectedCount != 0 && `${info.selectedCount}/` @@ -555,11 +558,14 @@ const Index: React.FC<{}> = () => { let url = makeUrl(item2.moduleUrl, leader) + `?turnId=${item2.instTurnId}&nodeId=${item2.id}&turnSort=${item2.instTurnSort}`; //报价评审 只有评审分工分到的专家能点 let offerDis = item2.moduleUrl === '/EvaRoom/Eva/BidOffer' && userId != offerUserId; + //是否跳过节点 0-不跳过 1-跳过节点 + let skipStatus = item2.skipStatus == 1; let disabled = item2.status == 3 || item2.moduleUrl == null || item2.moduleUrl == undefined || offerDis || - singDis + singDis || + skipStatus return ( { - this.methodStatus().visible && + (this.methodStatus().visible || (record.bxOneSecondProjectStatus && record.instFlowType == 2)) && - }} + return txt == 0 || txt == 1 ? `准备${sectionType}` : (txt == 2 ? `正在${sectionType}` : (txt == 3 ? `${sectionType}结束` : null)) + } + }, + { + title: '操作', dataIndex: 'operation', width: '10%', + render: (text, record, index) => { + return <> + } + } ] return <> - - - + +
+ } } diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx index e05a753..1846bb3 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx @@ -4,7 +4,7 @@ import '@/assets/ld_style.less'; import { checkShowData, getSupplierScoreData } from '../service'; import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; import { getProMethod, getRoomId } from '@/utils/session'; -import { getURLInformation } from '@/utils/CommonUtils'; +import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils'; import ExtendUpload from '@/utils/ExtendUpload'; import MACAddressPrompt from '@/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt'; @@ -32,6 +32,10 @@ const PreliminarySummary: React.FC = (props) => { const [isShowFoot, setIsShowFoot] = useState(false); //说明文件fileId const [fileId, setFileId] = useState(''); + //比选一阶段二次项目自定义评审流程单选数值存储 + const [processValue, setProcessValue] = useState(); + //是否公开比选一阶段二次项目 + const [isBxOneSecond, setIsBxOneSecond] = useState(false); //每页显示数量常量 const pageSize = 3; const { TextArea } = Input; @@ -55,6 +59,10 @@ const PreliminarySummary: React.FC = (props) => { const radioOnChange = (e: any) => { setRadioValue(e.target.value); }; + //流程单选onChange方法 + const processOnChange = (e: any) => { + setProcessValue(e.target.value); + }; //截取字符串方法 const getCaption = (obj: any) => { var index = obj.lastIndexOf("\-"); @@ -226,13 +234,15 @@ const PreliminarySummary: React.FC = (props) => { }; const getFooterData = () => { - checkShowData(getRoomId()).then(response => { + checkShowData(getRoomId(), getURLInformation('nodeId')).then(response => { if (response?.code == 200) { if (response?.data == undefined) { } else { setIsShowFoot(true) setRadioValue(response.data?.continueStatus) if (response.data?.continueStatus == 1) { setFileId(response.data?.fileId) + setProcessValue(response?.data?.customizeFlowStatus); + setIsBxOneSecond(response?.data?.bxOneSecondProjectStatus); form.setFieldsValue({ remarks: response.data?.remarks }) @@ -283,15 +293,22 @@ const PreliminarySummary: React.FC = (props) => { {isShowFoot ? (
- 合格供应商不足三家,是否继续进行详审: + {(isBxOneSecond && isNotEmpty(processValue)) ? '合格供应商仅一家,是否继续进行' : '合格供应商不足三家,是否继续进行详审'}: 是,继续进行 否,终止评审
+ {isBxOneSecond && isNotEmpty(processValue) &&
+ 是否需自定义评审流程: + + 是,需自定义评审流程 + 否,继续原流程 + +
}