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

新增忌口编写功能

Browse Source
This commit is contained in:
huangdeliang
2021-03-23 20:10:29 +08:00
parent 960a094649
commit 2ea3d01d6e
15 changed files with 874 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,6 +311,9 @@ export default {
return {};
},
computed: {
notIds() {
return this.avoidFoodIds.concat(this.notRecIgds);
},
mData() {
if (!this.data.dishes) {
return [];
@ -337,8 +340,8 @@ export default {
}
lastNameHit =
arr[arr.length - 1].name === cur.name &&
arr[arr.length - 1].type === cur.type
// arr[arr.length - 1].dishesId === cur.dishesId;
arr[arr.length - 1].type === cur.type;
// arr[arr.length - 1].dishesId === cur.dishesId;
if (lastNameHit) {
let namePos = arr.length - 1;
for (let i = namePos; i >= 0; i--) {
@ -407,6 +410,7 @@ export default {
"canCopyMenuTypes",
"recipesId",
"notRecIgds",
"avoidFoodIds",
]),
},
methods: {
@ -416,7 +420,7 @@ export default {
return "recipes_first_col";
} else {
return `recipes_cell recipes_cell_${this.fontSize} ${
columnIndex === 2 && this.notRecIgds.includes(row.igdId)
columnIndex === 2 && this.notIds.includes(row.igdId)
? "warning_heightlight"
: ""
}`;