diff --git a/stdiet-ui/src/views/custom/recipesShow/utils.js b/stdiet-ui/src/views/custom/recipesShow/utils.js index 2ded2c2b6..ee7112c3d 100644 --- a/stdiet-ui/src/views/custom/recipesShow/utils.js +++ b/stdiet-ui/src/views/custom/recipesShow/utils.js @@ -19,21 +19,22 @@ export function getProcessMenuData(menuData) { igdList: cur.igdList.reduce((igdArr, igdData) => { if (igdData.id > 0) { const tarDetail = cur.detail.find(obj => obj.id === igdData.id); - if (tarDetail) { - igdArr.push({ - id: igdData.id, - name: igdData.name, - carbonRatio: igdData.carbonRatio, - fatRatio: igdData.fatRatio, - proteinRatio: igdData.proteinRatio, - cusUnit: tarDetail.cus_unit, - cusWeight: tarDetail.cus_weight, - weight: parseFloat(tarDetail.weight), - notRec: igdData.notRec, - rec: igdData.rec, - type: igdData.type - }); - } + + igdArr.push({ + id: igdData.id, + name: igdData.name, + carbonRatio: igdData.carbonRatio, + fatRatio: igdData.fatRatio, + proteinRatio: igdData.proteinRatio, + cusUnit: tarDetail ? tarDetail.cus_unit : igdData.cusUnit, + cusWeight: tarDetail ? tarDetail.cus_weight : igdData.cusWeight, + weight: tarDetail + ? parseFloat(tarDetail.weight) + : parseFloat(igdData.weight), + notRec: igdData.notRec, + rec: igdData.rec, + type: igdData.type + }); } return igdArr; }, [])