From 7c41bc48f2b599a45eae005a1c2c419644f95ab1 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Tue, 19 Jul 2022 15:07:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?7.19=20=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=A7=A3=E5=AF=86=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Opening/ProjectManager/Room/index.tsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/Opening/ProjectManager/Room/index.tsx b/src/pages/Opening/ProjectManager/Room/index.tsx
index 925dd00..62dbc7e 100644
--- a/src/pages/Opening/ProjectManager/Room/index.tsx
+++ b/src/pages/Opening/ProjectManager/Room/index.tsx
@@ -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>

From 6676fb5943db71b99ddab3f37dbddea13c5c8126 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Tue, 2 Aug 2022 14:36:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?8.2=20=E4=BE=9B=E5=BA=94=E5=95=86=E8=A7=A3?=
 =?UTF-8?q?=E5=AF=86=E9=A1=B5=E8=A7=A3=E5=AF=86=E7=8A=B6=E6=80=81=E6=9C=AA?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Evaluation/FileDecode/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Evaluation/FileDecode/index.tsx b/src/pages/Evaluation/FileDecode/index.tsx
index 5d0a59d..a849054 100644
--- a/src/pages/Evaluation/FileDecode/index.tsx
+++ b/src/pages/Evaluation/FileDecode/index.tsx
@@ -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 '解密失败' }

From f4ebff63d3d464f1aa67822fd41400a932038ca0 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 3 Aug 2022 16:41:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?8.3=20=E4=BE=9B=E5=BA=94=E5=95=86=E8=A7=A3?=
 =?UTF-8?q?=E5=AF=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Evaluation/FileDecode/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Evaluation/FileDecode/index.tsx b/src/pages/Evaluation/FileDecode/index.tsx
index a849054..562c6cd 100644
--- a/src/pages/Evaluation/FileDecode/index.tsx
+++ b/src/pages/Evaluation/FileDecode/index.tsx
@@ -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);