diff --git a/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx b/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx index cf374f629b58103fe4548a3128c372651fe67d29..90d1b9b519e4b8052be3b50b2f423cf832dc7260 100644 --- a/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx +++ b/src/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate/Template1.tsx @@ -1065,7 +1065,7 @@ const Template1: FC = ({ subdataitem: any, subdataindex: number, ) => { - let tdValue = subItem[subdataitem.id]; + let tdValue = subItem[subdataitem.id]??subItem[subdataitem.code]; if (typeof tdValue === 'undefined') { const fields = current.instanceData?.fields[ @@ -1082,7 +1082,7 @@ const Template1: FC = ({ subdataitem.propId, ); if (curField) { - tdValue = subItem[curField.id]; + tdValue = subItem[curField.id]??subItem[curField.code]; } } } @@ -1129,12 +1129,12 @@ const Template1: FC = ({ subdataitem.valueType, ) ? (
{tdValue}
- ) : subItem[ + ) : (subItem[ subdataitem.id - ] !== undefined ? ( + ]??subItem[subdataitem.code]) !== undefined ? ( = ({ subdataitem.valueType, ) ? (
- {subItem[subdataitem.id]} + {subItem[subdataitem.id]??subItem[subdataitem.code]}
- ) : subItem[ + ) : (subItem[ subdataitem.id - ] !== undefined ? ( + ]??subItem[subdataitem.code]) !== undefined ? (