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!227
This commit is contained in:
周建龙
2022-08-12 17:08:24 +08:00
parent 9f1cce8cca f4ebff63d3
commit c770ae9e99
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Evaluation/FileDecode/index.tsx
View File

@ -100,7 +100,7 @@ const FileDecode: React.FC<{}> = () => {
if (JSON.stringify(record) == "{}") {
return '';
} else {
const status = record?.registerInfoVOList[0].decryptStatus;
const status = record?.quoteOrOther == "1" ? record?.registerInfoVOList[0].decryptOtherStatus : record?.registerInfoVOList[0].decryptStatus;
if (status == null || status === '1') { return '未解密' }
else if (status === '2') { return '解密成功' }
else if (status === '3') { return '解密失败' }
@ -124,7 +124,7 @@ const FileDecode: React.FC<{}> = () => {
title: '操作', width: 80,
render: (_: any, record: any) => {
if (JSON.stringify(record) !== "{}" && jm) {
const status = record?.registerInfoVOList[0].decryptStatus;
const status = record?.quoteOrOther == "1" ? record?.registerInfoVOList[0].decryptOtherStatus : record?.registerInfoVOList[0].decryptStatus;
if (record?.decryptEndDate !== '' && record?.decryptEndDate !== null && status !== '2') {
return <Button type='primary' disabled={dis} onClick={async () => {
spinSet(true); disSet(true);

13
src/pages/Opening/ProjectManager/Room/index.tsx
View File

@ -699,9 +699,12 @@ const Room: React.FC<{}> = () => {
//解密时限
function onOkJmsx(value: any) {
endTimeSet(value.format('yyyy-MM-DD HH:mm:ss'));
// endTimeSet(value.format('yyyy-MM-DD HH:mm:ss'));
setTime.current = value.format('yyyy-MM-DD HH:mm:ss');
}
const [sxLoading, sxLoadingSet] = useState<boolean>(false);
//设置解密时限存储
const setTime = useRef<string>('')
const jmTime = () => {
return (
<Modal
@ -715,14 +718,14 @@ const Room: React.FC<{}> = () => {
onCancel={() => { jmTimeVisSet(false); }}
onOk={async () => {
sxLoadingSet(true);
if (endTime != '') {
await endTimeConfig({ id: tdocId, decryptEndDate: endTime });
if (setTime.current != '') {
await endTimeConfig({ id: tdocId, decryptEndDate: setTime.current });
jmTimeVisSet(false);
countSet(count + 1);
} else {
message.error('您未设置解密截止时间')
}
sxLoadingSet(false);
countSet(count + 1);
}}
>
<Spin spinning={sxLoading}>
@ -733,7 +736,7 @@ const Room: React.FC<{}> = () => {
showTime={{ defaultValue: moment('00:00:00', 'HH:mm:ss') }}
// disabled={disabled}
showNow={false}
onOk={onOkJmsx}
onChange={onOkJmsx}
/>
</Spin>
</Modal>