Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master_jnryy_customerservice

This commit is contained in:
jl-zhoujl2
2022-08-25 08:41:49 +08:00
131 changed files with 6258 additions and 2086 deletions

View File

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