+
{{ form.selectedCategories.join('、') }}
@@ -78,7 +107,14 @@
- 保存预算
+
+ 保存预算
+
@@ -103,7 +139,8 @@ const form = reactive({
category: BudgetCategory.Expense,
limit: '',
selectedCategories: [],
- noLimit: false // 新增字段
+ noLimit: false, // 新增字段
+ isMandatoryExpense: false // 新增:硬性消费
})
const open = ({ data, isEditFlag, category }) => {
@@ -121,7 +158,8 @@ const open = ({ data, isEditFlag, category }) => {
category: category,
limit: data.limit,
selectedCategories: data.selectedCategories ? [...data.selectedCategories] : [],
- noLimit: data.noLimit || false // 新增
+ noLimit: data.noLimit || false, // 新增
+ isMandatoryExpense: data.isMandatoryExpense || false // 新增:硬性消费
})
} else {
Object.assign(form, {
@@ -131,7 +169,8 @@ const open = ({ data, isEditFlag, category }) => {
category: category,
limit: '',
selectedCategories: [],
- noLimit: false // 新增
+ noLimit: false, // 新增
+ isMandatoryExpense: false // 新增:硬性消费
})
}
visible.value = true
@@ -155,7 +194,8 @@ const onSubmit = async () => {
...form,
limit: form.noLimit ? 0 : parseFloat(form.limit), // 不记额时金额为0
selectedCategories: form.selectedCategories,
- noLimit: form.noLimit // 新增
+ noLimit: form.noLimit, // 新增
+ isMandatoryExpense: form.isMandatoryExpense // 新增:硬性消费
}
const res = form.id ? await updateBudget(data) : await createBudget(data)
@@ -187,6 +227,8 @@ const onNoLimitChange = (value) => {
if (value) {
// 选中不记额时,自动设为年度预算
form.type = BudgetPeriodType.Year
+ // 选中不记额时,清除硬性消费选择
+ form.isMandatoryExpense = false
}
}
@@ -218,4 +260,16 @@ const onNoLimitChange = (value) => {
color: var(--van-text-color-2);
padding: 8px 16px;
}
+
+.mandatory-wrapper {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+}
+
+.mandatory-tip {
+ font-size: 11px;
+ color: var(--van-text-color-3);
+ margin-left: 6px;
+}
diff --git a/WebApi/Controllers/BudgetController.cs b/WebApi/Controllers/BudgetController.cs
index 8204260..89bab85 100644
--- a/WebApi/Controllers/BudgetController.cs
+++ b/WebApi/Controllers/BudgetController.cs
@@ -139,7 +139,8 @@ public class BudgetController(
Category = dto.Category,
SelectedCategories = dto.SelectedCategories != null ? string.Join(",", dto.SelectedCategories) : string.Empty,
StartDate = dto.StartDate ?? DateTime.Now,
- NoLimit = dto.NoLimit
+ NoLimit = dto.NoLimit,
+ IsMandatoryExpense = dto.IsMandatoryExpense
};
var varidationError = await ValidateBudgetSelectedCategoriesAsync(budget);
@@ -182,6 +183,7 @@ public class BudgetController(
budget.Category = dto.Category;
budget.SelectedCategories = dto.SelectedCategories != null ? string.Join(",", dto.SelectedCategories) : string.Empty;
budget.NoLimit = dto.NoLimit;
+ budget.IsMandatoryExpense = dto.IsMandatoryExpense;
if (dto.StartDate.HasValue)
{
budget.StartDate = dto.StartDate.Value;
diff --git a/WebApi/Controllers/Dto/BudgetDto.cs b/WebApi/Controllers/Dto/BudgetDto.cs
index 114e91d..281686d 100644
--- a/WebApi/Controllers/Dto/BudgetDto.cs
+++ b/WebApi/Controllers/Dto/BudgetDto.cs
@@ -9,6 +9,7 @@ public class CreateBudgetDto
public string[] SelectedCategories { get; set; } = Array.Empty
();
public DateTime? StartDate { get; set; }
public bool NoLimit { get; set; } = false;
+ public bool IsMandatoryExpense { get; set; } = false;
}
public class UpdateBudgetDto : CreateBudgetDto