Commit 795e9e59d10612aeca699cf862fd59993dd36c08
1 parent
5ac136b7
考核目标值查看
Showing
6 changed files
with
91 additions
and
23 deletions
src/pages/performance/CompensateGroupConfig/EditComfirm/components/IndivatorsTable.tsx
... | ... | @@ -126,6 +126,7 @@ const IndivatorsTable = ({ value, onChange, postId, shopIds }: Props) => { |
126 | 126 | { |
127 | 127 | title: "考核目标设置", |
128 | 128 | render: (value: any, record: Item) => { |
129 | + const targets:any = []; | |
129 | 130 | if (record.targets && record.targets.length > 0) { |
130 | 131 | const newValue = record.targets.filter((item: any) => item.targetValue); |
131 | 132 | if (newValue.length === 1) { |
... | ... | @@ -143,9 +144,32 @@ const IndivatorsTable = ({ value, onChange, postId, shopIds }: Props) => { |
143 | 144 | } else { |
144 | 145 | return "--"; |
145 | 146 | } |
146 | - } else { | |
147 | - const targets = [...record?.commissionParams]; | |
148 | - console.log(targets); | |
147 | + } else if (!record.targets) { | |
148 | + if (record.conds && record.conds.length > 0) { | |
149 | + record.conds.forEach((i) => targets.push(i)); | |
150 | + } | |
151 | + if (record.commissionParams && record.commissionParams.length > 0) { | |
152 | + record.commissionParams.forEach((i) => targets.push(i)); | |
153 | + } | |
154 | + if (record.ladderParams && record.ladderParams.length > 0) { | |
155 | + record.ladderParams.forEach((i) => targets.push(i)); | |
156 | + } | |
157 | + const newValue = targets.filter((item: any) => item.targetValue); | |
158 | + if (newValue.length === 1) { | |
159 | + return newValue[0].targetType === 2 | |
160 | + ? `${newValue[0].targetValue}%` | |
161 | + : newValue[0].targetType === 3 | |
162 | + ? `${newValue[0].targetValue}元` | |
163 | + : `${newValue[0].targetValue}台`; | |
164 | + } else if (newValue.length > 1) { | |
165 | + return ( | |
166 | + <Button type="link" onClick={() => lookTar(newValue)}> | |
167 | + 查看 | |
168 | + </Button> | |
169 | + ); | |
170 | + } else { | |
171 | + return "--"; | |
172 | + } | |
149 | 173 | } |
150 | 174 | }, |
151 | 175 | }, | ... | ... |
src/pages/performance/CompensateGroupConfig/interface.d.ts
src/pages/performance/EvaGroupSetting/EditComfirm/components/IndivatorsTable.tsx
... | ... | @@ -126,8 +126,9 @@ const IndivatorsTable = ({ value, onChange, personModal, scopeType }: Props) => |
126 | 126 | { |
127 | 127 | title: "考核目标设置", |
128 | 128 | render: (value: any, record: Item) => { |
129 | - if (record.commissionParams && record.commissionParams.length > 0) { | |
130 | - const newValue = record.commissionParams.filter((item: any) => item.targetValue); | |
129 | + const targets: any = []; | |
130 | + if (record.targets && record.targets.length > 0) { | |
131 | + const newValue = record.targets.filter((item: any) => item.targetValue); | |
131 | 132 | if (newValue.length === 1) { |
132 | 133 | return newValue[0].targetType === 2 |
133 | 134 | ? `${newValue[0].targetValue}%` |
... | ... | @@ -143,8 +144,17 @@ const IndivatorsTable = ({ value, onChange, personModal, scopeType }: Props) => |
143 | 144 | } else { |
144 | 145 | return "--"; |
145 | 146 | } |
146 | - } else if (record.ladderParams && record.ladderParams.length > 0) { | |
147 | - const newValue = record.ladderParams.filter((item: any) => item.targetValue); | |
147 | + } else if (!record.targets) { | |
148 | + if (record.conds && record.conds.length > 0) { | |
149 | + record.conds.forEach((i) => targets.push(i)); | |
150 | + } | |
151 | + if (record.commissionParams && record.commissionParams.length > 0) { | |
152 | + record.commissionParams.forEach((i) => targets.push(i)); | |
153 | + } | |
154 | + if (record.ladderParams && record.ladderParams.length > 0) { | |
155 | + record.ladderParams.forEach((i) => targets.push(i)); | |
156 | + } | |
157 | + const newValue = targets.filter((item: any) => item.targetValue); | |
148 | 158 | if (newValue.length === 1) { |
149 | 159 | return newValue[0].targetType === 2 |
150 | 160 | ? `${newValue[0].targetValue}%` |
... | ... | @@ -160,8 +170,6 @@ const IndivatorsTable = ({ value, onChange, personModal, scopeType }: Props) => |
160 | 170 | } else { |
161 | 171 | return "--"; |
162 | 172 | } |
163 | - } else { | |
164 | - return "--"; | |
165 | 173 | } |
166 | 174 | }, |
167 | 175 | }, | ... | ... |
src/pages/performance/EvaGroupSetting/EditComfirm/components/RewardsTableSal.tsx
... | ... | @@ -104,6 +104,7 @@ const IndivatorsTable = ({ value, onChange, scopeType, personModal }: Props) => |
104 | 104 | { |
105 | 105 | title: "考核目标设置", |
106 | 106 | render: (value: any, record: Item) => { |
107 | + const targets: any = []; | |
107 | 108 | if (record.targets && record.targets.length > 0) { |
108 | 109 | const newValue = record.targets.filter((item: any) => item.targetValue); |
109 | 110 | if (newValue.length === 1) { |
... | ... | @@ -121,8 +122,32 @@ const IndivatorsTable = ({ value, onChange, scopeType, personModal }: Props) => |
121 | 122 | } else { |
122 | 123 | return "--"; |
123 | 124 | } |
124 | - } else { | |
125 | - return "--"; | |
125 | + } else if (!record.targets) { | |
126 | + if (record.conds && record.conds.length > 0) { | |
127 | + record.conds.forEach((i) => targets.push(i)); | |
128 | + } | |
129 | + if (record.commissionParams && record.commissionParams.length > 0) { | |
130 | + record.commissionParams.forEach((i) => targets.push(i)); | |
131 | + } | |
132 | + if (record.ladderParams && record.ladderParams.length > 0) { | |
133 | + record.ladderParams.forEach((i) => targets.push(i)); | |
134 | + } | |
135 | + const newValue = targets.filter((item: any) => item.targetValue); | |
136 | + if (newValue.length === 1) { | |
137 | + return newValue[0].targetType === 2 | |
138 | + ? `${newValue[0].targetValue}%` | |
139 | + : newValue[0].targetType === 3 | |
140 | + ? `${newValue[0].targetValue}元` | |
141 | + : `${newValue[0].targetValue}台`; | |
142 | + } else if (newValue.length > 1) { | |
143 | + return ( | |
144 | + <Button type="link" onClick={() => lookTar(newValue)}> | |
145 | + 查看 | |
146 | + </Button> | |
147 | + ); | |
148 | + } else { | |
149 | + return "--"; | |
150 | + } | |
126 | 151 | } |
127 | 152 | }, |
128 | 153 | }, | ... | ... |
src/pages/performance/KpiGroupSetting/EditComfirm/components/IndivatorsTable.tsx
... | ... | @@ -117,19 +117,21 @@ const IndivatorsTable = ({ value, onChange, personModal }: Props) => { |
117 | 117 | }, |
118 | 118 | { |
119 | 119 | title: "得分设置", |
120 | - render: (_: any, record: Item) => (record.indicatorLadders && record.indicatorLadders.length > 0 ? ( | |
121 | - <Button type="link" onClick={() => onLookLadders(record)}> | |
122 | - 查看 | |
123 | - </Button> | |
120 | + render: (_: any, record: Item) => | |
121 | + record.indicatorLadders && record.indicatorLadders.length > 0 ? ( | |
122 | + <Button type="link" onClick={() => onLookLadders(record)}> | |
123 | + 查看 | |
124 | + </Button> | |
124 | 125 | ) : ( |
125 | 126 | "--" |
126 | - )), | |
127 | + ), | |
127 | 128 | }, |
128 | 129 | { |
129 | 130 | title: "考核目标设置", |
130 | 131 | render: (value: any, record: Item) => { |
131 | - if (record.commissionParams && record.commissionParams.length > 0) { | |
132 | - const newValue = record.commissionParams.filter((item: any) => item.targetValue); | |
132 | + const targets: any = []; | |
133 | + if (record.targets && record.targets.length > 0) { | |
134 | + const newValue = record.targets.filter((item: any) => item.targetValue); | |
133 | 135 | if (newValue.length === 1) { |
134 | 136 | return newValue[0].targetType === 2 |
135 | 137 | ? `${newValue[0].targetValue}%` |
... | ... | @@ -145,8 +147,17 @@ const IndivatorsTable = ({ value, onChange, personModal }: Props) => { |
145 | 147 | } else { |
146 | 148 | return "--"; |
147 | 149 | } |
148 | - } else if (record.ladderParams && record.ladderParams.length > 0) { | |
149 | - const newValue = record.ladderParams.filter((item: any) => item.targetValue); | |
150 | + } else if (!record.targets) { | |
151 | + if (record.conds && record.conds.length > 0) { | |
152 | + record.conds.forEach((i) => targets.push(i)); | |
153 | + } | |
154 | + if (record.commissionParams && record.commissionParams.length > 0) { | |
155 | + record.commissionParams.forEach((i) => targets.push(i)); | |
156 | + } | |
157 | + if (record.ladderParams && record.ladderParams.length > 0) { | |
158 | + record.ladderParams.forEach((i) => targets.push(i)); | |
159 | + } | |
160 | + const newValue = targets.filter((item: any) => item.targetValue); | |
150 | 161 | if (newValue.length === 1) { |
151 | 162 | return newValue[0].targetType === 2 |
152 | 163 | ? `${newValue[0].targetValue}%` |
... | ... | @@ -162,10 +173,8 @@ const IndivatorsTable = ({ value, onChange, personModal }: Props) => { |
162 | 173 | } else { |
163 | 174 | return "--"; |
164 | 175 | } |
165 | - } else { | |
166 | - return "--"; | |
167 | 176 | } |
168 | - } | |
177 | + }, | |
169 | 178 | }, |
170 | 179 | { |
171 | 180 | title: "操作", | ... | ... |