liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20220718-采购经理撤回项目【委托撤回记录】中空白无记录' into 'release_20220812'

Browse Source 
8.12 采购经理撤回项目【委托撤回记录】中空白无记录

See merge request eshop/fe_service_ebtp_frontend!229
This commit is contained in:
周建龙
2022-08-12 17:08:14 +08:00
parent 1ce8396fcf 7076c3d97f
commit 3479f5a430
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pages/Project/EntrustWithdraw/index.tsx
View File

@ -4,7 +4,7 @@ import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
import { proTableValueEnum, returnDictVal } from '@/utils/CommonUtils'; import { proTableValueEnum, returnDictVal } from '@/utils/CommonUtils';
import { getPage, queryEntrust } from './service'; import { getPage, queryEntrust } from './service';
import './styles.less'; import './styles.less';
import { getDicData, getSessionUserData } from '@/utils/session'; import { getDicData, getSessionRoleData, getSessionUserData } from '@/utils/session';
const entrust: React.FC<{}> = () => { const entrust: React.FC<{}> = () => {
const modalHeight = window.innerHeight * 96 / 100; const modalHeight = window.innerHeight * 96 / 100;
@ -20,6 +20,7 @@ const entrust: React.FC<{}> = () => {
const [form] = Form.useForm(); const [form] = Form.useForm();
//人员信息 //人员信息
const userData = getSessionUserData(); const userData = getSessionUserData();
const roleData = getSessionRoleData();
//protable actionRef //protable actionRef
const actionRef = useRef<ActionType>(); const actionRef = useRef<ActionType>();
//显隐 查看及分派弹窗 //显隐 查看及分派弹窗
@ -390,11 +391,11 @@ const entrust: React.FC<{}> = () => {
...params, ...params,
basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize }, basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
} }
if (userData?.roleIds == 'ebtp-purchase') {//采购经理 if (roleData?.roleCode == 'ebtp-purchase') {//采购经理
req['purchasingManager'] = userData?.userId req['purchasingManager'] = userData?.userId
} else if (userData?.roleIds == 'ebtp-agency-admin') {//代理机构业务管理员 } else if (roleData?.roleCode == 'ebtp-agency-admin') {//代理机构业务管理员
req['agencyCompany'] = userData?.organizationId req['agencyCompany'] = userData?.organizationId
} else if (userData?.roleIds == 'ebtp-agency-project-manager') {//代理机构业务经理 项目经理 } else if (roleData?.roleCode == 'ebtp-agency-project-manager') {//代理机构业务经理 项目经理
req['projectManager'] = userData?.userId req['projectManager'] = userData?.userId
} else { } else {
return [] return []