diff --git a/projects/admin/src/app/components/dish-form/dish-form.component.html b/projects/admin/src/app/components/dish-form/dish-form.component.html index 6bebea9..3562ed0 100644 --- a/projects/admin/src/app/components/dish-form/dish-form.component.html +++ b/projects/admin/src/app/components/dish-form/dish-form.component.html @@ -44,6 +44,21 @@ + + + 烹饪方式 + + + + + + + + + + + 适用月份 diff --git a/projects/admin/src/app/components/dish-form/dish-form.component.ts b/projects/admin/src/app/components/dish-form/dish-form.component.ts index 259cedd..27e0d22 100644 --- a/projects/admin/src/app/components/dish-form/dish-form.component.ts +++ b/projects/admin/src/app/components/dish-form/dish-form.component.ts @@ -61,6 +61,7 @@ export class DishFormComponent { name: this.fb.control("", [FormValidators.required()]), icon: this.fb.control("", []), mark: this.fb.control("", [FormValidators.required()]), + poly: this.fb.control("", [FormValidators.required()]), month: this.fb.control([], []), }); diff --git a/projects/admin/src/app/pages/dish/dish.component.html b/projects/admin/src/app/pages/dish/dish.component.html index 88c5316..767deb7 100644 --- a/projects/admin/src/app/pages/dish/dish.component.html +++ b/projects/admin/src/app/pages/dish/dish.component.html @@ -42,6 +42,7 @@ + diff --git a/projects/admin/src/app/pages/dish/dish.component.ts b/projects/admin/src/app/pages/dish/dish.component.ts index eb06b13..f38cfb7 100644 --- a/projects/admin/src/app/pages/dish/dish.component.ts +++ b/projects/admin/src/app/pages/dish/dish.component.ts @@ -111,6 +111,7 @@ export class DishComponent { { key: "icon", title: "菜品图片", width: "66px" }, { key: "name", title: "菜品名称" }, { key: "marks", title: "菜品标签" }, + { key: "poly", title: "烹饪方式" }, { key: "ingredient", title: "食材及含量", width: "30%" }, { key: "vender", title: "单位" }, ]); diff --git a/projects/cdk/src/dtos/enum.dto.ts b/projects/cdk/src/dtos/enum.dto.ts index b32346c..cec86f9 100644 --- a/projects/cdk/src/dtos/enum.dto.ts +++ b/projects/cdk/src/dtos/enum.dto.ts @@ -7,6 +7,7 @@ export type GlobalEnum = { venderType: CategoryDTO[]; mealType: OptionItemInterface[]; menuStatus: OptionItemInterface[]; + poly: MarkDTO[]; }; export type CategoryDTO = { diff --git a/projects/client/src/app/components/dish-form/dish-form.component.html b/projects/client/src/app/components/dish-form/dish-form.component.html index 7e1de51..c2a3618 100644 --- a/projects/client/src/app/components/dish-form/dish-form.component.html +++ b/projects/client/src/app/components/dish-form/dish-form.component.html @@ -20,6 +20,18 @@ + + + 烹饪方式 + + + + + + + + 适用月份 diff --git a/projects/client/src/app/components/dish-form/dish-form.component.ts b/projects/client/src/app/components/dish-form/dish-form.component.ts index e011aad..8bc5399 100644 --- a/projects/client/src/app/components/dish-form/dish-form.component.ts +++ b/projects/client/src/app/components/dish-form/dish-form.component.ts @@ -60,6 +60,7 @@ export class DishFormComponent { name: this.fb.control("", [FormValidators.required()]), icon: this.fb.control("", []), mark: this.fb.control("", [FormValidators.required()]), + poly: this.fb.control("", [FormValidators.required()]), month: this.fb.control([], []), }); diff --git a/projects/client/src/app/pages/dish/dish.component.ts b/projects/client/src/app/pages/dish/dish.component.ts index 9e395e1..87c5080 100644 --- a/projects/client/src/app/pages/dish/dish.component.ts +++ b/projects/client/src/app/pages/dish/dish.component.ts @@ -93,6 +93,7 @@ export class DishComponent { { key: "icon", title: "菜品图片", width: "66px" }, { key: "name", title: "菜品名称" }, { key: "marks", title: "菜品标签" }, + { key: "poly", title: "烹饪方式" }, { key: "ingredient", title: "食材及含量", width: "30%" }, ]);