9.7 同步master版本，解决冲突

src/components/Promenu/index.tsx

@@ -9,6 +9,7 @@ import { getReadInfo, menuList, updateReadStatus } from './service/service';
 import { getProName, getSessionRoleData, getProTypeCode, getDefId, getPurchaseCanOperate, getReturnURL, getProId, getProMethod } from '@/utils/session';
 import { Step, StepButton, StepLabel, Stepper, Toolbar, Popover, Typography } from '@material-ui/core';
 import { isEmpty } from '@/utils/CommonUtils';
+import { CustomerServiceTwoTone } from '@ant-design/icons';
 
 const useStyles = makeStyles((theme: Theme) => ({
   root: {
@@ -194,6 +195,29 @@ const Promenu: React.FC<{}> = () => {
   const handlePopoverClose = () => {
     setAnchorEl(null);
   };
+  const initChatUI = () => { //智慧客服
+    if(MethodDict!='procurement_mode_6' && MethodDict!='procurement_mode_7' && window.location.pathname.indexOf('BidEvaluation')!=-1){
+      message.warn('非谈判类项目【评标】阶段禁止沟通')
+    }else{
+      var tempForm = document.getElementById('tempForm_CustomerService') as HTMLFormElement
+      if(tempForm){
+        var hideInput = document.getElementById('tempInput_CustomerService') as HTMLInputElement
+        if(hideInput){
+          hideInput.value= window.location.pathname
+        }else{
+          hideInput = document.createElement("input")
+          hideInput.id = 'tempInput_CustomerService'
+          hideInput.type="hidden"
+          hideInput.name= 'sceneUrl'
+          hideInput.value= window.location.pathname
+          tempForm.appendChild(hideInput)
+        }
+        tempForm.submit();
+      }else{
+        message.warn('请先选择跟进的项目')
+      }
+    }
+  }
   return (
     <div key='promenuDiv1' style={{ borderRadius: "6px", overflow: "hidden" }}>
       <div key='promenuDiv2' className="site-page-header-ghost-wrapper" style={{ background: '#ffffff' }}>
@@ -212,6 +236,9 @@ const Promenu: React.FC<{}> = () => {
                 history.push("/ProjectLayout/Archive/projectArchive")
                 setButtonValue(stepButtonClick(data?.[data?.length - 1]))
               }}>项目归档</Button> : null,
+            <Button key="customerservice" onClick={() =>{
+              initChatUI() //智慧客服
+            }} icon={<CustomerServiceTwoTone />}>我要咨询</Button>,
             ((randerRole == 'ebtp-agency-project-manager' || randerRole == 'ebtp-purchase' || randerRole == 'ebtp-supervision') && MethodDict != "procurement_mode_7")
               ? <Button key="manageyiyi" onClick={() => history.push("/Project/ProjectManage/ProjectManager/ObjectionComplaint")}>异议投诉</Button> : null,
             (randerRole == 'ebtp-supplier' && MethodDict != "procurement_mode_7")