From 75e226d13bf942e8d3c97e2a67169565a34f5202 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 27 Apr 2021 16:28:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8F=9C=E5=93=81=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E9=A3=9F=E6=9D=90=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stdiet-ui/package.json | 3 ++- .../src/views/custom/dishes/EditDishesDrawer/index.vue | 6 +++++- stdiet-ui/src/views/custom/ingredient/index.vue | 6 +++++- .../RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) 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 @@ - + - + + /> From 484fe1cdeb6447b954599c0e9fad94ec13bf8341 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 27 Apr 2021 17:18:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E5=88=B6=E4=BD=9C?= =?UTF-8?q?=E8=8F=9C=E5=93=81=E9=80=89=E6=8B=A9=E5=A2=9E=E5=8A=A0=E9=A3=9F?= =?UTF-8?q?=E6=9D=90=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/stdiet/custom/domain/SysDishes.java | 2 ++ .../mapper/custom/SysDishesMapper.xml | 3 +++ .../AddDishesDrawer/SelectDishes.vue | 25 +++++++++++++------ .../RecipesCom/AddDishesDrawer/index.vue | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) 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/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue index a1a2099fa..896f8d3fe 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue @@ -8,7 +8,7 @@ label-width="68px" @submit.native.prevent > - + - + + + + + + - + - + @@ -232,6 +240,7 @@ export default { pageSize: 10, name: null, type: null, + igdName: null, reviewStatus: "yes", }; this.dishesList = []; 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%" >
From e10af2453baa5875a5f66fdf5118b03af7938c38 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Tue, 27 Apr 2021 17:37:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue index 896f8d3fe..bfa7dc99c 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue @@ -160,6 +160,7 @@ export default { pageSize: 10, name: null, type: null, + igdName: null, smallClass: null, bigClass: null, reviewStatus: "yes", @@ -254,6 +255,7 @@ export default { this.getList({}); }, resetQuery() { + this.clean(); this.resetForm("queryForm"); this.dishClassQueryParam = []; this.handleQuery();