Browse Source

修复 人群 与 食品数量 对应不上的问题

main
kely 9 hours ago
parent
commit
812222d541
  1. 24
      projects/cdk/src/ingredient/ingredient-meals/ingredient-meals.component.html
  2. 10
      projects/cdk/src/ingredient/ingredient.module.ts

24
projects/cdk/src/ingredient/ingredient-meals/ingredient-meals.component.html

@ -27,9 +27,7 @@
<tr> <tr>
<th nzWidth="200px" nzLeft>菜品</th> <th nzWidth="200px" nzLeft>菜品</th>
<th nzWidth="200px" nzLeft>食材</th> <th nzWidth="200px" nzLeft>食材</th>
<th *ngFor="let p of peopleGroups"> <th *ngFor="let p of peopleGroups">{{ p }}</th>
{{ p }}
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -81,15 +79,17 @@
</nz-dropdown-menu> </nz-dropdown-menu>
</div> </div>
</td> </td>
<td *ngFor="let g of food['groupValues']"> <td *ngFor="let people of peopleGroups">
<nz-input-group nzAddOnAfter="g" class="w-28"> <ng-container *ngIf="food['groupValues'] | findByPeople: people as g">
<input <nz-input-group nzAddOnAfter="g" class="w-28">
nz-input <input
type="number" nz-input
[(ngModel)]="g.value" type="number"
(ngModelChange)="onValueChange()" [(ngModel)]="g.value"
/> (ngModelChange)="onValueChange()"
</nz-input-group> />
</nz-input-group>
</ng-container>
</td> </td>
</tr> </tr>
</ng-container> </ng-container>

10
projects/cdk/src/ingredient/ingredient.module.ts

@ -1,4 +1,4 @@
import { NgModule } from '@angular/core' import { NgModule, Pipe } from '@angular/core'
import { SharedModule } from '@cdk/shared/shared.module' import { SharedModule } from '@cdk/shared/shared.module'
import { AddDishToIngredientComponent } from './add-dish-to-ingredient/add-dish-to-ingredient.component' import { AddDishToIngredientComponent } from './add-dish-to-ingredient/add-dish-to-ingredient.component'
import { IngredientMealsComponent } from './ingredient-meals/ingredient-meals.component' import { IngredientMealsComponent } from './ingredient-meals/ingredient-meals.component'
@ -10,6 +10,13 @@ import { IngredientAnalysisComponent } from './ingredient-analysis/ingredient-an
import { NutritionTableComponent } from './nutrition-table/nutrition-table.component' import { NutritionTableComponent } from './nutrition-table/nutrition-table.component'
import { SelectFoodComponent } from './select-food/select-food.component' import { SelectFoodComponent } from './select-food/select-food.component'
@Pipe({ name: 'findByPeople', pure: true })
export class FindByPeoplePipe {
transform(values: any[], people: any) {
return values?.find((v) => v.peopleName === people)
}
}
@NgModule({ @NgModule({
declarations: [ declarations: [
AddDishToIngredientComponent, AddDishToIngredientComponent,
@ -21,6 +28,7 @@ import { SelectFoodComponent } from './select-food/select-food.component'
IngredientAnalysisComponent, IngredientAnalysisComponent,
NutritionTableComponent, NutritionTableComponent,
SelectFoodComponent, SelectFoodComponent,
FindByPeoplePipe,
], ],
imports: [SharedModule], imports: [SharedModule],
exports: [ exports: [

Loading…
Cancel
Save