From 27597c464f0a00fe9ed75de177cecafdf49aff4c Mon Sep 17 00:00:00 2001
From: kkerwin <kkerwin@yeah.net>
Date: Sat, 25 Nov 2023 23:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ingredient-list/ingredient-list.component.html            | 1 -
 .../ingredient-release/ingredient-release.component.html      | 2 +-
 .../pages/standard/standard-list/standard-list.component.html | 4 +---
 .../pages/standard/standard-list/standard-list.component.ts   | 2 +-
 .../standard/standard-setting/standard-setting.component.html | 2 +-
 .../confirm-ingredient/confirm-ingredient.component.html      | 4 +++-
 .../ingredient-form-basic/ingredient-form-basic.component.ts  | 2 +-
 projects/cdk/src/services/api.service.ts                      | 4 ++--
 .../ingredients/ingredient-list/ingredient-list.component.ts  | 1 +
 .../ingredient-release/ingredient-release.component.html      | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

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 b813d94..eaf14c2 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
@@ -50,7 +50,6 @@
                         <ng-container *ngSwitchCase="'vender'">
                             {{ tableOrg[data] ? tableOrg[data].name : '-'}}
                         </ng-container>
-
                         <ng-container *ngSwitchCase="'meals'">
                             <nz-tag *ngFor="let item of data">{{item}}</nz-tag>
                         </ng-container>
diff --git a/projects/admin/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html b/projects/admin/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html
index 796888a..0b46181 100644
--- a/projects/admin/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html
+++ b/projects/admin/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html
@@ -53,7 +53,7 @@
                             <nz-tag *ngFor="let item of data">{{item}}</nz-tag>
                         </ng-container>
                         <ng-container *ngSwitchCase="'day'">
-                            {{data}} 天
+                            周{{data}}
                         </ng-container>
                         <ng-container *ngSwitchDefault>
 
diff --git a/projects/admin/src/app/pages/standard/standard-list/standard-list.component.html b/projects/admin/src/app/pages/standard/standard-list/standard-list.component.html
index 7058a5b..be3435e 100644
--- a/projects/admin/src/app/pages/standard/standard-list/standard-list.component.html
+++ b/projects/admin/src/app/pages/standard/standard-list/standard-list.component.html
@@ -24,7 +24,7 @@
                 </ng-template>
                 <ng-template #renderColumnsTpl let-data let-key="key" let-row="row">
                     <ng-container [ngSwitch]="key">
-                        <ng-container *ngSwitchCase="'time'">
+                        <ng-container *ngSwitchCase="'modify'">
                             {{ data|date:'yyyy-MM-dd HH:mm:ss'}}
                         </ng-container>
                         <ng-container *ngSwitchCase="'vendors'">
@@ -34,9 +34,7 @@
                             {{ data.length }}个人群
                         </ng-container>
                         <ng-container *ngSwitchDefault>
-
                             {{data}}
-
                         </ng-container>
                     </ng-container>
                 </ng-template>
diff --git a/projects/admin/src/app/pages/standard/standard-list/standard-list.component.ts b/projects/admin/src/app/pages/standard/standard-list/standard-list.component.ts
index 99db136..30c6508 100644
--- a/projects/admin/src/app/pages/standard/standard-list/standard-list.component.ts
+++ b/projects/admin/src/app/pages/standard/standard-list/standard-list.component.ts
@@ -38,7 +38,7 @@ export class StandardListComponent {
 			{ key: "name", title: "营养标准名称" },
 			{ key: "people", title: "人群细分" },
 			{ key: "vendors", title: "适用单位" },
-			{ key: "time", title: "更新时间" },
+			{ key: "modify", title: "更新时间" },
 		]);
 
 		this.tableList = this.tableList.setOptions([
diff --git a/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html b/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html
index 79ac07d..304ac9f 100644
--- a/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html
+++ b/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html
@@ -436,7 +436,7 @@
                 <button *nzSpaceItem nz-button nzType="primary" (click)="onSubmit()">
                     确定
                 </button>
-                <button *nzSpaceItem nz-button>
+                <button *nzSpaceItem nz-button routerLink="/standard/list">
                     取消
                 </button>
             </nz-space>
diff --git a/projects/cdk/src/ingredient/confirm-ingredient/confirm-ingredient.component.html b/projects/cdk/src/ingredient/confirm-ingredient/confirm-ingredient.component.html
index 25c6b9f..6986fb8 100644
--- a/projects/cdk/src/ingredient/confirm-ingredient/confirm-ingredient.component.html
+++ b/projects/cdk/src/ingredient/confirm-ingredient/confirm-ingredient.component.html
@@ -13,7 +13,9 @@
         </nz-form-label>
         <nz-form-control nzSpan="12">
             <nz-space>
-                <ng-container *ngFor="let m of data.meals">{{m}}</ng-container>
+                <ng-container *ngFor="let m of data.meals">
+                    <nz-tag [nzColor]="'gold'">{{m}}</nz-tag>
+                </ng-container>
             </nz-space>
         </nz-form-control>
     </nz-form-item>
diff --git a/projects/cdk/src/ingredient/ingredient-form-basic/ingredient-form-basic.component.ts b/projects/cdk/src/ingredient/ingredient-form-basic/ingredient-form-basic.component.ts
index 6d7abb0..0319dbc 100644
--- a/projects/cdk/src/ingredient/ingredient-form-basic/ingredient-form-basic.component.ts
+++ b/projects/cdk/src/ingredient/ingredient-form-basic/ingredient-form-basic.component.ts
@@ -146,7 +146,7 @@ export class IngredientFormBasicComponent implements OnChanges {
 	}
 
 	onStandardChange(v: any) {
-		const currentStandard = this.searchedStandard.find((f) => f.value === v);
+		const currentStandard = this.standardOfOption.find((f) => f.value === v);
 		if (currentStandard) {
 			this.currentPeoples = Object.entries(currentStandard["ingredient"] ?? {}).map(([k, v]) => {
 				return {
diff --git a/projects/cdk/src/services/api.service.ts b/projects/cdk/src/services/api.service.ts
index 09ec496..39cebf7 100644
--- a/projects/cdk/src/services/api.service.ts
+++ b/projects/cdk/src/services/api.service.ts
@@ -492,11 +492,11 @@ export class ApiService {
 	}
 
 	release(id: string | number, startTime: Date, amount: number) {
-		const endTime = addDays(startTime, amount);
+		// const endTime = addDays(startTime, amount);
 		const params = Utils.objectToFormData({
 			id,
 			startTime: format(startTime, "yyyy-MM-dd"),
-			endTime: format(endTime, "yyyy-MM-dd"),
+			// endTime: format(endTime, "yyyy-MM-dd"),
 		});
 		return this.http.put<ResponseType>(`/api/menu/release`, params);
 	}
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 615fc3f..7ae12cf 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
@@ -184,6 +184,7 @@ export class IngredientListComponent {
 					this.msg.error("请选择发布日期");
 					return false;
 				}
+				console.log(id, day);
 				const res = await lastValueFrom(this.api.release(id, this.startTime, day));
 				this.msg.success(res.desc);
 				this.tableList.run();
diff --git a/projects/client/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html b/projects/client/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html
index dbba394..b7393d4 100644
--- a/projects/client/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html
+++ b/projects/client/src/app/pages/ingredients/ingredient-release/ingredient-release.component.html
@@ -49,7 +49,7 @@
                             <nz-tag *ngFor="let item of data">{{item}}</nz-tag>
                         </ng-container>
                         <ng-container *ngSwitchCase="'day'">
-                            {{data}} 天
+                            周 {{data}}
                         </ng-container>
                         <ng-container *ngSwitchDefault>