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 68d0f41b4..1d441a097 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
@@ -95,4 +95,6 @@ public class SysDishes {
private String physical;
+ private String igdName;
+
}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml
index d19bc5ef0..2ef345d3d 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml
@@ -53,6 +53,9 @@
and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_rec WHERE physical_signs_id = #{physical})
+
+ and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_ingredient WHERE name like concat('%', #{igdName}, '%'))
+
and big_class = #{bigClass}
and small_class = #{smallClass}
and review_status = #{reviewStatus}
diff --git a/stdiet-ui/package.json b/stdiet-ui/package.json
index c5cccb06c..dc83779d1 100644
--- a/stdiet-ui/package.json
+++ b/stdiet-ui/package.json
@@ -74,7 +74,8 @@
"vue-scrollto": "^2.20.0",
"vue-splitpane": "1.0.4",
"vuedraggable": "2.20.0",
- "vuex": "3.1.0"
+ "vuex": "3.1.0",
+ "wangeditor": "^4.6.16"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.4",
diff --git a/stdiet-ui/src/views/custom/dishes/EditDishesDrawer/index.vue b/stdiet-ui/src/views/custom/dishes/EditDishesDrawer/index.vue
index 3e5377105..f16bb14cb 100644
--- a/stdiet-ui/src/views/custom/dishes/EditDishesDrawer/index.vue
+++ b/stdiet-ui/src/views/custom/dishes/EditDishesDrawer/index.vue
@@ -16,7 +16,11 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
@@ -152,6 +160,7 @@ export default {
pageSize: 10,
name: null,
type: null,
+ igdName: null,
smallClass: null,
bigClass: null,
reviewStatus: "yes",
@@ -232,6 +241,7 @@ export default {
pageSize: 10,
name: null,
type: null,
+ igdName: null,
reviewStatus: "yes",
};
this.dishesList = [];
@@ -245,6 +255,7 @@ export default {
this.getList({});
},
resetQuery() {
+ this.clean();
this.resetForm("queryForm");
this.dishClassQueryParam = [];
this.handleQuery();
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
index 85b55b313..bfc9cab6b 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
@@ -7,7 +7,7 @@
:wrapperClosable="false"
class="add_dishes_drawer_wrapper"
direction="ltr"
- size="40%"
+ size="45%"
>