diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java index 18126b743..8f64679c4 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java @@ -32,8 +32,18 @@ public class SysDishes extends BaseEntity @Excel(name = "做法") private String methods; + private Integer isMain; + private String reviewStatus; + public Integer getIsMain() { + return isMain; + } + + public void setIsMain(Integer isMain) { + this.isMain = isMain; + } + public void setReviewStatus(String reviewStatus) { this.reviewStatus = reviewStatus; } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml index f9b6664c0..a79ab03a5 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml @@ -8,6 +8,7 @@ + @@ -32,7 +33,7 @@ - select id, name, type, methods, create_by, create_time, update_by, update_time, review_status from sys_dishes + select id, name, type, is_main, methods, create_by, create_time, update_by, update_time, review_status from sys_dishes @@ -86,6 +88,7 @@ name, type, + is_main, methods, create_by, review_status @@ -96,6 +99,7 @@ #{name}, #{type}, + #{isMain}, #{methods}, #{createBy}, #{reviewStatus} @@ -110,6 +114,7 @@ name = #{name}, type = #{type}, + is_main = #{isMain}, methods = #{methods}, create_by = #{createBy}, review_status = #{reviewStatus}, diff --git a/stdiet-ui/src/assets/icons/svg/contract.svg b/stdiet-ui/src/assets/icons/svg/contract.svg new file mode 100644 index 000000000..2044fc2f5 --- /dev/null +++ b/stdiet-ui/src/assets/icons/svg/contract.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/stdiet-ui/src/assets/icons/svg/dishes-menu.svg b/stdiet-ui/src/assets/icons/svg/dishes-menu.svg new file mode 100644 index 000000000..1b9bcb02a --- /dev/null +++ b/stdiet-ui/src/assets/icons/svg/dishes-menu.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/stdiet-ui/src/assets/icons/svg/dishes.svg b/stdiet-ui/src/assets/icons/svg/dishes.svg new file mode 100644 index 000000000..772fb5c1b --- /dev/null +++ b/stdiet-ui/src/assets/icons/svg/dishes.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/stdiet-ui/src/assets/icons/svg/ingredient.svg b/stdiet-ui/src/assets/icons/svg/ingredient.svg new file mode 100644 index 000000000..593fb56fc --- /dev/null +++ b/stdiet-ui/src/assets/icons/svg/ingredient.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/stdiet-ui/src/assets/icons/svg/order-list.svg b/stdiet-ui/src/assets/icons/svg/order-list.svg new file mode 100644 index 000000000..506c119b7 --- /dev/null +++ b/stdiet-ui/src/assets/icons/svg/order-list.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/stdiet-ui/src/views/custom/dishes/index.vue b/stdiet-ui/src/views/custom/dishes/index.vue index f41463331..6910435c0 100644 --- a/stdiet-ui/src/views/custom/dishes/index.vue +++ b/stdiet-ui/src/views/custom/dishes/index.vue @@ -1,6 +1,12 @@