Merge branch '20220523-公开比选一阶段二次项目，资格审查合格供应商为一家时可增加自定义流程' of http://gitlab.tianti.tg.unicom.local/eshop/fe_service_ebtp_frontend into 20220309-供应商关联关系疑似违规行为

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)
     //专家算数错误调整判断

src/components/LayLeftMenu/index.tsx

@@ -43,6 +43,8 @@ const Index: React.FC<{}> = () => {
   const [singUserId, singUserIdSet] = useState<any>([]); //评审专家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<{}> = () => {
       }
     </Select >
     const footer = chooseTurn ? { footer: <Button type='primary' onClick={() => closeFc()}>关闭</Button> } : {};
-    
+
     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 (
                       <Menu.Item
                         key={`${item.instTurnSort}${index}MenuItem`}