From 689b7c2cd5f29827af6b63e83bd872f85633dfa2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Aug 2022 17:20:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=A0=E9=80=92organizationId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Finance/Cost/index.tsx | 8 ++++++++ src/pages/Invoice/Supplier/index.tsx | 7 +++++++ .../components/ProjectDocumentation.tsx | 9 ++++++++- .../components/PurchasingManagerEnquiries.tsx | 9 ++++++++- src/pages/Tender/ProjectsInvolved/index.tsx | 9 ++++++++- .../InvitationLetter/components/InvitationLetter.tsx | 9 ++++++++- .../components/LookingForBusinessOpportunitiesList.tsx | 9 ++++++++- 7 files changed, 55 insertions(+), 5 deletions(-) diff --git a/src/pages/Finance/Cost/index.tsx b/src/pages/Finance/Cost/index.tsx index ca47d02..4c8d0ac 100644 --- a/src/pages/Finance/Cost/index.tsx +++ b/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', diff --git a/src/pages/Invoice/Supplier/index.tsx b/src/pages/Invoice/Supplier/index.tsx index 7d0ca1c..f674a16 100644 --- a/src/pages/Invoice/Supplier/index.tsx +++ b/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', diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx index d0c6180..e1853e2 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx +++ b/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', diff --git a/src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx b/src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx index e77e65a..e026051 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/PurchasingManagerEnquiries/components/PurchasingManagerEnquiries.tsx +++ b/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', diff --git a/src/pages/Tender/ProjectsInvolved/index.tsx b/src/pages/Tender/ProjectsInvolved/index.tsx index 82d0c71..f0be672 100644 --- a/src/pages/Tender/ProjectsInvolved/index.tsx +++ b/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', diff --git a/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx b/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx index ec2659b..eafd51f 100644 --- a/src/pages/Tender/supplier/InvitationLetter/components/InvitationLetter.tsx +++ b/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', diff --git a/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx b/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx index d921dc0..0eee7e3 100644 --- a/src/pages/Tender/supplier/LookingForBusinessOpportunities/components/LookingForBusinessOpportunitiesList.tsx +++ b/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', From bdfba9303416edc3157e84c9c8df85f57d46906d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 31 Aug 2022 15:50:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E5=85=B3?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.UAT.ts | 2 +- config/config.prod.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.UAT.ts b/config/config.UAT.ts index 6c4715d..19ebc69 100644 --- a/config/config.UAT.ts +++ b/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', diff --git a/config/config.prod.ts b/config/config.prod.ts index 3d5b387..01af4bb 100644 --- a/config/config.prod.ts +++ b/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: 'http://uscm.unicom.local:18022/auth/oauth/authorize?response_type=code', //智慧客服client_id REACT_APP_CUSTOMERSERVICE_CLIENT_ID: 'COsHJydx', From d540997dfece8f66743da7df3e2917c9b4cd79d4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 31 Aug 2022 15:52:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=81=A2=E5=A4=8Dpackage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 80c5bc5..f0fac4b 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { - "start-dev": "cross-env UMI_UI=none UMI_ENV=dev LOGIN_PATH=login umi dev --port=3000", - "start-UAT": "cross-env UMI_UI=none UMI_ENV=UAT LOGIN_PATH=login umi dev --port=3000", - "start-sim": "cross-env UMI_UI=none UMI_ENV=sim LOGIN_PATH=login umi dev --port=3000", - "start-prod": "cross-env UMI_UI=none UMI_ENV=prod LOGIN_PATH=prod/login umi dev --port=3000", - "build-dev": "cross-env UMI_ENV=dev LOGIN_PATH=login umi build", - "build-UAT": "cross-env UMI_ENV=UAT LOGIN_PATH=login umi build", - "build-sim": "cross-env UMI_ENV=sim LOGIN_PATH=login umi build", - "build-prod": "cross-env UMI_ENV=prod LOGIN_PATH=prod/login umi build", + "start-dev": "cross-env UMI_UI=none UMI_ENV=dev LOGIN_PATH=ebtp-frontend umi dev --port=3000", + "start-UAT": "cross-env UMI_UI=none UMI_ENV=UAT LOGIN_PATH=ebtp-frontend umi dev --port=3000", + "start-sim": "cross-env UMI_UI=none UMI_ENV=sim LOGIN_PATH=ebtp-frontend umi dev --port=3000", + "start-prod": "cross-env UMI_UI=none UMI_ENV=prod LOGIN_PATH=prod/ebtp-frontend umi dev --port=3000", + "build-dev": "cross-env UMI_ENV=dev LOGIN_PATH=ebtp-frontend umi build", + "build-UAT": "cross-env UMI_ENV=UAT LOGIN_PATH=ebtp-frontend umi build", + "build-sim": "cross-env UMI_ENV=sim LOGIN_PATH=ebtp-frontend umi build", + "build-prod": "cross-env UMI_ENV=prod LOGIN_PATH=prod/ebtp-frontend umi build", "analyze": "cross-env ANALYZE=1 umi build", "build": "umi build", "deploy": "npm run site && npm run gh-pages", From 96d740605593f5dde9054a375fcb7b7529812f90 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Sep 2022 10:47:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BD=91=E5=85=B3?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.prod.ts b/config/config.prod.ts index 01af4bb..a3545df 100644 --- a/config/config.prod.ts +++ b/config/config.prod.ts @@ -22,7 +22,7 @@ export default defineConfig({ //询价-查看报价详情-虚拟用户uid REACT_APP_XUNJIA_UID: 'admin_entrance', //智慧客服用户中心地址 - REACT_APP_CUSTOMERSERVICE_USERCENTER: 'http://uscm.unicom.local:18022/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',