-
diff --git a/projects/admin/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts b/projects/admin/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts
index e064f19..80086d3 100644
--- a/projects/admin/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts
+++ b/projects/admin/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts
@@ -45,12 +45,13 @@ export class IngredientFormComponent implements OnInit {
getDetail() {
if (this.id && this.id !== "create") {
- this.api.getMenuItem(this.id).subscribe((res) => {
+ const id = this.id.split(",")[0];
+ this.api.getMenuItem(id).subscribe((res) => {
if (res.body) {
this.menuItem = res.body;
}
});
- this.api.getMenuDist(this.id).subscribe((res) => {
+ this.api.getMenuDist(id).subscribe((res) => {
if (Array.isArray(res.body)) {
res.body.forEach((d) => {
d.ingredient.forEach((f: any) => {
@@ -91,20 +92,10 @@ export class IngredientFormComponent implements OnInit {
});
}
- onStepChange(basicInfo: any) {
+ onStepChange(idStr: string) {
this.step = 1;
- this.menuItem = {
- ...basicInfo,
- menuIds: basicInfo.menuId,
- meals: basicInfo.meals.reduce(
- (a: string[], c: OptionItemInterface) => (c["checked"] ? a.concat(c.value) : a),
- [] as string[]
- ),
- crows: basicInfo.peoples.reduce(
- (a: string[], c: OptionItemInterface) => (c["checked"] ? a.concat(c.value) : a),
- [] as string[]
- ),
- };
+ this.id = idStr;
+ this.getDetail();
}
createNewMenu() {
@@ -153,10 +144,9 @@ export class IngredientFormComponent implements OnInit {
nzWidth: 650,
nzOnOk: () => {
const { mealDishList } = this.menuDish;
-
this.api
.saveMenuDist({
- menuIds: this.menuItem.menuIds ?? [this.menuItem.id],
+ menuIds: this.id?.split(","),
dishes: this.formatData(mealDishList),
})
.subscribe((res) => {
diff --git a/projects/admin/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html b/projects/admin/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html
index afc3d68..7025e73 100644
--- a/projects/admin/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html
+++ b/projects/admin/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html
@@ -55,7 +55,7 @@
-
第{{day}}天
+ {{weekdayMap[day]}}
重量/克
@@ -103,7 +103,8 @@
-
- +{{f['foodName']}}{ - console.log(dishs, basic); - this.days = Array.from({ length: basic.day }, (_, i) => i + 1); + // this.days = Array.from({ length: basic.day }, (_, i) => i + 1); + this.days = basic.day; + this.getStandardName(basic.nutrient); this.basic = basic; @@ -70,7 +74,8 @@ export class IngredientPreviewComponent { if (storage) { try { const { basic, dishs } = JSON.parse(storage); - this.days = Array.from({ length: basic.day }, (_, i) => i + 1); + // this.days = Array.from({ length: basic.day }, (_, i) => i + 1); + this.days = basic.day; this.getStandardName(basic.nutrient); this.basic = basic; this.dishs = dishs; diff --git a/projects/cdk/src/services/api.service.ts b/projects/cdk/src/services/api.service.ts index 4cf3a83..a5b6bd3 100644 --- a/projects/cdk/src/services/api.service.ts +++ b/projects/cdk/src/services/api.service.ts @@ -1,6 +1,6 @@ import { HttpClient, HttpParams, HttpResponse } from "@angular/common/http"; import { Inject, Injectable, InjectionToken } from "@angular/core"; -import { AnyObject, OptionItemInterface, PageResult, ResponseType } from "@cdk/types"; +import { AnyObject, Augmented, OptionItemInterface, PageResult, ResponseType } from "@cdk/types"; import { format, addDays } from "date-fns"; import { Utils } from "@cdk/utils"; import { Observable, map, of, tap } from "rxjs"; @@ -189,9 +189,25 @@ export class ApiService { }); } - getOrgList(query: { vendors?: number[]; keyword?: string }) { - const q = Utils.objectStringify(query); - return this.http.get
= []; - data.body.forEach((item) => { + data.forEach((item) => { listOfOption.push({ value: String(item.id), label: item.name, diff --git a/projects/client/src/app/components/dish-form/dish-form.component.html b/projects/client/src/app/components/dish-form/dish-form.component.html index ce1d18d..1ecf046 100644 --- a/projects/client/src/app/components/dish-form/dish-form.component.html +++ b/projects/client/src/app/components/dish-form/dish-form.component.html @@ -45,7 +45,7 @@ 菜品图片 -+ diff --git a/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.ts b/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.ts index 762f731..4660dad 100644 --- a/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.ts +++ b/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.ts @@ -71,16 +71,16 @@ export class IngredientListComponent { } initTableList() { - this.tableList.scroll = { x: null }; + this.tableList.scroll = { x: "900px" }; this.tableList = this.tableList.setColumns([ - { key: "name", title: "食谱名称" }, + { key: "name", title: "食谱名称", width: "200px" }, - { key: "meals", title: "包含餐次" }, - { key: "month", title: "适用月份", width: "300px" }, + { key: "meals", title: "包含餐次", width: "180px" }, + { key: "month", title: "适用月份" }, { key: "day", title: "周期" }, - { key: "status", title: "状态" }, - { key: "modify", title: "更新时间" }, - { key: "operate", title: "创建人" }, + { key: "status", title: "状态", width: "120px" }, + { key: "modify", title: "更新时间", width: "170px" }, + { key: "operate", title: "创建人", width: "160px" }, ]); this.tableList = this.tableList.setOptions([@@ -53,7 +53,7 @@ diff --git a/projects/client/src/app/components/dish-form/dish-form.component.ts b/projects/client/src/app/components/dish-form/dish-form.component.ts index bb73154..b704841 100644 --- a/projects/client/src/app/components/dish-form/dish-form.component.ts +++ b/projects/client/src/app/components/dish-form/dish-form.component.ts @@ -74,7 +74,7 @@ export class DishFormComponent { ) .subscribe((data) => { const listOfOption: Array<{ value: string; text: string }> = []; - data.body.forEach((item) => { + data.forEach((item) => { listOfOption.push({ value: item.id.toString(), text: item.name, @@ -222,8 +222,8 @@ export class DishFormComponent { const target = e.target as HTMLInputElement; const file = target.files![0]; target.value = ""; - if (file.size / 1024 / 1024 >= 5) { - this.msg.error("图片大小不能超过5M"); + if (file.size / 1024 / 1024 >= 2) { + this.msg.error("图片大小不能超过2M"); return; } const fileReader = new FileReader(); diff --git a/projects/client/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts b/projects/client/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts index 1763d5c..21a3985 100644 --- a/projects/client/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts +++ b/projects/client/src/app/pages/ingredients/ingredient-form/ingredient-form.component.ts @@ -90,20 +90,10 @@ export class IngredientFormComponent implements OnInit { }); } - onStepChange(basicInfo: any) { + onStepChange(idStr: string) { this.step = 1; - this.menuItem = { - ...basicInfo, - menuIds: basicInfo.menuId, - meals: basicInfo.meals.reduce( - (a: string[], c: OptionItemInterface) => (c["checked"] ? a.concat(c.value) : a), - [] as string[] - ), - crows: basicInfo.peoples.reduce( - (a: string[], c: OptionItemInterface) => (c["checked"] ? a.concat(c.value) : a), - [] as string[] - ), - }; + this.id = idStr; + this.getDetail(); } createNewMenu() { @@ -155,7 +145,7 @@ export class IngredientFormComponent implements OnInit { this.api .saveMenuDist({ - menuIds: this.menuItem.menuIds ?? [this.menuItem.id], + menuIds: this.id?.split(","), dishes: this.formatData(mealDishList), }) .subscribe((res) => { diff --git a/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html b/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html index 670dd00..98451f4 100644 --- a/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html +++ b/projects/client/src/app/pages/ingredients/ingredient-list/ingredient-list.component.html @@ -51,7 +51,7 @@
{{item}} - {{data}} 天 + 周{{data}} {{statusTextMap[data]}} @@ -65,7 +65,7 @@ - {{monthText[item]}} + {{item}}