diff --git a/src/components/DataStandard/NewReportForm/Viewer/index.tsx b/src/components/DataStandard/NewReportForm/Viewer/index.tsx index 50f87e17a91e4796bc4bba5b6896fcb1d3d7fa2a..9f51e13a00550aa77ae49763e64c3bc0a5599ef9 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 b540a4df1164e1d3130c1118d610c4c129a5480d..6978f6adb72ce99804369423a66be63fd200b42a 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]; } });