diff --git a/src/api/member/signin/config/index.ts b/src/api/member/signin/config/index.ts index 558bdc70..50a7d63c 100644 --- a/src/api/member/signin/config/index.ts +++ b/src/api/member/signin/config/index.ts @@ -1,10 +1,11 @@ import request from '@/config/axios' export interface SignInConfigVO { - id: number - day: number | null - point: number | null - enable: boolean | null + id?: number + day?: number + point?: number + experience?: number + status?: number } // 查询积分签到规则列表 diff --git a/src/views/member/signin/config/SignInConfigForm.vue b/src/views/member/signin/config/SignInConfigForm.vue index 4d5c3d2d..616fd8fc 100644 --- a/src/views/member/signin/config/SignInConfigForm.vue +++ b/src/views/member/signin/config/SignInConfigForm.vue @@ -13,8 +13,11 @@ 只允许设置 1-7,默认签到 7 天为一个周期 - - + + + + + @@ -46,12 +49,30 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 const formType = ref('') // 表单的类型:create - 新增;update - 修改 -const formData = ref({ - id: undefined, - day: undefined, - point: undefined +const formData = ref({} as SignInConfigApi.SignInConfigVO) +// 奖励校验规则 +const awardValidator = (rule: any, _value: any, callback: any) => { + if (!formData.value.point && !formData.value.experience) { + callback(new Error('奖励积分与奖励经验至少配置一个')) + return + } + + // 清除另一个字段的错误提示 + const otherAwardField = rule?.field === 'point' ? 'experience' : 'point' + formRef.value.validateField(otherAwardField, () => null) + callback() +} +const formRules = reactive({ + day: [{ required: true, message: '签到天数不能空', trigger: 'blur' }], + point: [ + { required: true, message: '奖励积分不能空', trigger: 'blur' }, + { validator: awardValidator, trigger: 'blur' } + ], + experience: [ + { required: true, message: '奖励经验不能空', trigger: 'blur' }, + { validator: awardValidator, trigger: 'blur' } + ] }) -const formRules = reactive({}) const formRef = ref() // 表单 Ref /** 打开弹窗 */ @@ -82,14 +103,11 @@ const submitForm = async () => { // 提交请求 formLoading.value = true try { - const data = formData.value as unknown as SignInConfigApi.SignInConfigVO if (formType.value === 'create') { - //默认新创建的自动启动 - data.enable = true - await SignInConfigApi.createSignInConfig(data) + await SignInConfigApi.createSignInConfig(formData.value) message.success(t('common.createSuccess')) } else { - await SignInConfigApi.updateSignInConfig(data) + await SignInConfigApi.updateSignInConfig(formData.value) message.success(t('common.updateSuccess')) } dialogVisible.value = false @@ -105,7 +123,8 @@ const resetForm = () => { formData.value = { id: undefined, day: undefined, - point: undefined, + point: 0, + experience: 0, status: CommonStatusEnum.ENABLE } formRef.value?.resetFields() diff --git a/src/views/member/signin/config/index.vue b/src/views/member/signin/config/index.vue index 71dc4c6f..da38dad6 100644 --- a/src/views/member/signin/config/index.vue +++ b/src/views/member/signin/config/index.vue @@ -20,7 +20,8 @@ prop="day" :formatter="(_, __, cellValue) => ['第', cellValue, '天'].join(' ')" /> - + +