From d67183610092ee690db5c1c26eae80635e373cb8 Mon Sep 17 00:00:00 2001 From: "googosoft.shixing" <15118577+shi1xing2@user.noreply.gitee.com> Date: Fri, 26 Sep 2025 10:14:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=BA=E9=9B=B6=E4=BC=9A=E6=98=BE=E7=A4=BA=E7=BD=AE?= =?UTF-8?q?=E7=A9=BA=E7=9A=84bug=202.=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DataStandard/NewReportForm/Viewer/index.tsx | 4 ---- src/executor/tools/uploadTemplate.tsx | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/DataStandard/NewReportForm/Viewer/index.tsx b/src/components/DataStandard/NewReportForm/Viewer/index.tsx index 50f87e17a..9f51e13a0 100644 --- a/src/components/DataStandard/NewReportForm/Viewer/index.tsx +++ b/src/components/DataStandard/NewReportForm/Viewer/index.tsx @@ -372,10 +372,6 @@ const WorkReportViewer: React.FC = (props) => { size="small" ghost onClick={async () => { - if (assignTask.metadata.taskStatus !== 'finished') { - message.warning('需要等待主管单位审批完后才允许变更'); - return; - } await $confirm({ content: '发起变更后任务将会重置,确定要变更吗?', }); diff --git a/src/executor/tools/uploadTemplate.tsx b/src/executor/tools/uploadTemplate.tsx index b540a4df1..6978f6adb 100644 --- a/src/executor/tools/uploadTemplate.tsx +++ b/src/executor/tools/uploadTemplate.tsx @@ -605,7 +605,7 @@ export const matching = ( for (const item of matchData) { const newData: any = {}; fields.forEach((c) => { - if (item[c.code]) { + if (c.code in item) { newData[c.id] = item[c.code]; } }); -- Gitee