From 297a97db9e82ab7a8730630cdc12a8a7e565bbb7 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 2 Mar 2021 19:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/store/modules/recipes.js                    | 8 +++++++-
 .../RecipesView/RecipesCom/AddDishesDrawer/index.vue      | 6 ++----
 .../custom/recipesBuild/RecipesView/RecipesCom/index.vue  | 2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js
index 89c1fef86..fabe4fd9e 100644
--- a/stdiet-ui/src/store/modules/recipes.js
+++ b/stdiet-ui/src/store/modules/recipes.js
@@ -95,7 +95,6 @@ const actions = {
       startNum: startNumDay,
       endNum: endNumDay
     });
-
     getDicts("cus_cus_unit").then(response => {
       commit("updateStateData", { cusUnitOptions: response.data });
     });
@@ -269,6 +268,13 @@ const actions = {
     // console.log(params);
   },
   async addDishes({ commit, state }, payload) {
+    const tarDishesList = state.recipesData[payload.num].dishes.filter(
+      obj => obj.type === payload.type
+    );
+    if (tarDishesList.some(obj => obj.dishesId === payload.dishesId)) {
+      console.log("目标餐类已有相同的菜品");
+      throw new Error("目标餐类已有相同的菜品");
+    }
     if (state.recipesId) {
       const tarRecipesObj = state.recipesData[payload.num];
       if (tarRecipesObj && payload.data) {
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 284353565..1b57baf21 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
@@ -99,9 +99,7 @@ export default {
         if (idx === 0) {
           this.selDishes.type = cur;
         }
-        const tarOpt = this.typeOptions.find(
-          (obj) => obj.dictValue === cur
-        );
+        const tarOpt = this.typeOptions.find((obj) => obj.dictValue === cur);
         if (tarOpt) {
           arr.push(tarOpt);
         }
@@ -134,7 +132,7 @@ export default {
         igdList,
       } = this.selDishes;
       this.$emit("onConfirm", {
-        id: -1,
+        id: new Date().getTime(),
         dishesId: id,
         methods,
         name,
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
index 8c9c0264c..44f452be4 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
@@ -350,6 +350,8 @@ export default {
       this.addDishes({
         num: this.num,
         data,
+      }).catch((err) => {
+        this.$message.error(err.message);
       });
     },
     ...mapActions(["updateDishes", "addDishes", "deleteDishes"]),