Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复未生成食谱逻辑错误

Browse Source
This commit is contained in:
huangdeliang
2021-02-23 12:00:06 +08:00
parent 81ce32847a
commit 666cb34d2a
9 changed files with 169 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/ConfigDishes.vue
View File

@ -43,11 +43,11 @@
</el-table-column>
<el-table-column
prop="proteinRatio"
label="蛋白质/100g"
label="P/100g"
align="center"
/>
<el-table-column prop="fatRatio" label="脂肪/100g" align="center" />
<el-table-column prop="carbonRatio" label="碳水/100g" align="center" />
<el-table-column prop="fatRatio" label="F/100g" align="center" />
<el-table-column prop="carbonRatio" label="C/100g" align="center" />
</el-table>
</el-form-item>
<el-form-item label="推荐人群">

4
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
View File

@ -92,7 +92,7 @@ export default {
if (!data) {
return;
}
console.log(data);
// console.log(data);
this.selDishes = data;
this.active = 1;
this.typeOptions = data.type.split(",").reduce((arr, cur, idx) => {
@ -143,7 +143,7 @@ export default {
type,
igdList,
});
console.log(this.selDishes);
// console.log(this.selDishes);
},
},
};

3
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
View File

@ -296,13 +296,14 @@ export default {
});
},
handleOnDishesConfirm(data) {
// console.log(data);
this.addDishes({
num: this.num - 1,
data,
});
},
...mapActions(["updateDishes", "addDishes", "deleteDishes"]),
...mapMutations(["setCurrentDay",]),
...mapMutations(["setCurrentDay"]),
},
};
</script>

25
stdiet-ui/src/views/custom/recipesPlan/index.vue
View File

@ -111,14 +111,14 @@
:data="recipesPlanList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="客户姓名" align="center" prop="customer" />
<el-table-column
<!-- <el-table-column
label="客户手机号"
align="center"
prop="hidePhone"
width="180"
/>
/> -->
<el-table-column
label="食谱日期范围"
align="center"
@ -236,8 +236,7 @@
<!-- 查看完整计划 -->
<el-dialog
title="食谱计划表"
v-if="allRecipesPlanOpen"
:title="allRecipesPlanTitle"
:visible.sync="allRecipesPlanOpen"
width="800px"
append-to-body
@ -269,7 +268,7 @@
</el-form>
<el-table v-loading="loading" :data="allRecipesPlanList" width="700px">
<el-table-column label="客户姓名" align="center" prop="customer" />
<!-- <el-table-column label="客户姓名" align="center" prop="customer" /> -->
<!--<el-table-column label="营养师名称" align="center" prop="nutritionist" />
<el-table-column label="营养师助理名称" align="center" prop="nutritionistAssis" />-->
@ -313,9 +312,9 @@
</el-dialog>
<!-- 查看订单 -->
<order-dialog ref="orderDialog" />
<!-- <order-dialog ref="orderDialog" /> -->
<!-- 查看体征 -->
<body_sign_dialog ref="bodySignDialog" />
<!-- <body_sign_dialog ref="bodySignDialog" /> -->
</div>
</template>
@ -327,8 +326,8 @@ import {
updateRecipesPlan,
} from "@/api/custom/recipesPlan";
import { getOptions } from "@/api/custom/order";
import OrderDetail from "@/components/OrderDetail";
import BodySignDetail from "@/components/BodySignDetail";
// import OrderDetail from "@/components/OrderDetail";
// import BodySignDetail from "@/components/BodySignDetail";
import dayjs from "dayjs";
import store from "@/store";
@ -378,6 +377,7 @@ export default {
allRecipesPlanList: [],
//订单弹窗状态
allRecipesPlanOpen: false,
allRecipesPlanTitle: '',
//订单弹窗中查询参数
allRecipesPlanQueryParam: {
pageNum: 1,
@ -394,8 +394,8 @@ export default {
};
},
components: {
"order-dialog": OrderDetail,
body_sign_dialog: BodySignDetail,
// "order-dialog": OrderDetail,
// body_sign_dialog: BodySignDetail,
},
created() {
getOptions().then((response) => {
@ -476,6 +476,7 @@ export default {
dayjs(item.endDate).format("YYYY-MM-DD");
});
this.allRecipesPlanOpen = true;
this.allRecipesPlanTitle = `「${this.allRecipesPlanList[0].customer}」食谱计划表`
this.allRecipesPlanTotal = response.total;
});
},