From 484fe1cdeb6447b954599c0e9fad94ec13bf8341 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 27 Apr 2021 17:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E5=88=B6=E4=BD=9C=E8=8F=9C?=
 =?UTF-8?q?=E5=93=81=E9=80=89=E6=8B=A9=E5=A2=9E=E5=8A=A0=E9=A3=9F=E6=9D=90?=
 =?UTF-8?q?=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 @@
             <if test="physical != null and physical != ''">
                 and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_rec WHERE physical_signs_id = #{physical})
             </if>
+            <if test="igdName != null and igdName != ''">
+                and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_ingredient WHERE name like concat('%', #{igdName}, '%'))
+            </if>
             <if test="bigClass != null">and big_class = #{bigClass}</if>
             <if test="smallClass != null">and small_class = #{smallClass}</if>
             <if test="reviewStatus != null  and type != ''">and review_status = #{reviewStatus}</if>
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
       >
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="菜品名称" prop="name">
             <el-input
               v-model="queryParams.name"
@@ -19,7 +19,18 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
+          <el-form-item label="包含食材" prop="physical">
+            <el-input
+              v-model="queryParams.igdName"
+              placeholder="请输入食材名称"
+              clearable
+              size="mini"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
           <el-form-item label="菜品种类" prop="dishClass">
             <el-cascader
               filterable
@@ -33,7 +44,7 @@
             ></el-cascader>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
           <el-form-item label="菜品类型" prop="type">
             <el-select
               :disabled="lockType"
@@ -52,7 +63,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item label="推荐体征" prop="physical">
             <el-cascader
               :disabled="lockType"
@@ -92,10 +103,7 @@
       <el-table-column label="菜品名称" align="center" prop="name" />
       <el-table-column label="菜品种类" align="center" prop="bigClass">
         <template slot-scope="scope">
-          <AutoHideMessage
-            :data="dishClassFormat(scope.row)"
-            :maxLength="10"
-          />
+          <AutoHideMessage :data="dishClassFormat(scope.row)" :maxLength="10" />
         </template>
       </el-table-column>
       <el-table-column label="菜品类型" align="center" prop="type">
@@ -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%"
   >
     <div class="content_wrapper">
       <div class="content_detail">