Merge branch 'v2-0418-xxx' into 'v2-220418'

bug修复 See merge request linkseeks-design/pro-platform!197

Merge branch 'v2-0418-xxx' into 'v2-220418'
610b6631 · 前端-彭佳文 · c78e3694 · 948f98a8 · 610b6631
Commit 610b6631 authored Apr 11, 2022 by 前端-彭佳文
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

index.tsx ...creaseRequisition/components/materialModalTable/index.tsx +1 -1

No files found.
--- a/src/pages/transaction/purchaseRequisition/increaseRequisition/components/materialModalTable/index.tsx
+++ b/src/pages/transaction/purchaseRequisition/increaseRequisition/components/materialModalTable/index.tsx
@@ -55,7 +55,7 @@ export const materialColumns: any[] = [
    key: 'materialGroup',
    render: (text, record) => {
      return (
-        <div>{record.name}</div>
+        <div>{record.materialGroup ? record.materialGroup.name : ''}</div>
      )
    }
  },