From 59dabbc9d32c0f0ef1b3a86556455f71581ca216 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 11 Mar 2021 11:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=80=89=E6=8B=A9=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecipesCom/EditableText/index.vue         |  2 +-
 .../RecipesCom/EditableUnit/index.vue         |  8 +-
 .../RecommendView/TemplateView/index.vue      | 76 +++++++++++++++++++
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableText/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableText/index.vue
index 32fab3a81..43501e00d 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableText/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableText/index.vue
@@ -9,7 +9,7 @@
       :step="5"
       :value="value"
       @blur="handleOnBlur"
-      @keyup.enter="handleEnterClick"
+      @keydown.enter="handleEnterClick"
     />
   </div>
 </template>
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue
index 08f15f796..a72998e82 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue
@@ -14,7 +14,9 @@
           :key="item.dictValue"
           :value="item.dictValue"
         >
-          {{ item.dictLabel }}
+          <div style="width: 120px">
+            {{ item.dictLabel }}
+          </div>
         </option>
       </select>
       <select
@@ -150,6 +152,10 @@ export default {
     select::-ms-expand {
       display: none;
     }
+
+    option {
+      width: 140px;
+    }
   }
 }
 </style>
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue
index 0a19d3dd4..75f581e17 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue
@@ -5,6 +5,59 @@
     </div>
     <div class="content">
       <h2>选择模板</h2>
+      <!-- 筛选 -->
+      <el-form :model="queryParams" ref="queryForm" :inline="true">
+        <el-form-item label="模板名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入模板名称"
+            @keydown.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="营养师" prop="nutritionistId">
+          <el-select
+            v-model="queryParams.nutritionistId"
+            placeholder="请选择营养师"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in nutritionistIdOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="营养师助理" prop="nutriAssisId">
+          <el-select
+            v-model="queryParams.nutriAssisId"
+            placeholder="请选择营养师助理"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in nutriAssisIdOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <!-- 模板列表 -->
       <el-table
         v-loading="loading"
         :data="dataList"
@@ -29,6 +82,7 @@
 </template>
 <script>
 import { listRecipesTemplate } from "@/api/custom/recipesTemplate";
+import { mapState } from "vuex";
 export default {
   name: "TemplateView",
   data() {
@@ -37,6 +91,9 @@ export default {
       dataList: [],
       total: 0,
       queryParams: {
+        name: null,
+        nutritionistId: null,
+        nutriAssisId: null,
         pageNum: 1,
         pageSize: 10,
         reviewStatus: 2,
@@ -44,7 +101,26 @@ export default {
     };
   },
   props: ["view"],
+  computed: {
+    ...mapState({
+      //营养师
+      nutritionistIdOptions: (state) =>
+        state.global.nutritionistIdOptions.slice(1),
+      //营养师助理
+      nutriAssisIdOptions: (state) => state.global.nutriAssisIdOptions.slice(1),
+    }),
+  },
   methods: {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+       /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
     handleOnBackClick() {
       this.$emit("update:view", 0);
       this.queryParams = {