From dc87f5cb7830e97b0e628cec48c631668377b9d0 Mon Sep 17 00:00:00 2001 From: gofnnp Date: Tue, 7 Feb 2023 00:45:35 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#13716=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8E=20=D0=BF=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8E=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D0=B0=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.module.ts | 2 ++ src/app/data/data.ts | 3 +-- src/app/pages/orders/orders.component.html | 13 ++++++++++++- src/app/pages/orders/orders.component.ts | 4 ++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9d5ded8..5e0183b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -29,6 +29,7 @@ import { ConfirmationService } from 'primeng/api'; import { DropdownModule } from 'primeng/dropdown'; import { ChipsModule } from 'primeng/chips'; import { ButtonModule } from 'primeng/button'; +import {MultiSelectModule} from 'primeng/multiselect'; const routes = [ { path: 'clients', component: ClientsComponent }, @@ -71,6 +72,7 @@ const routes = [ DropdownModule, ChipsModule, ButtonModule, + MultiSelectModule, RouterModule.forRoot(routes) ], providers: [MessageService, { provide: APP_BASE_HREF, useValue: '/' }, ConfirmationService], diff --git a/src/app/data/data.ts b/src/app/data/data.ts index 31ebdf4..3a0422a 100644 --- a/src/app/data/data.ts +++ b/src/app/data/data.ts @@ -2,6 +2,5 @@ export const OrderTypes = { "mobileApp": "Мобильное приложение", "offlineReline": "Кассовое приложение", "mobileAppOfflineOrder": "Диплинк", - "selfServiceTerminalOrder": "Терминал самообслуживания", - "notFound": "Тип не найден" + "selfServiceTerminalOrder": "Терминал самообслуживания" } \ No newline at end of file diff --git a/src/app/pages/orders/orders.component.html b/src/app/pages/orders/orders.component.html index 6edc2e5..632d773 100644 --- a/src/app/pages/orders/orders.component.html +++ b/src/app/pages/orders/orders.component.html @@ -31,7 +31,18 @@ - + + + + +
+ {{orderTypes[leadToTypeOrderType(option)]}} +
+
+
+
+
diff --git a/src/app/pages/orders/orders.component.ts b/src/app/pages/orders/orders.component.ts index e97ad54..4e8c06d 100644 --- a/src/app/pages/orders/orders.component.ts +++ b/src/app/pages/orders/orders.component.ts @@ -103,6 +103,10 @@ export class OrdersComponent implements OnInit { } + keysFromObject(object: any) { + return Object.keys(object) + } + notif() { for (let i = 0; i < this.orders.length; i++) { this.map_new.set(this.orders[i].id, true)