diff --git a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
index 5018166..6c1227b 100644
--- a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
+++ b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx
@@ -3,6 +3,7 @@ import { message, PageHeader, Button, Spin } from 'antd';
import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
import { getPage, handleAlarm } from './service';
import ViewEvalAlarmUpdateModal from '../../Evaluation/BidControl/BidControlManager/components/ViewEvalAlarmUpdateModal';
+import { btnAuthority } from '@/utils/authority';
interface alarmData {
@@ -82,10 +83,10 @@ const AbnormalAalarm: React.FC<{}> = () => {
render: (_, record) => {
if (record.type === "1") {
if (record.status === "0") {
- return
+ return !btnAuthority(["ebtp-site-supervision"]) &&
}
} else {
- return (
+ return (!btnAuthority(["ebtp-site-supervision"]) &&
)
}
}
diff --git a/src/pages/ElecEvaluation/AppointmentManage/index.tsx b/src/pages/ElecEvaluation/AppointmentManage/index.tsx
index e3a9a6a..b92e594 100644
--- a/src/pages/ElecEvaluation/AppointmentManage/index.tsx
+++ b/src/pages/ElecEvaluation/AppointmentManage/index.tsx
@@ -7,6 +7,7 @@ import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservatio
import { getRecordData, getSiteList } from './service';
import { isEmpty } from '@/utils/CommonUtils';
import { getSessionRoleData } from '@/utils/session';
+import { btnAuthority } from '@/utils/authority';
const orange_bg = { background: '#ffbc83', color: '#333333', cursor: 'pointer', width: '100%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
const light_orange_bg = { background: '#faf7e5' };
@@ -45,7 +46,7 @@ const ScreenTable = (props: { record: any, onCellClick: (id: any) => void, refre
onCell: (record) => {
return {
style: record[ite.id]?.iskssj ? orange_bg : light_orange_bg,
- onClick: record[ite.id]?.iskssj ? () => onCellClick(record[ite.id]) : void 0,
+ onClick: !btnAuthority(["ebtp-appointment", "ebtp-site-admin"]) && record[ite.id]?.iskssj ? () => onCellClick(record[ite.id]) : void 0,
}
},
render: (_: any, record: any) => {
@@ -86,14 +87,14 @@ const ScreenTable = (props: { record: any, onCellClick: (id: any) => void, refre
{tableData.length > 0 && (
-
+ {!btnAuthority(["ebtp-appointment", "ebtp-site-admin"]) &&
-
+ }
可预约{roleCode == "ebtp-appointment" ? "会议室" : "电子评标室"}
已预约{roleCode == "ebtp-appointment" ? "会议室" : "电子评标室"}
@@ -172,15 +173,15 @@ export default () => {
- }
{roleCode == "ebtp-appointment" ? (//预约人员
MyReserveContent()}>
我的预约
) : (
- viewMeetContent()}>
+ !btnAuthority(["ebtp-site-admin"]) && viewMeetContent()}>
查看预约详情
)}
diff --git a/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
index 4e8d0f2..56a5a61 100644
--- a/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
+++ b/src/pages/ElecEvaluation/ElecEvalReserve/MyReserve.tsx
@@ -7,6 +7,7 @@ import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation';
import moment from 'moment';
import { dateTimeFormatter } from '@/utils/DateUtils';
+import { btnAuthority } from '@/utils/authority';
const MyReserve: React.FC<{}> = () => {
const meetingRelationRef = useRef(); //操作数据后刷新列表
@@ -139,7 +140,7 @@ const MyReserve: React.FC<{}> = () => {
search: false,
render: (text: any, record: any) => {
return (
- <>
+ !btnAuthority(["ebtp-appointment"]) && <>
viewMeet(record)} danger>
查看
@@ -211,7 +212,7 @@ const MyReserve: React.FC<{}> = () => {
>
{searchConfig?.searchText}
,
- createMeet()}
diff --git a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
index e7a5ed4..fd98438 100644
--- a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
+++ b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
@@ -7,6 +7,7 @@ import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation';
import moment from 'moment';
import { dateTimeFormatter } from '@/utils/DateUtils';
+import { btnAuthority } from '@/utils/authority';
const { TabPane } = Tabs;
const statusEnum = {
@@ -166,7 +167,7 @@ const Index: React.FC<{}> = () => {
search: false,
render: (text: any, record: any) => {
return (
- <>
+ !btnAuthority(["ebtp-site-admin"]) && <>
viewMeet(record)} danger>
查看
@@ -254,7 +255,7 @@ const Index: React.FC<{}> = () => {
search: false,
render: (text: any, record: any) => {
return (
- <>
+ !btnAuthority(["ebtp-site-admin"]) && <>
viewMeet(record)} danger>
查看
@@ -392,7 +393,7 @@ const Index: React.FC<{}> = () => {
>
{searchConfig?.searchText}
,
- createMeet()}
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
index 7aff0ed..2685a6c 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/PersonReport/index.tsx
@@ -3,6 +3,7 @@ import ProTable, { ActionType } from '@ant-design/pro-table';
import { getList } from './service';
import { Card, Spin } from 'antd';
import PersonReportModal from './components/PersonReportModal';
+import { btnAuthority } from '@/utils/authority';
const PersonReport: React.FC<{}> = () => {
const checkRelationRef = useRef(); //操作数据后刷新列表
@@ -86,7 +87,7 @@ const PersonReport: React.FC<{}> = () => {
width: 80,
render: (text: any, record: any) => {
return (
- <>
+ !btnAuthority(["ebtp-site-admin"]) && <>
setFormVals(record)}>查看详情
>
)
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
index e3eaf7e..4e78980 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/GroupPermission.tsx
@@ -4,6 +4,7 @@ import { getGroupPageList, saveSiteGroup, delSiteGroup } from '../service';
import { Button, Form, message, Spin, Popconfirm } from 'antd';
import SiteGroupModal from './SiteGroupModal';
import AuthorizeModal from './AuthorizeModal';
+import { btnAuthority } from '@/utils/authority';
const GroupPermission: React.FC<{}> = () => {
@@ -48,7 +49,7 @@ const GroupPermission: React.FC<{}> = () => {
width: '30%',
render: (text: any, record: any) => {
return (
- <>
+ !btnAuthority(["ebtp-site-admin"]) && <>
setFormVals(record)}>编辑
setAuthorize(record)}>授权管理
{ delPerson(record.id); }} okText="确定" cancelText="取消" > 删除
@@ -104,93 +105,93 @@ const GroupPermission: React.FC<{}> = () => {
return (
<>
-
-
-
- [
- ...dom.reverse(),
- insertSitePerson()}>
- 新增
- ,
- ],
- }}
+
+
- request={(params) => {
- let trueParams = {
- ...params,
- pageNo: params.current,
- }
- return new Promise((resolve, reject) => {
- getGroupPageList(trueParams).then(res => {
- if (res.code === 200) {
- resolve({
- data: res.data.records,
- success: res.success,
- total: res.data.total,
- })
- } else {
- resolve({
- data: [],
- success: false,
- total: 0,
- })
+ [
+ ...dom.reverse(),
+ !btnAuthority(["ebtp-site-admin"]) && insertSitePerson()}>
+ 新增
+ ,
+ ],
+ }}
+
+ request={(params) => {
+ let trueParams = {
+ ...params,
+ pageNo: params.current,
}
- })
- });
- }}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
- />
- {/* 新增及编辑Modal */}
- {
- isEditModalVisible ?
- {
- await saveSiteGroup(value).then((res: any) => {
- if (res.success === true) {
- message.success("保存成功!");
- setIsEditModalVisible(false);
- setEditForm({});
- checkRelationRef.current?.reload();
+ return new Promise((resolve, reject) => {
+ getGroupPageList(trueParams).then(res => {
+ if (res.code === 200) {
+ resolve({
+ data: res.data.records,
+ success: res.success,
+ total: res.data.total,
+ })
+ } else {
+ resolve({
+ data: [],
+ success: false,
+ total: 0,
+ })
}
- });
- }}
- onCancel={() => {
- setIsEditModalVisible(!isEditModalVisible);
- setEditForm({});
- }}
- >
- : null
- }
- {/* 授权Modal */}
- {
- isAuthorizeModalVisible ?
- {
- setAuthorizeModalVisible(!isAuthorizeModalVisible);
- setEditForm({});
- }}
- >
- : null
- }
+ })
+ });
+ }}
+ pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ />
+ {/* 新增及编辑Modal */}
+ {
+ isEditModalVisible ?
+ {
+ await saveSiteGroup(value).then((res: any) => {
+ if (res.success === true) {
+ message.success("保存成功!");
+ setIsEditModalVisible(false);
+ setEditForm({});
+ checkRelationRef.current?.reload();
+ }
+ });
+ }}
+ onCancel={() => {
+ setIsEditModalVisible(!isEditModalVisible);
+ setEditForm({});
+ }}
+ >
+ : null
+ }
+ {/* 授权Modal */}
+ {
+ isAuthorizeModalVisible ?
+ {
+ setAuthorizeModalVisible(!isAuthorizeModalVisible);
+ setEditForm({});
+ }}
+ >
+ : null
+ }
-
+
>
);
diff --git a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
index f98e8ed..c81f220 100644
--- a/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
+++ b/src/pages/ElecEvaluation/EvalSiteManage/SiteUser/components/UserPermission.tsx
@@ -4,6 +4,7 @@ import { getUserList, saveSiteUser, delSiteUser, getGroupList } from '../service
import { Button, Form, message, Spin, Popconfirm } from 'antd';
import SiteUserModal from './SiteUserModal';
import AuthorizeModal from './AuthorizeModal';
+import { btnAuthority } from '@/utils/authority';
const UserPermission: React.FC<{}> = () => {
@@ -65,7 +66,7 @@ const UserPermission: React.FC<{}> = () => {
// 是否关联分组:0-否,1-是
if (record.groupStatus == '0') {
return (
- <>
+ !btnAuthority(["ebtp-site-admin"]) && <>
setFormVals(record)}>编辑
setAuthorize(record)}>授权管理
{ delUser(record.id); }} okText="确定" cancelText="取消" > 删除
@@ -73,13 +74,13 @@ const UserPermission: React.FC<{}> = () => {
)
} else if (record.groupStatus == '1') {
return (
- <>
+ !btnAuthority(["ebtp-site-admin"]) && <>
setFormVals(record)}>编辑
{ delUser(record.id); }} okText="确定" cancelText="取消" > 删除
>
)
} else {
- return(<>>)
+ return (<>>)
}
}
},
@@ -142,94 +143,94 @@ const UserPermission: React.FC<{}> = () => {
return (
<>
-
-
-
- [
- ...dom.reverse(),
- insertSiteUser()}>
- 新增
- ,
- ],
- }}
+
+
- request={(params) => {
- let trueParams = {
- ...params,
- pageNo: params.current,
- }
- return new Promise((resolve, reject) => {
- getUserList(trueParams).then(res => {
- if (res.code === 200) {
- resolve({
- data: res.data.records,
- success: res.success,
- total: res.data.total,
- })
- } else {
- resolve({
- data: [],
- success: false,
- total: 0,
- })
+ [
+ ...dom.reverse(),
+ !btnAuthority(["ebtp-site-admin"]) && insertSiteUser()}>
+ 新增
+ ,
+ ],
+ }}
+
+ request={(params) => {
+ let trueParams = {
+ ...params,
+ pageNo: params.current,
}
- })
- });
- }}
- pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
- />
- {/* 新增及编辑银行账号Modal */}
- {
- isEditModalVisible ?
- {
- await saveSiteUser(value).then((res: any) => {
- if (res.success === true) {
- message.success("保存成功!");
- setIsEditModalVisible(false);
- setEditForm({});
- checkRelationRef.current?.reload();
+ return new Promise((resolve, reject) => {
+ getUserList(trueParams).then(res => {
+ if (res.code === 200) {
+ resolve({
+ data: res.data.records,
+ success: res.success,
+ total: res.data.total,
+ })
+ } else {
+ resolve({
+ data: [],
+ success: false,
+ total: 0,
+ })
}
- });
- }}
- onCancel={() => {
- setIsEditModalVisible(!isEditModalVisible);
- setEditForm({});
- }}
- >
- : null
- }
- {/* 授权Modal */}
- {
- isAuthorizeModalVisible ?
- {
- setAuthorizeModalVisible(!isAuthorizeModalVisible);
- setEditForm({});
- }}
- >
- : null
- }
+ })
+ });
+ }}
+ pagination={{ defaultPageSize: 10, showSizeChanger: false }}//默认显示条数
+ />
+ {/* 新增及编辑银行账号Modal */}
+ {
+ isEditModalVisible ?
+ {
+ await saveSiteUser(value).then((res: any) => {
+ if (res.success === true) {
+ message.success("保存成功!");
+ setIsEditModalVisible(false);
+ setEditForm({});
+ checkRelationRef.current?.reload();
+ }
+ });
+ }}
+ onCancel={() => {
+ setIsEditModalVisible(!isEditModalVisible);
+ setEditForm({});
+ }}
+ >
+ : null
+ }
+ {/* 授权Modal */}
+ {
+ isAuthorizeModalVisible ?
+ {
+ setAuthorizeModalVisible(!isAuthorizeModalVisible);
+ setEditForm({});
+ }}
+ >
+ : null
+ }
-
+
>
);
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
index 303313e..210d64b 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
@@ -5,6 +5,7 @@ import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
import ViewModal from '../../ViewModal';
import { getPage } from '../../service';
+import { btnAuthority } from '@/utils/authority';
/**
* 在线监督列表
@@ -115,7 +116,7 @@ const OnlineSupervision: React.FC<{}> = () => {
width: '9%',
render: (_: any, record: any) =>
(
- <>
+ !btnAuthority(["ebtp-site-supervision"]) && <>
= () => {
spinSet(true);
return await getPage({
...params,
- pageNo: pageData.pageNo,
+ pageNo: pageData.pageNo,
pageSize: pageData.pageSize,
queryType: 1,
areaRoomName: params.areaName
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
index 250ecce..83c7055 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
@@ -5,6 +5,7 @@ import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
import ViewModal from '../../ViewModal';
import { getPage } from '../../service';
+import { btnAuthority } from '@/utils/authority';
/**
* 预约项目列表
@@ -21,7 +22,7 @@ const ReservedItems: React.FC<{}> = () => {
});
const history = useHistory();
const viewModalRef = useRef(null);
-
+
//查看详情
const viewDetails = (record: any) => {
setVisible(true);
@@ -34,51 +35,51 @@ const ReservedItems: React.FC<{}> = () => {
}
const columns: ProColumns[] = [
- {
- valueType: 'index',
- align: 'center',
- hideInSearch: true,
- },
- {
- title: '项目名称',
- align: 'center',
- dataIndex: 'projectName',
- width: '20%',
- hideInSearch: false,
- },
- {
- title: '项目编号',
- align: 'center',
- dataIndex: 'projectNum',
- hideInSearch: true,
- },
- {
- title: '标段',
- align: 'center',
- dataIndex: 'packageNames',
- hideInSearch: true,
- },
- {
- title: '评审室名称',
- align: 'center',
- dataIndex: 'areaName',
- hideInSearch: false,
- width: '10%',
- },
- {
- title: '预计评标开始时间',
- align: 'center',
- dataIndex: 'reserveStartDate',
- hideInSearch: true,
- width: '15%',
- },
- {
- title: '预计评标结束时间',
- align: 'center',
- dataIndex: 'reserveEndDate',
- hideInSearch: true,
- width: '9.5%',
- },
+ {
+ valueType: 'index',
+ align: 'center',
+ hideInSearch: true,
+ },
+ {
+ title: '项目名称',
+ align: 'center',
+ dataIndex: 'projectName',
+ width: '20%',
+ hideInSearch: false,
+ },
+ {
+ title: '项目编号',
+ align: 'center',
+ dataIndex: 'projectNum',
+ hideInSearch: true,
+ },
+ {
+ title: '标段',
+ align: 'center',
+ dataIndex: 'packageNames',
+ hideInSearch: true,
+ },
+ {
+ title: '评审室名称',
+ align: 'center',
+ dataIndex: 'areaName',
+ hideInSearch: false,
+ width: '10%',
+ },
+ {
+ title: '预计评标开始时间',
+ align: 'center',
+ dataIndex: 'reserveStartDate',
+ hideInSearch: true,
+ width: '15%',
+ },
+ {
+ title: '预计评标结束时间',
+ align: 'center',
+ dataIndex: 'reserveEndDate',
+ hideInSearch: true,
+ width: '9.5%',
+ },
{
title: '状态',
align: 'center',
@@ -113,7 +114,7 @@ const ReservedItems: React.FC<{}> = () => {
width: '4.5%',
render: (_: any, record: any) =>
(
- <>
+ !btnAuthority(["ebtp-site-supervision"]) && <>
= () => {
spinSet(true);
return await getPage({
...params,
- pageNo: pageData.pageNo,
+ pageNo: pageData.pageNo,
pageSize: pageData.pageSize,
queryType: 0,
areaRoomName: params.areaName
@@ -158,8 +159,8 @@ const ReservedItems: React.FC<{}> = () => {
}).finally(() => {
isNotEmpty(window.location.search) && history.push(window.location.pathname);
spinSet(false);
- })
- }
+ })
+ }
}
pagination={{
defaultPageSize: 10,
@@ -174,7 +175,7 @@ const ReservedItems: React.FC<{}> = () => {
rowKey={"id"}
/>
- closeViewDetails()} ref = {viewModalRef}/>
+ closeViewDetails()} ref={viewModalRef} />
)
}
diff --git a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
index de82073..f114adb 100644
--- a/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
+++ b/src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
@@ -1,10 +1,11 @@
import { isNotEmpty } from '@/utils/CommonUtils';
import ProTable, { ProColumns } from '@ant-design/pro-table';
-import { Button, Spin, message } from 'antd';
+import { Button, Spin, message, Card } from 'antd';
import React, { useRef, useState } from 'react';
import { useHistory } from 'umi';
import ViewModal from '../ViewModal';
import { getPage } from '../service';
+import { btnAuthority } from '@/utils/authority';
/**
* 事后监督列表
@@ -117,7 +118,7 @@ const PostSupervision: React.FC<{}> = () => {
width: '10%',
render: (_: any, record: any) =>
(
- <>
+ !btnAuthority(["ebtp-after-supervision"]) && <>
= () => {
return (
-
+
= () => {
spinSet(true);
return await getPage({
...params,
- pageNo: pageData.pageNo,
+ pageNo: pageData.pageNo,
pageSize: pageData.pageSize,
queryType: 2,
areaRoomName: params.areaName
@@ -186,7 +187,7 @@ const PostSupervision: React.FC<{}> = () => {
onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }}
rowKey={"id"}
/>
-
+
closeViewDetails()} ref={viewModalRef} />
)