From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期四, 09 一月 2025 18:36:56 +0800 Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2 --- utils/coupon-form.js | 81 +++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 15 deletions(-) diff --git a/utils/coupon-form.js b/utils/coupon-form.js index cf3e885..d695a94 100644 --- a/utils/coupon-form.js +++ b/utils/coupon-form.js @@ -28,6 +28,8 @@ obj.elBusForm .getComponentById('minOrderAmount') .$parent.clearValidate() + } else { + updateForm({ minOrderAmount: undefined }) } }, }, @@ -43,6 +45,8 @@ type: 'textarea', rows: 6, }, + default: + '此券每人限领1张。仅限用于花满芫鲜花交易平台鲜切花花款满额使用,不可与其他优惠同享、不可叠加使用', rules: { required: true, message: '请输入使用规则', @@ -53,11 +57,12 @@ label: '优惠券使用条件:', id: 'minOrderAmount', type: 'input-number', - el: { - min: 0, + el: (row) => ({ + min: row.couponDiscountType === 'discount' ? 0.01 : 0, + max: 99999999, precision: 2, controls: false, - }, + }), prefix: '满', unit: '元', rules: { @@ -73,14 +78,29 @@ type: 'input-number', el: { min: 0.01, + max: 99999999, precision: 2, controls: false, }, unit: '元', - rules: { - required: true, - message: '请输入优惠券面值', - trigger: 'blur', + rules: (row) => { + return [ + { + required: true, + message: '请输入优惠券面值', + trigger: 'blur', + }, + { + validator: (rule, value, callback) => { + if (value && row.minOrderAmount && value > row.minOrderAmount) { + callback(new Error('优惠券面值不能大于优惠券使用条件')) + } else { + callback() + } + }, + trigger: 'blur', + }, + ] }, }, ] @@ -144,18 +164,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 +187,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