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

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

Browse Source
This commit is contained in:
jl-zhoujl2
2022-09-14 17:07:38 +08:00
parent af2a801580 a8ddeccf90
commit e27b34d2bc
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
View File

@ -5,6 +5,8 @@ import { reserveList, roomList, cancelReserve } from './service';
import '@/assets/ld_style.less';
import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation';
import moment from 'moment';
import { dateTimeFormatter } from '@/utils/DateUtils';
const { TabPane } = Tabs;
const statusEnum = {
@ -157,7 +159,7 @@ const Index: React.FC<{}> = () => {
查看
</Button>
<Button
hidden={record.status > 0 && record.timeOut == '1'}
hidden={record.status == '0' && record.reserveEndDate <= moment().format(dateTimeFormatter)}
type="text"
onClick={() => cancel(record)}
danger
@ -235,7 +237,7 @@ const Index: React.FC<{}> = () => {
查看
</Button>
<Button
hidden={record.status > 0 && record.timeOut == '1'}
hidden={record.reserveEndDate <= moment().format(dateTimeFormatter)}
type="text"
onClick={() => cancel(record)}
danger

3
src/pages/ElecEvaluation/VideoMonitor/Online/components/OnlineSupervision.tsx
View File

@ -153,7 +153,8 @@ const OnlineSupervision: React.FC<{}> = () => {
spinSet(true);
return await getPage({
...params,
basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
pageNo: pageData.pageNo,
pageSize: pageData.pageSize,
queryType: 1,
areaRoomName: params.areaName
}).then((res) => {

3
src/pages/ElecEvaluation/VideoMonitor/Online/components/ReservedItems.tsx
View File

@ -142,7 +142,8 @@ const ReservedItems: React.FC<{}> = () => {
spinSet(true);
return await getPage({
...params,
basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
pageNo: pageData.pageNo,
pageSize: pageData.pageSize,
queryType: 0,
areaRoomName: params.areaName
}).then((res) => {

3
src/pages/ElecEvaluation/VideoMonitor/Post/index.tsx
View File

@ -155,7 +155,8 @@ const PostSupervision: React.FC<{}> = () => {
spinSet(true);
return await getPage({
...params,
basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
pageNo: pageData.pageNo,
pageSize: pageData.pageSize,
queryType: 2,
areaRoomName: params.areaName
}).then((res) => {