From e556c51d397f8783d8b180aa4421d8acd1e657d6 Mon Sep 17 00:00:00 2001 From: mayf <m13160102112@163.com> Date: 星期五, 20 九月 2024 09:27:25 +0800 Subject: [PATCH] fix开始时间大于结束时间问题 --- utils/coupon-form.js | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/utils/coupon-form.js b/utils/coupon-form.js index cf3e885..431fe28 100644 --- a/utils/coupon-form.js +++ b/utils/coupon-form.js @@ -55,6 +55,7 @@ type: 'input-number', el: { min: 0, + max: 99999999, precision: 2, controls: false, }, @@ -73,6 +74,7 @@ type: 'input-number', el: { min: 0.01, + max: 99999999, precision: 2, controls: false, }, @@ -144,18 +146,14 @@ } // 优惠券领取/发放记录 -export const couponRecordColumn = () => { +export const couponRecordColumn = (timeName) => { return [ { label: '序号', type: 'index' }, { label: '店铺名称', prop: 'customerName' }, - { label: '优惠券类型', prop: 'couponDiscountTypeName' }, - { - label: '使用条件', - formatter: (row) => `满${row.minOrderAmount}`, - }, - { label: '优惠券面值', prop: 'couponDiscountValue' }, + { label: '联系方式', prop: 'tel' }, + { label: timeName, prop: 'createTime' }, { label: '状态', prop: 'statusName' }, - { label: '使用时间', prop: 'index' }, + { label: '使用时间', prop: 'usedTime' }, { label: '订单号', prop: 'orderNo' }, ] } @@ -171,3 +169,38 @@ }, } } + +export const getImageUrlRules = (row, form) => { + const id = 'imageUrl' + let required = false + let message = '' + if (row.getType === 'home') { + required = true + message = '图片为必填项目' + } + const curField = form.find((field) => field.id === id) + if (curField && curField.rules && required) { + curField.rules.required = true + curField.rules.message = message + } else if (curField && curField.rules) { + curField.rules.required = false + curField.rules.message = message + } +} + +export const dateTimeRules = (format = 'YYYY-MM-DD HH:mm') => { + return { + validator: (rule, value, callback) => { + if ( + Array.isArray(value) && + value.filter((i) => !!i).length === 2 && + utils.formatDate(value[0], 'YYYY-MM-DD HH:mm') > + utils.formatDate(value[1], 'YYYY-MM-DD HH:mm') + ) { + callback(new Error('开始时间不能大于结束时间')) + } else { + callback() + } + }, + } +} -- Gitblit v1.9.3