diff --git a/src/pages/MainPage/ProjectManager/Jury.js b/src/pages/MainPage/ProjectManager/Jury.js
index 70804b7..5c3e37a 100644
--- a/src/pages/MainPage/ProjectManager/Jury.js
+++ b/src/pages/MainPage/ProjectManager/Jury.js
@@ -7,7 +7,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { jurySaveInfo, getSessionUserData } from '@/utils/session';
+import { jurySaveInfo, getSessionUserData, getRA } from '@/utils/session';
import NoticeDetail from '@/pages/notice/noticeList/components/NoticeDetail'
import ExpertEnter from '@/pages/BidEvaluation/components/ExpertEnter';
import ChatUI from '@/pages/customerservice/support/conversation' //智慧客服
@@ -35,6 +35,7 @@ class Jury extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
}
componentDidMount() {
this.props.dispatch({
@@ -60,6 +61,8 @@ class Jury extends PureComponent {
}
//智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -123,7 +126,7 @@ class Jury extends PureComponent {
}
}
render() {
- const { datevalue, detailId, noticeDetail, recordData, enterVisible, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash} = this.state; //智慧客服state
+ const { datevalue, detailId, noticeDetail, recordData, enterVisible, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds} = this.state; //智慧客服state
const { Juryuplist, Jurydownlist, staloading, tlist } = this.props;
return (
<>
@@ -231,6 +234,7 @@ class Jury extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isModalVisible: false})
diff --git a/src/pages/MainPage/ProjectManager/disposalManager.js b/src/pages/MainPage/ProjectManager/disposalManager.js
index f604d59..ed1d976 100644
--- a/src/pages/MainPage/ProjectManager/disposalManager.js
+++ b/src/pages/MainPage/ProjectManager/disposalManager.js
@@ -7,7 +7,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { auctionFollowUpAProjectManager, getSessionUserData } from '@/utils/session';
+import { auctionFollowUpAProjectManager, getSessionUserData, getRA } from '@/utils/session';
import { getDefId } from './service';
import { getURLInformation } from '@/utils/CommonUtils';
import MessageDetail from '@/pages/SystemMessage/message/components/messageDetail'
@@ -40,6 +40,7 @@ class manager extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
}
componentDidMount() {
this.props.dispatch({
@@ -69,6 +70,8 @@ class manager extends PureComponent {
}
//<<<<<<智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -147,7 +150,7 @@ class manager extends PureComponent {
};
render() {
const { projectlist, staloading, tlist, trelist, pagelist, disposalList } = this.props;
- const { datevalue, messId, messageDetail, detailId, noticeDetail, questData, questVisible, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash} = this.state; //智慧客服state
+ const { datevalue, messId, messageDetail, detailId, noticeDetail, questData, questVisible, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds} = this.state; //智慧客服state
return (
<>
this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶
@@ -251,6 +254,7 @@ class manager extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isModalVisible: false})
diff --git a/src/pages/MainPage/ProjectManager/manager.js b/src/pages/MainPage/ProjectManager/manager.js
index acefa06..54e278d 100644
--- a/src/pages/MainPage/ProjectManager/manager.js
+++ b/src/pages/MainPage/ProjectManager/manager.js
@@ -8,7 +8,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { followUpAProjectManager, getSessionUserData } from '@/utils/session';
+import { followUpAProjectManager, getSessionUserData, getRA } from '@/utils/session';
import { getDefId } from './service';
import { getURLInformation } from '@/utils/CommonUtils';
import MessageDetail from '@/pages/SystemMessage/message/components/messageDetail'
@@ -43,6 +43,7 @@ class manager extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
// NTKF_PARAM: {
// siteid: "bl_1000", //企业ID,,为固定值
// settingid: "bl_1000_1492484340268", //接待组ID,为固定值,必填
@@ -84,6 +85,8 @@ class manager extends PureComponent {
}
//智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -178,7 +181,7 @@ class manager extends PureComponent {
};
render() {
const { downlist, projectlist, staloading, tlist, trelist, idList, dateNum } = this.props;
- const { datevalue, messId, messageDetail, detailId, noticeDetail, questData, questVisible, mainDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash} = this.state; //智慧客服state
+ const { datevalue, messId, messageDetail, detailId, noticeDetail, questData, questVisible, mainDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds} = this.state; //智慧客服state
return (
<>
this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶
@@ -340,6 +343,7 @@ class manager extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isModalVisible: false})
diff --git a/src/pages/MainPage/ProjectManager/managerAdmin.js b/src/pages/MainPage/ProjectManager/managerAdmin.js
index c1274b4..c33d1de 100644
--- a/src/pages/MainPage/ProjectManager/managerAdmin.js
+++ b/src/pages/MainPage/ProjectManager/managerAdmin.js
@@ -7,7 +7,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { getSessionUserData } from '@/utils/session';
+import { getSessionUserData, getRA } from '@/utils/session';
import { getURLInformation } from '@/utils/CommonUtils';
import NoticeDetail from '@/pages/notice/noticeList/components/NoticeDetail'
import ChatUI from '@/pages/customerservice/support/conversation' //智慧客服
@@ -29,6 +29,7 @@ class manager extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
}
componentDidMount() {
this.props.dispatch({
@@ -46,6 +47,8 @@ class manager extends PureComponent {
}
//智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -74,7 +77,7 @@ class manager extends PureComponent {
}
render() {
const { tlist, trelist } = this.props;
- const { detailId, noticeDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash } = this.state; //智慧客服state
+ const { detailId, noticeDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds } = this.state; //智慧客服state
return (
<>
this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶
@@ -125,6 +128,7 @@ class manager extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isModalVisible: false})
diff --git a/src/pages/MainPage/ProjectManager/managerSubAdmin.js b/src/pages/MainPage/ProjectManager/managerSubAdmin.js
index 8728fd1..eb9568c 100644
--- a/src/pages/MainPage/ProjectManager/managerSubAdmin.js
+++ b/src/pages/MainPage/ProjectManager/managerSubAdmin.js
@@ -7,7 +7,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { getSessionUserData } from '@/utils/session';
+import { getSessionUserData, getRA } from '@/utils/session';
import { getURLInformation } from '@/utils/CommonUtils';
import NoticeDetail from '@/pages/notice/noticeList/components/NoticeDetail'
import ChatUI from '@/pages/customerservice/support/conversation' //智慧客服
@@ -28,6 +28,7 @@ class manager extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
}
componentDidMount() {
this.props.dispatch({
@@ -45,6 +46,8 @@ class manager extends PureComponent {
}
//智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -73,7 +76,7 @@ class manager extends PureComponent {
}
render() {
const { tlist, trelist } = this.props;
- const { detailId, noticeDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash} = this.state; //智慧客服state
+ const { detailId, noticeDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds} = this.state; //智慧客服state
return (
<>
this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶
@@ -124,6 +127,7 @@ class manager extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isModalVisible: false})
diff --git a/src/pages/MainPage/ProjectManager/participants.js b/src/pages/MainPage/ProjectManager/participants.js
index 91b3a3f..94fc24b 100644
--- a/src/pages/MainPage/ProjectManager/participants.js
+++ b/src/pages/MainPage/ProjectManager/participants.js
@@ -7,7 +7,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { getSessionUserData } from '@/utils/session';
+import { getSessionUserData, getRA } from '@/utils/session';
import { getDefId } from './service';
import { getURLInformation } from '@/utils/CommonUtils';
import MessageDetail from '@/pages/SystemMessage/message/components/messageDetail'
@@ -47,6 +47,7 @@ class manager extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
}
componentDidMount() {
this.props.dispatch({
@@ -76,6 +77,8 @@ class manager extends PureComponent {
}
//智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -169,7 +172,7 @@ class manager extends PureComponent {
}
render() {
const { projectlist, staloading, tlist, trelist, shotList, Participants } = this.props;
- const { datevalue, messId, messageDetail, detailId, noticeDetail, noticeModalVis, projectId, isModalVisible, tpid, questData, questVisible, isChatModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash} = this.state; //智慧客服state
+ const { datevalue, messId, messageDetail, detailId, noticeDetail, noticeModalVis, projectId, isModalVisible, tpid, questData, questVisible, isChatModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds} = this.state; //智慧客服state
return (
<>
this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶
@@ -292,6 +295,7 @@ class manager extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isChatModalVisible: false})
diff --git a/src/pages/MainPage/ProjectManager/purchaseManager.js b/src/pages/MainPage/ProjectManager/purchaseManager.js
index 6eb1e27..a7fc57f 100644
--- a/src/pages/MainPage/ProjectManager/purchaseManager.js
+++ b/src/pages/MainPage/ProjectManager/purchaseManager.js
@@ -8,7 +8,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { followUpAProjectManager, getSessionUserData } from '@/utils/session';
+import { followUpAProjectManager, getSessionUserData, getRA } from '@/utils/session';
import { getDefId } from './service';
import { getURLInformation } from '@/utils/CommonUtils';
import MessageDetail from '@/pages/SystemMessage/message/components/messageDetail'
@@ -43,6 +43,7 @@ class manager extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
}
componentDidMount() {
this.props.dispatch({
@@ -76,6 +77,8 @@ class manager extends PureComponent {
}
//智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -159,7 +162,7 @@ class manager extends PureComponent {
}
render() {
const { downlist, projectlist, staloading, tlist, trelist, idList, dateNum } = this.props;
- const { datevalue, messId, messageDetail, detailId, noticeDetail, questData, questVisible, mainDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash} = this.state; //智慧客服state
+ const { datevalue, messId, messageDetail, detailId, noticeDetail, questData, questVisible, mainDetail, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds} = this.state; //智慧客服state
return (
<>
this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶
@@ -315,6 +318,7 @@ class manager extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isModalVisible: false})
diff --git a/src/pages/MainPage/ProjectManager/supplier.js b/src/pages/MainPage/ProjectManager/supplier.js
index 83b15d5..54afe53 100644
--- a/src/pages/MainPage/ProjectManager/supplier.js
+++ b/src/pages/MainPage/ProjectManager/supplier.js
@@ -8,7 +8,7 @@ import talkPng from '@/images/talk/talk.png';
import { routerRedux } from 'dva/router';
import { RightOutlined } from '@ant-design/icons';
import moment from 'moment';
-import { followUpAProjectSupplier, getSessionUserData } from '@/utils/session';
+import { followUpAProjectSupplier, getSessionUserData, getRA } from '@/utils/session';
import { getDefId } from './service';
import { getURLInformation } from '@/utils/CommonUtils';
import MainDetail from '@/pages/SystemMessage/message/components/pageDetail'
@@ -50,6 +50,7 @@ class supplier extends PureComponent {
staffName:'', //智慧客服
kfType:0,//智慧客服
questionType:0,//智慧客服
+ roleIds:'',//智慧客服
}
componentDidMount() {
const paramst = {
@@ -95,6 +96,8 @@ class supplier extends PureComponent {
}
//智慧客服,获取供应商编码
let userData = getSessionUserData()
+ let roleAuthority = getRA()
+ this.setState({roleIds: roleAuthority && roleAuthority.length>0? roleAuthority[0]: userData.roleIds})
this.setState({staffId: userData.userId})
this.setState({staffName: userData.fullName})
this.setState({supplierNumber: userData.organizationId})
@@ -207,7 +210,7 @@ class supplier extends PureComponent {
}
render() {
const { supplieruplist, supplierleftlist, supplierrightlist, staloading, tlist, trelist, idList, dateNum } = this.props;
- const { datevalue, messId, messageDetail, mainDetail, detailId, noticeDetail, joinData, joinDetail, invitationData, invitationDetail, questData, questVisible, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash} = this.state; //智慧客服state
+ const { datevalue, messId, messageDetail, mainDetail, detailId, noticeDetail, joinData, joinDetail, invitationData, invitationDetail, questData, questVisible, isModalVisible, isCloseWs, optionsModal, projectModal, supplierNumber, staffId, staffName, kfType, questionType, isFlash, roleIds} = this.state; //智慧客服state
return (
<>
this.initChatUI()}>咨询服务︵8:30|12:3013:00|17:00︶
@@ -352,6 +355,7 @@ class supplier extends PureComponent {
staffName={staffName}
supplierNumber={supplierNumber}
isCloseWs={isCloseWs}
+ roleIds={roleIds}
hideWin={()=>{
this.setState({optionsModal: false})
this.setState({isModalVisible: false})