Merge branch 'fix-220418-ljr' into 'v2-220418'

src/pages/transaction/purchaseAbility/components/detail/components/materialLayout/index.tsx

@@ -38,7 +38,7 @@ const MaterialLayout: React.FC<IPROPS> = (props: any) => {
           },
           {
             label: intl.formatMessage({ id: 'detail.purchase.goodsGroup' }),
-            content: item.goodsGroup
+            content: item?.goodsGroup ?? item?.materialGroup
           },
           {
             label: intl.formatMessage({ id: 'detail.purchase.nameCode' }),
@@ -96,8 +96,8 @@ const MaterialLayout: React.FC<IPROPS> = (props: any) => {
     },
     {
       title: intl.formatMessage({ id: 'detail.purchase.goodsGroup' }),
-      key: 'goodsGroup',
-      dataIndex: 'goodsGroup'
+      key: 'materialGroup',
+      dataIndex: 'materialGroup'
     },
     {
       title: intl.formatMessage({ id: 'detail.purchase.nameCode' }),