Commit 3833bfeb authored by XieZhiXiong's avatar XieZhiXiong

fix: 修复领券时间与券有效期限制错误的问题

parent 9e88c187
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2021-06-24 14:04:16 * @Date: 2021-06-24 14:04:16
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-11-12 15:22:51 * @LastEditTime: 2021-11-30 20:08:50
* @Description: * @Description:
*/ */
import { FormEffectHooks, FormPath, IFormActions } from '@formily/antd'; import { FormEffectHooks, FormPath, IFormActions } from '@formily/antd';
...@@ -260,17 +260,17 @@ export const useBusinessEffects = (context, actions: IFormActions) => { ...@@ -260,17 +260,17 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
// 领(发)券起始时间 // 领(发)券起始时间
onFieldValueChange$('[releaseTimeStart, releaseTimeEnd]').subscribe(state => { onFieldValueChange$('[releaseTimeStart, releaseTimeEnd]').subscribe(state => {
const { value } = state; const { value } = state;
const releaseTimeStartValue = value?.[0]; const releaseTimeEndValue = value?.[1];
const effectiveTime = getFieldValue('[effectiveTimeStart, effectiveTimeEnd]'); // 券有效期 const effectiveTime = getFieldValue('[effectiveTimeStart, effectiveTimeEnd]'); // 券有效期
const effectiveTimeStartValue = effectiveTime?.[0]; const effectiveTimeStartValue = effectiveTime?.[0];
if ( if (
releaseTimeStartValue releaseTimeEndValue
&& effectiveTimeStartValue && effectiveTimeStartValue
&& moment(releaseTimeStartValue) > moment(effectiveTimeStartValue) && moment(releaseTimeEndValue) > moment(effectiveTimeStartValue)
) { ) {
setFieldState('[releaseTimeStart, releaseTimeEnd]', fieldState => { setFieldState('[releaseTimeStart, releaseTimeEnd]', fieldState => {
FormPath.setIn(fieldState, 'errors', '领(发)券起始时间应该小于券有效期起始时间'); FormPath.setIn(fieldState, 'errors', '领(发)券截止时间应该小于券有效期起始时间');
}); });
} else { } else {
actions.clearErrors('[releaseTimeStart, releaseTimeEnd]'); actions.clearErrors('[releaseTimeStart, releaseTimeEnd]');
...@@ -282,15 +282,15 @@ export const useBusinessEffects = (context, actions: IFormActions) => { ...@@ -282,15 +282,15 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
const { value } = state; const { value } = state;
const effectiveTimeStartValue = value?.[0]; const effectiveTimeStartValue = value?.[0];
const releaseTime = getFieldValue('[releaseTimeStart, releaseTimeEnd]'); // 券有效期 const releaseTime = getFieldValue('[releaseTimeStart, releaseTimeEnd]'); // 券有效期
const releaseTimeStartValue = releaseTime?.[0]; const releaseTimeEndValue = releaseTime?.[1];
if ( if (
effectiveTimeStartValue effectiveTimeStartValue
&& releaseTimeStartValue && releaseTimeEndValue
&& moment(effectiveTimeStartValue) < moment(releaseTimeStartValue) && moment(effectiveTimeStartValue) < moment(releaseTimeEndValue)
) { ) {
setFieldState('[effectiveTimeStart, effectiveTimeEnd]', fieldState => { setFieldState('[effectiveTimeStart, effectiveTimeEnd]', fieldState => {
FormPath.setIn(fieldState, 'errors', '券有效期起始时间应该大于等于领(发)券起始时间'); FormPath.setIn(fieldState, 'errors', '券有效期起始时间应该大于等于领(发)券截止时间');
}); });
} else { } else {
actions.clearErrors('[effectiveTimeStart, effectiveTimeEnd]'); actions.clearErrors('[effectiveTimeStart, effectiveTimeEnd]');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment