diff --git a/src/views/canteen/canteenCategory/form.vue b/src/views/canteen/canteenCategory/form.vue index 7fc0de3..bcf451d 100644 --- a/src/views/canteen/canteenCategory/form.vue +++ b/src/views/canteen/canteenCategory/form.vue @@ -26,6 +26,18 @@ + + + + + + @@ -69,6 +81,7 @@ const form = reactive({ updater: "", deleted: "", deptId: "", + isPriceIncreased: false, categoryType: [], }) @@ -122,7 +135,10 @@ const getcanteenCategoryData = (id: string) => { loading.value = true getObj(id) .then((res: any) => { - Object.assign(form, res.data, { categoryType: res.data.categoryType.split(",") }) + const data = res.data || {} + // 兼容后端返回的布尔/1/0(或字符串) + form.isPriceIncreased = data.isPriceIncreased === true || data.isPriceIncreased === 1 || data.isPriceIncreased === "1" + Object.assign(form, data, { categoryType: (data.categoryType || "").split(",") }) }) .finally(() => { loading.value = false diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue index e67f37e..4b0ec56 100644 --- a/src/views/canteen/canteenCategory/index.vue +++ b/src/views/canteen/canteenCategory/index.vue @@ -66,6 +66,13 @@ + + + @@ -135,6 +142,11 @@ const exportExcel = () => { downBlobFile("/canteen/canteenCategory/export", Object.assign(state.queryForm, { ids: selectObjs }), "每日菜品分类.xlsx") } + // 兼容后端可能返回 true/false 或 1/0 +const formatYesNo = (value: any) => { + return value === true || value === 1 || value === "1" ? "是" : "否" + } + // 多选事件 const selectionChangHandle = (objs: { id: string }[]) => { selectObjs.value = objs.map(({ id }) => id)