Merge branch 'master_jnryy_customerservice' into 'release_20220902'

9.2 智慧客服

See merge request eshop/fe_service_ebtp_frontend!278

config/config.UAT.ts

@@ -26,7 +26,7 @@ export default defineConfig({
     // REACT_APP_CUSTOMERSERVICE_WS_REDIRECT: 'ws://10.242.31.158:18022/api/api/biz-customer-service',
 
     //智慧客服用户中心地址
-    REACT_APP_CUSTOMERSERVICE_USERCENTER: 'http://10.242.31.158:8100/auth/oauth/authorize?response_type=code',
+    REACT_APP_CUSTOMERSERVICE_USERCENTER: 'http://10.242.31.158:18022/auth/oauth/authorize?response_type=code',
 
     //智慧客服client_id
     REACT_APP_CUSTOMERSERVICE_CLIENT_ID: 'COsHJydx',

config/config.prod.ts

@@ -22,7 +22,7 @@ export default defineConfig({
     //询价-查看报价详情-虚拟用户uid
     REACT_APP_XUNJIA_UID: 'admin_entrance',
     //智慧客服用户中心地址
-    REACT_APP_CUSTOMERSERVICE_USERCENTER: 'http://10.238.25.112:8100/auth/oauth/authorize?response_type=code',
+    REACT_APP_CUSTOMERSERVICE_USERCENTER: 'https://uscm.chinaunicom.cn:18023/auth/oauth/authorize?response_type=code',
 
     //智慧客服client_id
     REACT_APP_CUSTOMERSERVICE_CLIENT_ID: 'COsHJydx',

src/pages/Finance/Cost/index.tsx

@@ -10,6 +10,7 @@ import { commonMessage } from '@/utils/MessageUtils';
 import moment from 'moment';
 import kefu from '@/assets/img/kefu.png'  //智慧客服
 import {windowOpenChatUI} from '@/utils/CustomerService' //智慧客服
+import { getSessionUserData } from '@/utils/session';
 const dateFormat = 'YYYY-MM-DD';
 
 const finance: React.FC<{}> = () => {
@@ -586,6 +587,7 @@ const finance: React.FC<{}> = () => {
   }
   const initChatUI = (record:any)=>{//智慧客服-创建临时表单
     let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
+    let data = getSessionUserData();
     const inputList = [
       {
         label:null,
@@ -593,6 +595,12 @@ const finance: React.FC<{}> = () => {
         isEncode:false,
         paraVal:'eBid',
       },
+      {
+        label:null,
+        paraName:'organizationId',
+        isEncode:false,
+        paraVal: data.organizationId,
+      },
       {
         label:null,
         paraName:'tenderAgencyId',

src/pages/Invoice/Supplier/index.tsx

@@ -109,6 +109,7 @@ const InvoiceSupplier: React.FC<{}> = () => {
   ];
   const initChatUI = (record:any)=>{//智慧客服-创建临时表单
     let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
+    let data = getSessionUserData();
     const inputList = [
       {
         label:null,
@@ -116,6 +117,12 @@ const InvoiceSupplier: React.FC<{}> = () => {
         isEncode:false,
         paraVal:'eBid',
       },
+      {
+        label:null,
+        paraName:'organizationId',
+        isEncode:false,
+        paraVal: data.organizationId,
+      },
       {
         label:null,
         paraName:'tenderAgencyId',

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

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { queryingPagingData } from '@/utils/PageUtils';
 import { getDictNameByVal, getProjectTypeCode, getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnumOther } from '@/utils/CommonUtils';
 import { useHistory } from 'umi';
-import { followUpAProjectManager, getDicData, projectDataItem } from '@/utils/session';
+import { followUpAProjectManager, getDicData, projectDataItem,  getSessionUserData } from '@/utils/session';
 import ExceptionHandling from './ExceptionHandling/ExceptionHandling';
 import { Button, Card, Col, Popover, Progress, Row, Tag, message } from 'antd';
 import ProList from '@ant-design/pro-list';
@@ -279,6 +279,7 @@ const ProjectDocumentation: React.FC = () => {
    */
    const saveTmpForm = (record:any)=>{//智慧客服-创建临时表单
     let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
+    let data = getSessionUserData();
     const inputList = [
       {
         label:null,
@@ -286,6 +287,12 @@ const ProjectDocumentation: React.FC = () => {
         isEncode:false,
         paraVal:'eBid',
       },
+      {
+        label:null,
+        paraName:'organizationId',
+        isEncode:false,
+        paraVal: data.organizationId,
+      },
       {
         label:'项目名称',
         paraName:'projectName',

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

@@ -9,7 +9,7 @@
 
 import { getURLInformation, getUrlParam, getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
 import { queryingPagingData } from '@/utils/PageUtils';
-import { followUpAProjectManager, getDicData, setPurchaseCanOperate } from '@/utils/session';
+import { followUpAProjectManager, getDicData, setPurchaseCanOperate, getSessionUserData } from '@/utils/session';
 import ProTable, { ProColumns } from '@ant-design/pro-table';
 import { Button, Card, PageHeader } from 'antd';
 import React, { useState } from 'react';
@@ -108,6 +108,7 @@ const PurchasingManagerEnquiries: React.FC = () => {
     ];
     const saveTmpForm = (record:any)=>{//智慧客服-创建临时表单
         let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
+        let data = getSessionUserData();
         const inputList = [
           {
             label:null,
@@ -115,6 +116,12 @@ const PurchasingManagerEnquiries: React.FC = () => {
             isEncode:false,
             paraVal:'eBid',
           },
+          {
+            label:null,
+            paraName:'organizationId',
+            isEncode:false,
+            paraVal: data.organizationId,
+          },
           {
             label:'项目名称',
             paraName:'projectName',

src/pages/Tender/ProjectsInvolved/index.tsx

@@ -3,7 +3,7 @@ import { Button, Tabs, Form, Input, Modal, Checkbox, message, PageHeader, Popcon
 import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import { getSection, exitProject, getProject, getOther, supplierRegister, exitProjectPayCheck } from './service';
 import { getSupplierUser } from '@/utils/SupplierList/service'
-import { getProMethod, } from '@/utils/session';
+import { getProMethod,getSessionUserData } from '@/utils/session';
 import '@/assets/ld_style.less';
 import { history } from 'umi';
 import { followUpAProjectSupplier, getDicData } from '@/utils/session';
@@ -407,6 +407,7 @@ const Index: React.FC<{}> = () => {
   }
   const saveTmpForm = (record:any)=>{//智慧客服-创建临时表单
     let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
+    let data = getSessionUserData();
     const inputList = [
       {
         label:null,
@@ -414,6 +415,12 @@ const Index: React.FC<{}> = () => {
         isEncode:false,
         paraVal:'eBid',
       },
+      {
+        label:null,
+        paraName:'organizationId',
+        isEncode:false,
+        paraVal: data.organizationId,
+      },
       {
         label:'项目名称',
         paraName:'projectName',

src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx

@@ -6,7 +6,7 @@ import { lookingForBussinessResp, participationSave } from '../service';
 import '@/utils/lq.style.less';
 import { downloadAttachmentPath } from '@/utils/DownloadUtils';
 import { getNoticeInfo } from '../../LookingForBusinessOpportunities/service';
-import { getDicData } from '@/utils/session';
+import { getDicData,getSessionUserData } from '@/utils/session';
 import { getBidMethodDictTypeCode, getProjectTypeCode, getURLInformation, isNotEmpty, proTableValueEnum, proTableValueEnumOther } from '@/utils/CommonUtils';
 import Weboffice from "@/pages/webOffice/weboffice";
 import { queryingPagingData } from '@/utils/PageUtils';
@@ -90,6 +90,7 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
     const proTypeCode = getProjectTypeCode();
     const initChatUI = (record:any)=>{//智慧客服-创建临时表单
         let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
+        let data = getSessionUserData();
         const inputList = [
           {
             label:null,
@@ -97,6 +98,12 @@ const LookingForBusinessOpportunitiesList: React.FC = () => {
             isEncode:false,
             paraVal:'eBid',
           },
+          {
+            label:null,
+            paraName:'organizationId',
+            isEncode:false,
+            paraVal: data.organizationId,
+          },
           {
             label:'项目名称',
             paraName:'projectName',

src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx

@@ -11,7 +11,7 @@ import {
 } from '../service';
 import '@/utils/lq.style.less';
 import { downloadAttachmentPath } from '@/utils/DownloadUtils';
-import { getDicData } from '@/utils/session';
+import { getDicData,getSessionUserData } from '@/utils/session';
 import { proTableValueEnum, getURLInformation, isNotEmpty, proTableValueEnumOther, getProjectTypeCode, getBidMethodDictTypeCode, getDictName } from '@/utils/CommonUtils';
 import Weboffice from "@/pages/webOffice/weboffice";
 import { queryingPagingData } from '@/utils/PageUtils';
@@ -110,6 +110,7 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
   }
   const initChatUI = (record:any)=>{//智慧客服-创建临时表单
     let roleAuthority: any | null = sessionStorage.getItem('roleAuthority');
+    let data = getSessionUserData();
     const inputList = [
       {
         label:null,
@@ -117,6 +118,12 @@ const LookingForBusinessOpportunitiesList: React.FC<{}> = () => {
         isEncode:false,
         paraVal:'eBid',
       },
+      {
+        label:null,
+        paraName:'organizationId',
+        isEncode:false,
+        paraVal: data.organizationId,
+      },
       {
         label:'项目名称',
         paraName:'projectName',