diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java deleted file mode 100644 index 6ade85a44..000000000 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanModelController.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.stdiet.web.controller.custom; - -import com.stdiet.common.core.controller.BaseController; -import com.stdiet.common.core.domain.AjaxResult; -import com.stdiet.common.core.page.TableDataInfo; -import com.stdiet.custom.domain.SysRecipesPlanModel; -import com.stdiet.custom.service.ISysRecipesPlanModelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 食谱模板 - * - * @author wonder - * @date 2021-02-27 - */ -@RestController -@RequestMapping("/recipes/model") -public class SysRecipesPlanModelController extends BaseController { - @Autowired - private ISysRecipesPlanModelService iSysRecipesPlanModelService; - - /** - * 查询 - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesModel:list')") - @GetMapping("/list") - public TableDataInfo list(SysRecipesPlanModel sysRecipesPlanModel) { - startPage(); - List list = iSysRecipesPlanModelService.selectRecipesModelListByCondition(sysRecipesPlanModel); - return getDataTable(list); - } - - /** - * 添加 - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesModel:edit')") - @PostMapping("/add") - public AjaxResult add(SysRecipesPlanModel sysRecipesPlanModel) { - return toAjax(iSysRecipesPlanModelService.insertRecipsesModel(sysRecipesPlanModel)); - } - - /** - * 更新 - * - * @param sysRecipesPlanModel - * @return - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')") - @PutMapping(value = "/update") - public AjaxResult update(SysRecipesPlanModel sysRecipesPlanModel) { - return toAjax(iSysRecipesPlanModelService.updateRecipesModel(sysRecipesPlanModel)); - } - - /** - * 删除 - */ - @PreAuthorize("@ss.hasPermi('recipes:recipesPlan:query')") - @DeleteMapping(value = "/delete/{id}") - public AjaxResult delete(@PathVariable("id") Long id) { - return AjaxResult.success(iSysRecipesPlanModelService.removeRecipesModel(id)); - } - - -} \ No newline at end of file diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java new file mode 100644 index 000000000..ffb0c8cca --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesTemplateController.java @@ -0,0 +1,71 @@ +package com.stdiet.web.controller.custom; + +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.core.page.TableDataInfo; +import com.stdiet.custom.domain.SysRecipesTemplate; +import com.stdiet.custom.service.ISysRecipesTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 食谱模板 + * + * @author wonder + * @date 2021-02-27 + */ +@RestController +@RequestMapping("/recipes/template") +public class SysRecipesTemplateController extends BaseController { + @Autowired + private ISysRecipesTemplateService iSysRecipesTemplateService; + + /** + * 查询 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')") + @GetMapping("/list") + public TableDataInfo list(SysRecipesTemplate sysRecipesTemplate) { + startPage(); + List list = iSysRecipesTemplateService.selectRecipesTemplateListByCondition(sysRecipesTemplate); + return getDataTable(list); + } + + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')") + @GetMapping(value = "/{id}") + public AjaxResult detail(@PathVariable Long id) { + return AjaxResult.success(iSysRecipesTemplateService.getRecipesTemplateById(id)); + } + + /** + * 添加 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:edit')") + @PostMapping("/add") + public AjaxResult add(@RequestBody SysRecipesTemplate sysRecipesTemplate) { + return toAjax(iSysRecipesTemplateService.insertRecipsesTemplate(sysRecipesTemplate)); + } + + /** + * 更新 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:list')") + @PutMapping(value = "/update") + public AjaxResult update(@RequestBody SysRecipesTemplate sysRecipesTemplate) { + return toAjax(iSysRecipesTemplateService.updateRecipesTemplate(sysRecipesTemplate)); + } + + /** + * 删除 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesTemplate:query')") + @DeleteMapping(value = "/delete/{id}") + public AjaxResult delete(@PathVariable("id") Long id) { + return AjaxResult.success(iSysRecipesTemplateService.removeRecipesTemplate(id)); + } + + +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java similarity index 51% rename from stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java rename to stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java index f491891cd..f09334a9a 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java @@ -1,23 +1,32 @@ package com.stdiet.custom.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @Data -public class SysRecipesPlanModel { +public class SysRecipesTemplate { Long id; + String name; + Long nutritionistId; + String nutritionist; + Long nutriAssisId; + String nutriAssis; + Long planId; String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date createTime; String updateBy; @@ -25,4 +34,6 @@ public class SysRecipesPlanModel { String createBy; Long recipesId; + + Integer reviewStatus; } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java deleted file mode 100644 index 12909be6c..000000000 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.stdiet.custom.mapper; - -import com.stdiet.custom.domain.SysRecipesPlan; -import com.stdiet.custom.domain.SysRecipesPlanListInfo; -import com.stdiet.custom.domain.SysRecipesPlanModel; - -import java.util.List; - -/** - * 食谱计划Mapper接口 - * - * @author wonder - * @date 2021-02-27 - */ -public interface SysRecipesPlanModelMapper -{ - List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel); - - int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int removeRecipesModel(Long id); -} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java new file mode 100644 index 000000000..ca5613d15 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java @@ -0,0 +1,23 @@ +package com.stdiet.custom.mapper; + +import com.stdiet.custom.domain.SysRecipesTemplate; + +import java.util.List; + +/** + * 食谱计划Mapper接口 + * + * @author wonder + * @date 2021-02-27 + */ +public interface SysRecipesTemplateMapper { + List selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate); + + int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int removeRecipesTemplate(Long id); + + SysRecipesTemplate getRecipesTemplateById(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java deleted file mode 100644 index f227cc3ce..000000000 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.stdiet.custom.service; - -import com.stdiet.custom.domain.SysRecipesPlan; -import com.stdiet.custom.domain.SysRecipesPlanListInfo; -import com.stdiet.custom.domain.SysRecipesPlanModel; - -import java.util.List; - -/** - * 食谱计划Service接口 - * - * @author wonder - * @date 2021-02-27 - */ -public interface ISysRecipesPlanModelService -{ - - List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel); - - int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel); - - int removeRecipesModel(Long id); -} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java new file mode 100644 index 000000000..c2ac9c22d --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java @@ -0,0 +1,24 @@ +package com.stdiet.custom.service; + +import com.stdiet.custom.domain.SysRecipesTemplate; + +import java.util.List; + +/** + * 食谱计划Service接口 + * + * @author wonder + * @date 2021-02-27 + */ +public interface ISysRecipesTemplateService { + + List selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate); + + int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate); + + int removeRecipesTemplate(Long id); + + SysRecipesTemplate getRecipesTemplateById(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java deleted file mode 100644 index f2e5876da..000000000 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.stdiet.custom.service.impl; - -import com.stdiet.common.utils.DateUtils; -import com.stdiet.common.utils.SecurityUtils; -import com.stdiet.custom.domain.SysRecipesPlan; -import com.stdiet.custom.domain.SysRecipesPlanModel; -import com.stdiet.custom.mapper.SysRecipesPlanMapper; -import com.stdiet.custom.mapper.SysRecipesPlanModelMapper; -import com.stdiet.custom.service.ISysRecipesPlanModelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * 食谱计划Service业务层处理 - * - * @author wonder - * @date 2021-02-27 - */ -@Service("sysRecipesPlanModelService") -@Transactional -public class SysRecipesPlanModelServiceImpl implements ISysRecipesPlanModelService { - - @Autowired - SysRecipesPlanModelMapper sysRecipesPlanModelMapper; - - @Autowired - SysRecipesPlanMapper sysRecipesPlanMapper; - - @Override - public List selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel) { - return sysRecipesPlanModelMapper.selectRecipesModelListByCondition(sysRecipesPlanModel); - } - - @Override - public int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel) { - SysRecipesPlan sysRecipesPlan = new SysRecipesPlan(); - sysRecipesPlan.setStartNumDay(1); - sysRecipesPlan.setEndNumDay(7); - sysRecipesPlan.setType(1); - int rows = sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan); - if (rows > 0) { - sysRecipesPlanModel.setCreateBy(SecurityUtils.getUsername()); - sysRecipesPlanModel.setCreateTime(DateUtils.getNowDate()); - sysRecipesPlanModel.setPlanId(sysRecipesPlan.getId()); - return sysRecipesPlanModelMapper.insertRecipsesModel(sysRecipesPlanModel); - } - return 0; - } - - @Override - public int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel) { - sysRecipesPlanModel.setUpdateBy(SecurityUtils.getUsername()); - sysRecipesPlanModel.setUpdateTime(DateUtils.getNowDate()); - return sysRecipesPlanModelMapper.updateRecipesModel(sysRecipesPlanModel); - } - - @Override - public int removeRecipesModel(Long id) { - return sysRecipesPlanModelMapper.removeRecipesModel(id); - } - - -} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java new file mode 100644 index 000000000..ad260731a --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java @@ -0,0 +1,70 @@ +package com.stdiet.custom.service.impl; + +import com.stdiet.common.utils.DateUtils; +import com.stdiet.common.utils.SecurityUtils; +import com.stdiet.common.utils.StringUtils; +import com.stdiet.custom.domain.SysRecipesPlan; +import com.stdiet.custom.domain.SysRecipesTemplate; +import com.stdiet.custom.mapper.SysRecipesPlanMapper; +import com.stdiet.custom.mapper.SysRecipesTemplateMapper; +import com.stdiet.custom.service.ISysRecipesTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 食谱计划Service业务层处理 + * + * @author wonder + * @date 2021-02-27 + */ +@Service("sysRecipesPlanModelService") +@Transactional +public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService { + + @Autowired + SysRecipesTemplateMapper sysRecipesTemplateMapper; + + @Autowired + SysRecipesPlanMapper sysRecipesPlanMapper; + + @Override + public List selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate) { + return sysRecipesTemplateMapper.selectRecipesTemplateListByCondition(sysRecipesTemplate); + } + + @Override + public int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate) { + SysRecipesPlan sysRecipesPlan = new SysRecipesPlan(); + sysRecipesPlan.setStartNumDay(1); + sysRecipesPlan.setEndNumDay(7); + sysRecipesPlan.setType(1); + sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan); + if (!StringUtils.isNull(sysRecipesPlan.getId())) { + sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername()); + sysRecipesTemplate.setCreateTime(DateUtils.getNowDate()); + sysRecipesTemplate.setPlanId(sysRecipesPlan.getId()); + return sysRecipesTemplateMapper.insertRecipsesTemplate(sysRecipesTemplate); + } + return 0; + } + + @Override + public int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate) { + sysRecipesTemplate.setUpdateBy(SecurityUtils.getUsername()); + sysRecipesTemplate.setUpdateTime(DateUtils.getNowDate()); + return sysRecipesTemplateMapper.updateRecipesTemplate(sysRecipesTemplate); + } + + @Override + public int removeRecipesTemplate(Long id) { + return sysRecipesTemplateMapper.removeRecipesTemplate(id); + } + + @Override + public SysRecipesTemplate getRecipesTemplateById(Long id) { + return sysRecipesTemplateMapper.getRecipesTemplateById(id); + } +} diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml index 49e4a3da7..fcee81005 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml @@ -86,6 +86,7 @@ update_by, del_flag, review_status, + type, #{orderId}, @@ -104,6 +105,7 @@ #{updateBy}, #{delFlag}, #{reviewStatus}, + #{type}, @@ -163,7 +165,7 @@ select id, out_id, start_date, end_date, start_num_day, end_num_day, recipes_id, review_status from sys_recipes_plan - where cus_id=#{cusId} order by create_time desc + where cus_id=#{cusId} order by id desc - select srpm.id, srpm.nutritionist_id, srpm.nutri_assis_id, srpm.remark, srpm.update_time, - srpm.create_time, srpm.update_by, srpm.create_by, srpm.plan_id, srp.recipes_id, srp.review_status - from sys_recipes_plan_model srpm - left join sys_recipes_plan srp on srp.id = srpm.plan_id - where del_flag = 0 - and nutri_assis_id = #{nutriAssisId} - and nutritionist_id = #{nutritionistId} - and review_status = #{reviewStatus} - order by srpm.create_time desc - - - - insert into sys_recipes_plan_model - - nutri_assis_id, - nutritionist_id, - create_time, - create_by, - update_time, - update_by, - remark, - review_status, - - - #{nutriAssisId}, - #{nutritionistId}, - #{createTime}, - #{createBy}, - #{updateTime}, - #{updateBy}, - #{remark}, - #{reviewStatus}, - - - - - update sys_recipes_plan_model - - nutri_assis_id = #{nutriAssisId}, - nutritionist_id = #{nutritionistId}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - remark = #{remark}, - review_status = #{reviewStatus}, - - where id = #{id} - - - - update sys_recipes_plan_model set del_flag=1 where id = #{id} - - - \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml new file mode 100644 index 000000000..6a212f21b --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into sys_recipes_template + + name, + plan_id, + nutri_assis_id, + nutritionist_id, + create_time, + create_by, + update_time, + update_by, + remark, + + + #{name}, + #{planId}, + #{nutriAssisId}, + #{nutritionistId}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{remark}, + + + + + update sys_recipes_template + + name = #{name}, + nutri_assis_id = #{nutriAssisId}, + nutritionist_id = #{nutritionistId}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + remark = #{remark}, + + where id = #{id} + + + + update sys_recipes_template set del_flag=1 where id = #{id} + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/recipesPlanModel.js b/stdiet-ui/src/api/custom/recipesPlanModel.js deleted file mode 100644 index dac431cb8..000000000 --- a/stdiet-ui/src/api/custom/recipesPlanModel.js +++ /dev/null @@ -1,33 +0,0 @@ -import request from "@/utils/request"; - -export function listRecipesModel(query) { - return request({ - url: "/recipes/model/list", - method: "get", - params: query - }); -} - -export function addRecipesModel(data){ - return request({ - url: "/recipes/model/add", - method: "post", - data: data - }); -} - -export function updateRecipesModel(data) { - return request({ - url: "/recipes/model/update", - method: "put", - data: data - }); -} - - -export function deleteRecipesModel(id) { - return request({ - url: "/recipes/model/delete/" + id, - method: "get" - }); -} diff --git a/stdiet-ui/src/api/custom/recipesTemplate.js b/stdiet-ui/src/api/custom/recipesTemplate.js new file mode 100644 index 000000000..4d8167140 --- /dev/null +++ b/stdiet-ui/src/api/custom/recipesTemplate.js @@ -0,0 +1,39 @@ +import request from "@/utils/request"; + +export function listRecipesTemplate(query) { + return request({ + url: "/recipes/template/list", + method: "get", + params: query + }); +} + +export function getRecipesTemplateDetail(id) { + return request({ + url: "/recipes/template/" + id, + method: "get" + }); +} + +export function addRecipesTemplate(data) { + return request({ + url: "/recipes/template/add", + method: "post", + data: data + }); +} + +export function updateRecipesTemplate(data) { + return request({ + url: "/recipes/template/update", + method: "put", + data: data + }); +} + +export function deleteRecipesTemplate(id) { + return request({ + url: "/recipes/template/delete/" + id, + method: "delete" + }); +} diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js index 84ff42331..89c1fef86 100644 --- a/stdiet-ui/src/store/modules/recipes.js +++ b/stdiet-ui/src/store/modules/recipes.js @@ -7,12 +7,14 @@ import { deleteDishesApi, addRecipesApi } from "@/api/custom/recipes"; +import { getRecipesTemplateDetail } from "@/api/custom/recipesTemplate"; import { getRecipesPlan, updateRecipesPlan } from "@/api/custom/recipesPlan"; import { getDicts } from "@/api/system/dict/data"; const oriState = { cusId: undefined, planId: undefined, + temId: undefined, recipesId: undefined, healthyData: {}, healthDataLoading: false, @@ -25,7 +27,8 @@ const oriState = { currentDay: -1, startNum: 0, endNum: 0, - reviewStatus: 0 + reviewStatus: 0, + templateInfo: undefined }; const mutations = { @@ -87,6 +90,7 @@ const actions = { cusId, recipesId, reviewStatus, + temId: payload.temId, planId: payload.planId, startNum: startNumDay, endNum: endNumDay @@ -108,12 +112,25 @@ const actions = { dispatch("getHealthyData", { cusId }).catch(err => rej(err)); } + // 模板信息 + if (payload.temId) { + dispatch("getRecipesTemplate", payload).catch(err => rej(err)); + } + // 食谱数据 if (recipesId) { dispatch("getRecipesInfo", { recipesId }).catch(err => rej(err)); } }); }, + async getRecipesTemplate({ commit, state }, { temId }) { + const response = await getRecipesTemplateDetail(temId); + if (response.code === 200) { + commit("updateStateData", { + templateInfo: response.data + }); + } + }, async updateReviewStatus({ commit, state }, payload) { const response = await updateRecipesPlan({ id: state.planId, diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue index 26f66188a..2c9bdccca 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue @@ -4,6 +4,9 @@ :style="`height: ${collapse ? 30 : 200}px`" >
+ 返回 +
推荐列表
+ + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue new file mode 100644 index 000000000..0a19d3dd4 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue @@ -0,0 +1,97 @@ + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommendView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/index.vue new file mode 100644 index 000000000..2bd6666ab --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecommendView/index.vue @@ -0,0 +1,90 @@ + + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecommondView.vue b/stdiet-ui/src/views/custom/recipesBuild/RecommondView.vue deleted file mode 100644 index 78b706c81..000000000 --- a/stdiet-ui/src/views/custom/recipesBuild/RecommondView.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - diff --git a/stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue new file mode 100644 index 000000000..a12c12f2b --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue @@ -0,0 +1,89 @@ + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/index.vue b/stdiet-ui/src/views/custom/recipesBuild/index.vue index c8bdba22b..93a53752a 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/index.vue @@ -7,10 +7,11 @@ :name="healthyData.name" :analyseData="analyseData" /> - +
- + +
@@ -27,16 +28,21 @@ const { import HealthyView from "@/components/HealthyView"; import BodySignView from "@/components/BodySignView"; import RecipesView from "./RecipesView/index"; -import RecommondView from "./RecommondView"; +import RecommendView from "./RecommendView"; +import TemplateInfoView from "./TemplateInfoView"; export default { name: "BuildRecipies", data() { - return {}; + const { temId } = this.$route.query; + return { + temId, + }; }, mounted() { this.init({ planId: this.planId, + temId: this.temId, }).catch((err) => { this.$message.error(err.message); }); @@ -49,13 +55,15 @@ export default { HealthyView, BodySignView, RecipesView, - RecommondView, + RecommendView, + TemplateInfoView, }, props: ["name", "planId"], computed: { ...mapState([ "healthyData", "healthyDataType", + "templateInfo", "recipesData", "recipesDataLoading", "healthDataLoading", diff --git a/stdiet-ui/src/views/custom/recipesModel/index.vue b/stdiet-ui/src/views/custom/recipesModel/index.vue deleted file mode 100644 index 1a1b71554..000000000 --- a/stdiet-ui/src/views/custom/recipesModel/index.vue +++ /dev/null @@ -1,331 +0,0 @@ - - - - - - diff --git a/stdiet-ui/src/views/custom/recipesTemplate/index.vue b/stdiet-ui/src/views/custom/recipesTemplate/index.vue new file mode 100644 index 000000000..2b0bd7f78 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesTemplate/index.vue @@ -0,0 +1,458 @@ + + + + + +