diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
index 27e41ec0b..c67a8fc8e 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
@@ -26,6 +26,8 @@ public class SysRecipesPlan extends BaseEntity
//@Excel(name = "订单ID")
private Long orderId;
+ private Long cusId;
+
//客户ID
private Long customerId;
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
index 5382f00f9..64f53456f 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
@@ -17,6 +17,7 @@
+
diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js
index cc7729370..e878478bc 100644
--- a/stdiet-ui/src/store/modules/recipes.js
+++ b/stdiet-ui/src/store/modules/recipes.js
@@ -75,15 +75,9 @@ const mutations = {
const actions = {
async init({ commit, dispatch }, payload) {
- const orderResult = await getOrder(payload.cusId);
- if (!orderResult.data.cusId) {
- throw new Error("未找到用户id");
- }
-
- commit("updateStateData", {
- ...payload,
- cusId: orderResult.data.cusId
- });
+ // console.log(payload);
+ //
+ commit("updateStateData", payload);
//
getDicts("cus_cus_unit").then(response => {
commit("updateStateData", { cusUnitOptions: response.data });
@@ -99,8 +93,8 @@ const actions = {
});
//
- if (orderResult.data.cusId) {
- dispatch("getHealthyData", { cusId: orderResult.data.cusId });
+ if (payload.cusId) {
+ dispatch("getHealthyData", payload);
}
// 食谱数据
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 1e22525a2..644357abd 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
@@ -242,7 +242,7 @@ export default {
}
return arr;
}, []);
- console.log(mData);
+ // console.log(mData);
return mData;
},
...mapGetters(["typeDict"]),
@@ -277,7 +277,7 @@ export default {
this.deleteDishes({ num: this.num - 1, id: data.id });
},
handleOnWeightChange(data, weight) {
- console.log({ data, weight });
+ // console.log({ data, weight });
this.updateDishes({
num: this.num - 1,
dishesId: data.dishesId,
@@ -286,7 +286,7 @@ export default {
});
},
handleOnCustomUnitChange(data, { cusWeight, cusUnit }) {
- console.log({ data, cusWeight, cusUnit });
+ // console.log({ data, cusWeight, cusUnit });
this.updateDishes({
num: this.num - 1,
dishesId: data.dishesId,
diff --git a/stdiet-ui/src/views/custom/recipesPlan/index.vue b/stdiet-ui/src/views/custom/recipesPlan/index.vue
index 948c8ebe5..c219e5460 100644
--- a/stdiet-ui/src/views/custom/recipesPlan/index.vue
+++ b/stdiet-ui/src/views/custom/recipesPlan/index.vue
@@ -607,7 +607,7 @@ export default {
},
handleBuild(data) {
// console.log(data);
- const { startDate, endDate, id, orderId, recipesId } = data;
+ const { startDate, endDate, id, cusId, recipesId } = data;
// const params = { id: data.id, cusId: data.orderId };
// const path = `/recipes/build/${orderId}/${id}/${recipesId || 0}`;
@@ -617,7 +617,7 @@ export default {
// });
const queryParam = {
planId: id,
- cusId: orderId,
+ cusId,
};
if (!recipesId) {
queryParam.startDate = startDate;