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

修改界面

Browse Source
This commit is contained in:
huangdeliang 2021-01-11 10:09:28 +08:00
parent fdc0100938
commit a9ada467d2
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-ui/src/views/custom/dishes/index.vue
View File

@ -582,7 +582,7 @@
if (idx === 2) { if (idx === 2) {
return acc + parseFloat(dAcc.weight); return acc + parseFloat(dAcc.weight);
} }
return acc + dAcc[cur.property] * dAcc.weight / 100; return parseFloat((acc + dAcc[cur.property] * dAcc.weight / 100).toFixed(1));
}, 0); }, 0);
} }
return arr; return arr;

7
stdiet-ui/src/views/custom/ingredient/index.vue
View File

@ -136,7 +136,7 @@
:data="ingredientList" :data="ingredientList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column label="审核状态" align="center" fixed="left" width="80"> <el-table-column label="审核状态" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag <el-tag
:type="scope.row.reviewStatus === 'yes' ? 'success' : 'danger'" :type="scope.row.reviewStatus === 'yes' ? 'success' : 'danger'"
@ -150,7 +150,6 @@
label="食材名称" label="食材名称"
align="center" align="center"
prop="name" prop="name"
fixed="left"
width="120" width="120"
/> />
<el-table-column <el-table-column
@ -162,7 +161,7 @@
/> />
<el-table-column <el-table-column
label="蛋白质比例(100g)" label="蛋白质比例(100g)"
width="128" width="132"
align="center" align="center"
prop="proteinRatio" prop="proteinRatio"
/> />
@ -205,9 +204,7 @@
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column <el-table-column
fixed="right"
label="操作" label="操作"
width="180"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >