Commit 5f3c3ca892713ea5152ea72568316581dbf1ce80
1 parent
912d0005
pc考评bugfix
Showing
2 changed files
with
29 additions
and
22 deletions
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx
| @@ -219,7 +219,6 @@ export default function CreateModal(props: Props) { | @@ -219,7 +219,6 @@ export default function CreateModal(props: Props) { | ||
| 219 | onChange={(value) => { | 219 | onChange={(value) => { |
| 220 | const _type = value; | 220 | const _type = value; |
| 221 | setCalType(_type); | 221 | setCalType(_type); |
| 222 | - console.log(calType); | ||
| 223 | }} | 222 | }} |
| 224 | > | 223 | > |
| 225 | <Option value={1} key={1}> | 224 | <Option value={1} key={1}> |
| @@ -343,27 +342,29 @@ export default function CreateModal(props: Props) { | @@ -343,27 +342,29 @@ export default function CreateModal(props: Props) { | ||
| 343 | > | 342 | > |
| 344 | {({ getFieldValue }) => { | 343 | {({ getFieldValue }) => { |
| 345 | const rankType = getFieldValue("rankType"); | 344 | const rankType = getFieldValue("rankType"); |
| 346 | - if (rankType == 1 && !currentItem.ladders) { | 345 | + if (rankType == 1 && (!currentItem.ladders || currentItem.ladders.length == 0)) { |
| 347 | form.setFieldValue("ladders", [{ lower: 1, money: 0, key: 0, rankOrderType: 1 }]); | 346 | form.setFieldValue("ladders", [{ lower: 1, money: 0, key: 0, rankOrderType: 1 }]); |
| 348 | - } else if (rankType == 2 && !currentItem.ladders) { | 347 | + } else if (rankType == 2 && (!currentItem.ladders || currentItem.ladders.length == 0)) { |
| 348 | + form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0, rankOrderType: 1 }]); | ||
| 349 | + } else if (!rankType && (!currentItem.ladders || currentItem.ladders.length == 0)) { | ||
| 349 | form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0, rankOrderType: 1 }]); | 350 | form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0, rankOrderType: 1 }]); |
| 350 | } | 351 | } |
| 351 | - return ( | ||
| 352 | - <Form.Item | ||
| 353 | - name="ladders" | ||
| 354 | - label="排名设置" | ||
| 355 | - rules={[{ required: true, message: "请配置排名" }]} | ||
| 356 | - style={{ width: "100%" }} | ||
| 357 | - > | ||
| 358 | - <RankModal | ||
| 359 | - visible | ||
| 360 | - isPercent={isPercent} | ||
| 361 | - laddersType={currentItem?.laddersType} | ||
| 362 | - calType={calType} | ||
| 363 | - rankType={rankType} | ||
| 364 | - /> | ||
| 365 | - </Form.Item> | ||
| 366 | - ); | 352 | + return ( |
| 353 | + <Form.Item | ||
| 354 | + name="ladders" | ||
| 355 | + label="排名设置" | ||
| 356 | + rules={[{ required: true, message: "请配置排名" }]} | ||
| 357 | + style={{ width: "100%" }} | ||
| 358 | + > | ||
| 359 | + <RankModal | ||
| 360 | + visible | ||
| 361 | + isPercent={isPercent} | ||
| 362 | + laddersType={currentItem?.laddersType} | ||
| 363 | + calType={calType} | ||
| 364 | + rankType={rankType} | ||
| 365 | + /> | ||
| 366 | + </Form.Item> | ||
| 367 | + ); | ||
| 367 | }} | 368 | }} |
| 368 | </Form.Item> | 369 | </Form.Item> |
| 369 | </> | 370 | </> |
| @@ -433,11 +434,12 @@ export default function CreateModal(props: Props) { | @@ -433,11 +434,12 @@ export default function CreateModal(props: Props) { | ||
| 433 | > | 434 | > |
| 434 | {({ getFieldValue }) => { | 435 | {({ getFieldValue }) => { |
| 435 | const caculateType = getFieldValue("calMethod"); | 436 | const caculateType = getFieldValue("calMethod"); |
| 437 | + // console.log(caculateType, currentItem); | ||
| 436 | //阶梯（总） | 438 | //阶梯（总） |
| 437 | if (caculateType == 3 || caculateType == 5) { | 439 | if (caculateType == 3 || caculateType == 5) { |
| 438 | - if (caculateType == 3 && !currentItem.ladders) { | 440 | + if (caculateType == 3 && (!currentItem.ladders || currentItem.ladders.length == 0)) { |
| 439 | form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0 }]); | 441 | form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0 }]); |
| 440 | - } else if (caculateType == 5 && !currentItem.ladders) { | 442 | + } else if (caculateType == 5 && (!currentItem.ladders || currentItem.ladders.length == 0)) { |
| 441 | form.setFieldValue("ladders", [{ lower: 0, money: 0, capMoney: 0, key: 0 }]); | 443 | form.setFieldValue("ladders", [{ lower: 0, money: 0, capMoney: 0, key: 0 }]); |
| 442 | } | 444 | } |
| 443 | return ( | 445 | return ( |
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
| @@ -166,6 +166,7 @@ const TotalAmount = ({ | @@ -166,6 +166,7 @@ const TotalAmount = ({ | ||
| 166 | }; | 166 | }; |
| 167 | 167 | ||
| 168 | const _add = async (key: React.Key, record: Item) => { | 168 | const _add = async (key: React.Key, record: Item) => { |
| 169 | + // console.log("record.key", record.key); | ||
| 169 | try { | 170 | try { |
| 170 | const row = (await form.validateFields()) as Item; | 171 | const row = (await form.validateFields()) as Item; |
| 171 | let newData = [...value.map((i) => ({ ...i }))]; | 172 | let newData = [...value.map((i) => ({ ...i }))]; |
| @@ -320,7 +321,11 @@ const TotalAmount = ({ | @@ -320,7 +321,11 @@ const TotalAmount = ({ | ||
| 320 | const editable = isEditing(record); | 321 | const editable = isEditing(record); |
| 321 | return editable ? ( | 322 | return editable ? ( |
| 322 | <Space split={<Divider type="vertical" />}> | 323 | <Space split={<Divider type="vertical" />}> |
| 323 | - <Typography.Link onClick={() => _add(record.key, record)} style={{ marginRight: 8 }}> | 324 | + <Typography.Link |
| 325 | + onClick={() => _add(record.key, record)} | ||
| 326 | + style={{ marginRight: 8 }} | ||
| 327 | + disabled={index !== value?.length - 1} | ||
| 328 | + > | ||
| 324 | 保存并新增排名区间 | 329 | 保存并新增排名区间 |
| 325 | </Typography.Link> | 330 | </Typography.Link> |
| 326 | <Typography.Link onClick={() => save(record.key, record)} style={{ marginRight: 8 }}> | 331 | <Typography.Link onClick={() => save(record.key, record)} style={{ marginRight: 8 }}> |