From 7295349d336d8957d02c7dee866cb9de0a42cf38 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Feb 2022 11:32:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=99=BB=E5=BD=95=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/SpecialModal.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/forge/Main/SpecialModal.jsx b/src/forge/Main/SpecialModal.jsx index 1454be67..2c9a21f8 100644 --- a/src/forge/Main/SpecialModal.jsx +++ b/src/forge/Main/SpecialModal.jsx @@ -16,7 +16,8 @@ function SpecialModal({ visible , hideModal , sureModal , showNotification , use function sure(){ if(!user_apply_signatures || (user_apply_signatures && user_apply_signatures.status !== "waiting")){ if(!id || (id && id.length === 0)){ - showNotification("请先提交文件进行审核!"); + // showNotification("请先提交文件进行审核!"); + getUrl(`/api/apply_signatures/template_file`) return; } const url = `/apply_signatures.json`; From 9b7eb2ab85604f4a120e2814046a8261b5cd4aa6 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Mar 2022 10:35:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=A8=A1=E6=9D=BF=E6=96=87=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/expertList/index.jsx | 4 ++-- src/military/expert/reviewResult/index.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index 21666b5f..e18ce7f9 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -313,7 +313,7 @@ function RegisterList({ showNotification }) { Authorization: cookie.load('autologin_forge_military') || sessionStorage.osredmToken, }, }; - + return (
@@ -393,7 +393,7 @@ function RegisterList({ showNotification }) { > -

{ window.open(httpUrl + '/busiAttachments/download/883') }}>专家注册表模板.xlsx

+

{ window.open(`${httpUrl}/busiAttachments/download/${window.location.host.indexOf('osredm') === -1 ? '883' : '136'}`) }}>专家注册表模板.xlsx

提示:只能在导入模版上增减数据,才能导入成功!

) diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index 80f76c68..501ee07a 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -42,7 +42,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) { } }, { - title: '平均得分', + title: '最终得分', dataIndex: 'finalGrades', key: 'phone', },