diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java
index 9c38d2f2a..46523212a 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java
@@ -1,5 +1,6 @@
package com.stdiet.custom.service.impl;
+import com.stdiet.common.utils.StringUtils;
import com.stdiet.custom.domain.SysRecipes;
import com.stdiet.custom.domain.SysRecipesDaily;
import com.stdiet.custom.domain.SysRecipesDailyDishes;
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml
index baa055611..9edc9c56b 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesMapper.xml
@@ -144,7 +144,7 @@
insert into sys_customer_menu_dishes (menu_id, type, dishes_id, remark, detail) values
- (#{item.menuId}, #{item.type}, #{item.dishesId}, #{remark}, #{item.detail, jdbcType=OTHER, typeHandler=com.stdiet.custom.typehandler.ArrayJsonHandler})
+ (#{item.menuId}, #{item.type}, #{item.dishesId}, #{item.remark}, #{item.detail, jdbcType=OTHER, typeHandler=com.stdiet.custom.typehandler.ArrayJsonHandler})
diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
index 31a2dc5ce..341066c93 100644
--- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
+++ b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
@@ -17,7 +17,7 @@
class="copyBtn"
:data-clipboard-text="copyValue"
@click="handleOnRecipesLinkClick"
- >客户食谱链接
+ >食谱链接
diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js
index 6c20b9ad5..1d5287ee0 100644
--- a/stdiet-ui/src/store/modules/recipes.js
+++ b/stdiet-ui/src/store/modules/recipes.js
@@ -14,6 +14,7 @@ import { getDicts } from "@/api/system/dict/data";
const oriState = {
cusId: undefined,
+ name: undefined,
planId: undefined,
temId: undefined,
recipesId: undefined,
@@ -269,6 +270,7 @@ const actions = {
dishes: menu.dishes.map(dObj => ({
dishesId: dObj.dishesId,
type: dObj.type,
+ remark: dObj.remark,
detail: dObj.igdList.map(igd => ({
id: igd.id,
weight: igd.weight,
@@ -286,7 +288,7 @@ const actions = {
dispatch("getRecipesInfo", { recipesId });
payload.callback &&
payload.callback({
- name: state.healthyData.name,
+ name: state.name,
planId: state.planId
});
}
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 241bc7d42..18afee880 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
@@ -415,9 +415,6 @@ export default {
handleParentClick(e) {
// 校验某天
this.setCurrentDay({ currentDay: this.num });
- VueScrollTo.scrollTo(`#recipes${this.num}`, 500, {
- container: "#recipes_content",
- });
},
spanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
@@ -440,6 +437,9 @@ export default {
e.stopPropagation();
// 取消高亮
this.resetCurrentDay({ currentDay: this.num });
+ VueScrollTo.scrollTo(`#recipes${this.num}`, 500, {
+ container: "#recipes_content",
+ });
},
handleOnAdd() {
// console.log(this.num);
diff --git a/stdiet-ui/src/views/custom/recipesBuild/index.vue b/stdiet-ui/src/views/custom/recipesBuild/index.vue
index bff934201..03d8aa970 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/index.vue
@@ -42,6 +42,7 @@ export default {
mounted() {
this.init({
planId: this.planId,
+ name: this.name,
temId: this.temId,
}).catch((err) => {
this.$message.error(err.message);