|
|
@@ -100,7 +100,7 @@
|
|
|
</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <template v-if="voucherModel.unusedType == 1">
|
|
|
+ <template v-if="voucherModel.unusedType == 2">
|
|
|
<el-form-item label="" prop="unavailableWeekdays">
|
|
|
<div class="unavailable-dates-container">
|
|
|
<!-- 星期选择 -->
|
|
|
@@ -140,7 +140,7 @@
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
- <el-form-item label="" prop="customUnavailableDates" v-else-if="voucherModel.unusedType == 2">
|
|
|
+ <el-form-item label="" prop="customUnavailableDates" v-else-if="voucherModel.unusedType == 3">
|
|
|
<div class="date-picker-container">
|
|
|
<el-button :icon="Plus" class="add-date-btn" type="primary" @click="addDate"> 添加日期 </el-button>
|
|
|
<div v-for="(item, index) in voucherModel.disableDateList" :key="index" class="date-item">
|
|
|
@@ -435,13 +435,13 @@ const rules = reactive({
|
|
|
unusedType: [{ required: true, message: "请选择不可用日期类型" }],
|
|
|
unavailableWeekdays: [
|
|
|
{
|
|
|
- validator: validateConditionalRequired(() => voucherModel.value.unusedType == 1, "至少需要选择一个星期"),
|
|
|
+ validator: validateConditionalRequired(() => voucherModel.value.unusedType == 2, "至少需要选择一个星期"),
|
|
|
trigger: "change"
|
|
|
}
|
|
|
],
|
|
|
unavailableHolidays: [
|
|
|
{
|
|
|
- validator: validateConditionalRequired(() => voucherModel.value.unusedType == 1, "至少需要选择一个节日"),
|
|
|
+ validator: validateConditionalRequired(() => voucherModel.value.unusedType == 2, "至少需要选择一个节日"),
|
|
|
trigger: "change"
|
|
|
}
|
|
|
],
|
|
|
@@ -449,7 +449,7 @@ const rules = reactive({
|
|
|
{
|
|
|
required: true,
|
|
|
validator: (rule: any, value: any, callback: any) => {
|
|
|
- if (voucherModel.value.unusedType == 2) {
|
|
|
+ if (voucherModel.value.unusedType == 3) {
|
|
|
if (!voucherModel.value.disableDateList || voucherModel.value.disableDateList.length === 0) {
|
|
|
callback(new Error("至少需要添加一个自定义不可用日期"));
|
|
|
return;
|
|
|
@@ -600,14 +600,14 @@ const voucherModel = ref<any>({
|
|
|
buyUseEndTime: "",
|
|
|
// 使用时间(虚拟字段,用于表单验证)
|
|
|
usageTime: null,
|
|
|
- // 有效期类型:0-指定天数,1-指定时间段内可用
|
|
|
+ // 有效期类型:1-指定天数,2-指定时间段内可用
|
|
|
expirationType: "1",
|
|
|
// 有效期天数(当expirationType为1时使用)
|
|
|
expirationDate: 0,
|
|
|
// 有效期时间段(当expirationType为2时使用)
|
|
|
validityPeriod: [],
|
|
|
- // 不可用日期类型:0-全部日期可用,1-限制日期
|
|
|
- unusedType: "0",
|
|
|
+ // 不可用日期类型:1-全部日期可用,2-限制日期
|
|
|
+ unusedType: "1",
|
|
|
// 限制日期 - 星期选择(数组,存储选中的星期值)
|
|
|
unavailableWeekdays: [],
|
|
|
// 限制日期 - 节日选择(数组,存储选中的节日值)
|
|
|
@@ -646,9 +646,9 @@ const validityPeriodList = ref([
|
|
|
|
|
|
// 不可用日期类型列表
|
|
|
const unavailableDateTypeList = ref([
|
|
|
- { value: "0", label: "全部日期可用" },
|
|
|
- { value: "1", label: "限制日期" }
|
|
|
- // { value: '2', label: "自定义不可用日期" }
|
|
|
+ { value: "1", label: "全部日期可用" },
|
|
|
+ { value: "2", label: "限制日期" }
|
|
|
+ // { value: "3", label: "自定义不可用日期" }
|
|
|
]);
|
|
|
|
|
|
// 适用范围类型列表
|
|
|
@@ -798,7 +798,7 @@ watch(
|
|
|
watch(
|
|
|
() => voucherModel.value.unusedType,
|
|
|
newVal => {
|
|
|
- if (newVal == 2) {
|
|
|
+ if (newVal == 3) {
|
|
|
// 切换到自定义不可用日期时,如果disableDateList为空,则添加一个默认项
|
|
|
if (!voucherModel.value.disableDateList || voucherModel.value.disableDateList.length === 0) {
|
|
|
voucherModel.value.disableDateList = [null];
|
|
|
@@ -845,13 +845,13 @@ onMounted(async () => {
|
|
|
voucherModel.value.validityPeriod = [];
|
|
|
}
|
|
|
// 确保星期和节日字段存在;
|
|
|
- if (voucherModel.value.unusedType == 1) {
|
|
|
+ if (voucherModel.value.unusedType == 2) {
|
|
|
const listVal = voucherModel.value.unusedDate ? voucherModel.value.unusedDate.split(";") : [];
|
|
|
voucherModel.value.unavailableWeekdays = listVal[0] ? listVal[0].split(",").filter((item: string) => item) : [];
|
|
|
voucherModel.value.unavailableHolidays = listVal[1] ? listVal[1].split(",").filter((item: string) => item) : [];
|
|
|
}
|
|
|
// 确保自定义不可用日期字段存在;
|
|
|
- if (voucherModel.value.unusedType === 2) {
|
|
|
+ if (voucherModel.value.unusedType === 3) {
|
|
|
if (!voucherModel.value.disableDateList || voucherModel.value.disableDateList.length === 0) {
|
|
|
voucherModel.value.disableDateList = [null];
|
|
|
}
|
|
|
@@ -961,9 +961,9 @@ const handleSubmit = async (submitType?: string) => {
|
|
|
params.validityPeriod = "";
|
|
|
}
|
|
|
// 处理不可用日期
|
|
|
- if (params.unusedType == 1) {
|
|
|
+ if (params.unusedType == 2) {
|
|
|
params.unusedDate = params.unavailableWeekdays.join(",") + ";" + params.unavailableHolidays.join(",");
|
|
|
- } else if (params.unusedType == 2) {
|
|
|
+ } else if (params.unusedType == 3) {
|
|
|
// 处理自定义不可用日期
|
|
|
if (params.disableDateList && params.disableDateList.length > 0) {
|
|
|
params.unusedDate = params.disableDateList
|