Commit 3ad0691413e15147a321d95c407815e48c07e6ac
Merge branch 'bug_fix' of gitlab.feewee.cn:FEV2/fw-cms into ehr-archives
Showing
3 changed files
with
57 additions
and
40 deletions
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx
... | ... | @@ -219,7 +219,6 @@ export default function CreateModal(props: Props) { |
219 | 219 | onChange={(value) => { |
220 | 220 | const _type = value; |
221 | 221 | setCalType(_type); |
222 | - console.log(calType); | |
223 | 222 | }} |
224 | 223 | > |
225 | 224 | <Option value={1} key={1}> |
... | ... | @@ -343,27 +342,29 @@ export default function CreateModal(props: Props) { |
343 | 342 | > |
344 | 343 | {({ getFieldValue }) => { |
345 | 344 | const rankType = getFieldValue("rankType"); |
346 | - if (rankType == 1 && !currentItem.ladders) { | |
345 | + if (rankType == 1 && (!currentItem.ladders || currentItem.ladders.length == 0)) { | |
347 | 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 | 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 | 369 | </Form.Item> |
369 | 370 | </> |
... | ... | @@ -433,11 +434,12 @@ export default function CreateModal(props: Props) { |
433 | 434 | > |
434 | 435 | {({ getFieldValue }) => { |
435 | 436 | const caculateType = getFieldValue("calMethod"); |
437 | + // console.log(caculateType, currentItem); | |
436 | 438 | //阶梯(总) |
437 | 439 | if (caculateType == 3 || caculateType == 5) { |
438 | - if (caculateType == 3 && !currentItem.ladders) { | |
440 | + if (caculateType == 3 && (!currentItem.ladders || currentItem.ladders.length == 0)) { | |
439 | 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 | 443 | form.setFieldValue("ladders", [{ lower: 0, money: 0, capMoney: 0, key: 0 }]); |
442 | 444 | } |
443 | 445 | return ( | ... | ... |
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
... | ... | @@ -166,6 +166,7 @@ const TotalAmount = ({ |
166 | 166 | }; |
167 | 167 | |
168 | 168 | const _add = async (key: React.Key, record: Item) => { |
169 | + // console.log("record.key", record.key); | |
169 | 170 | try { |
170 | 171 | const row = (await form.validateFields()) as Item; |
171 | 172 | let newData = [...value.map((i) => ({ ...i }))]; |
... | ... | @@ -320,7 +321,11 @@ const TotalAmount = ({ |
320 | 321 | const editable = isEditing(record); |
321 | 322 | return editable ? ( |
322 | 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 | 330 | </Typography.Link> |
326 | 331 | <Typography.Link onClick={() => save(record.key, record)} style={{ marginRight: 8 }}> | ... | ... |
src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx
... | ... | @@ -59,6 +59,9 @@ function PlayBackPicker(props: any) { |
59 | 59 | const { _d: checkDate, _i: nowDate } = date; |
60 | 60 | const checkYear = moment(checkDate).format('YYYY-MM-DD'); |
61 | 61 | const nowYear = moment(nowDate).format('YYYY-MM-DD'); |
62 | + const checkHours = moment(checkDate).format('HH'); | |
63 | + const nowHours = moment(nowDate).format('HH'); | |
64 | + | |
62 | 65 | // if (type === 'start') { |
63 | 66 | // const hour = moment(date).hour(); |
64 | 67 | // const minute = moment(date).minute(); |
... | ... | @@ -83,24 +86,30 @@ function PlayBackPicker(props: any) { |
83 | 86 | // }, |
84 | 87 | // }; |
85 | 88 | // } |
86 | - if (checkYear === nowYear) { | |
87 | - const nowHour = moment(nowDate).hour(); | |
88 | - const nowMinute = moment(nowDate).minute(); | |
89 | - const nowSecond = moment(nowDate).second(); | |
90 | - return { | |
91 | - disabledHours: () => { | |
92 | - const disabledArr = timeArr(24).splice(nowHour, timeArr(24).length - nowHour); | |
93 | - return disabledArr; | |
94 | - }, | |
95 | - disabledMinutes: () => { | |
96 | - const disabledArr = timeArr(60).splice(nowMinute, timeArr(60).length - nowMinute); | |
97 | - return disabledArr; | |
98 | - }, | |
99 | - disabledSeconds: () => { | |
100 | - const disabledArr = timeArr(60).splice(nowSecond, timeArr(60).length - nowSecond); | |
101 | - return disabledArr; | |
102 | - }, | |
103 | - }; | |
89 | + | |
90 | + const nowHour = moment(nowDate).hour(); | |
91 | + const nowMinute = moment(nowDate).minute(); | |
92 | + const nowSecond = moment(nowDate).second(); | |
93 | + const resultLimit = { | |
94 | + // type: 'end', | |
95 | + disabledHours: () => { | |
96 | + const disabledArr = timeArr(24).splice(nowHour + 1, timeArr(24).length - nowHour); | |
97 | + return disabledArr; | |
98 | + }, | |
99 | + disabledMinutes: () => { | |
100 | + const disabledArr = timeArr(60).splice(nowMinute, timeArr(60).length - nowMinute); | |
101 | + return disabledArr; | |
102 | + }, | |
103 | + disabledSeconds: () => { | |
104 | + const disabledArr = timeArr(60).splice(nowSecond, timeArr(60).length - nowSecond); | |
105 | + return disabledArr; | |
106 | + }, | |
107 | + }; | |
108 | + if (checkYear === nowYear && checkHours !== nowHours) { | |
109 | + return { disabledHours: resultLimit.disabledHours }; | |
110 | + } | |
111 | + if (checkYear === nowYear && checkHours === nowHours) { | |
112 | + return resultLimit; | |
104 | 113 | } |
105 | 114 | }; |
106 | 115 | /** |
... | ... | @@ -135,6 +144,7 @@ function PlayBackPicker(props: any) { |
135 | 144 | }} |
136 | 145 | disabledDate={disabledDate} |
137 | 146 | disabledTime={disabledTracksTime} |
147 | + // max={disabledTracksTime} | |
138 | 148 | onCalendarChange={ |
139 | 149 | (value: any) => { |
140 | 150 | setDateFlag(value); | ... | ... |