Commit a6919ad9b95c580982fd1adac3de116a897c2df6

Authored by 张志伟
2 parents ef713064 8803d97d

Merge branch 'bug_fix' into 'master'

map循环bugfix



See merge request !257
src/pages/performance/EvaGroupSetting/EditComfirm/components/EvalGroups.tsx
... ... @@ -85,14 +85,17 @@ const EvalGroups = ({ value, onChange }: Props) => {
85 85 title: "适用岗位",
86 86 dataIndex: "staffRewardDims",
87 87 render: (staffRewardDims: any, record: EvaGroupSetteing.EvalGroups) => {
88   - console.log(staffRewardDims);
89   - const newArr = staffRewardDims.map((item: any) => item.postNames);
90   - const newrr = newArr.flat();
91   - return (
92   - <Button type="link" onClick={() => setPostModal({ visible: true, record: newrr })}>
93   - 查看
94   - </Button>
95   - );
  88 + if (staffRewardDims && staffRewardDims?.length > 0) {
  89 + const newArr = staffRewardDims.map((item: any) => item.postNames);
  90 + const newrr = newArr.flat();
  91 + return (
  92 + <Button type="link" onClick={() => setPostModal({ visible: true, record: newrr })}>
  93 + 查看
  94 + </Button>
  95 + );
  96 + } else {
  97 + return "--";
  98 + }
96 99 },
97 100 },
98 101 {
... ... @@ -108,7 +111,7 @@ const EvalGroups = ({ value, onChange }: Props) =&gt; {
108 111 title: "考评指标(项)",
109 112 dataIndex: "indicators",
110 113 key: "indicators",
111   - render: (_: any, record: EvaGroupSetteing.EvalGroups) => record?.indicators.length || 0 + '个',
  114 + render: (_: any, record: EvaGroupSetteing.EvalGroups) => record?.indicators.length || 0,
112 115 },
113 116 {
114 117 title: "人员考评奖惩(项)",
... ...