diff --git a/back/inventory/views.py b/back/inventory/views.py index 1e0ed48..0cb7121 100644 --- a/back/inventory/views.py +++ b/back/inventory/views.py @@ -100,7 +100,7 @@ class ElementViewSet(viewsets.ModelViewSet): params = { "$format": "json", "$select": ",".join(["Description", "Ref_Key", "Parent_Key"]), - "$filter": f"Parent_Key eq guid'{cat_id}'", + "$filter": f"КатегорияНоменклатуры_Key eq guid'{cat_id}'", } remote_url = ( "https://1c.svs-tech.pro/UNF/odata/standard.odata/Catalog_Номенклатура?" diff --git a/front/assets/main.scss b/front/assets/main.scss index d87b667..019c157 100644 --- a/front/assets/main.scss +++ b/front/assets/main.scss @@ -2,18 +2,32 @@ @tailwind components; @tailwind utilities; -.container { - @apply grid grid-cols-12 mx-auto gap-4 -} +@layer base { + h1 { + @apply text-2xl; + } -.header { - @apply col-span-12 -} + h2 { + @apply text-xl; + } -.sidebar { - @apply col-span-2 -} + h3 { + @apply text-lg; + } -.content { - @apply col-span-10 + .container { + @apply grid grid-cols-12 mx-auto gap-4 + } + + .header { + @apply col-span-12 + } + + .sidebar { + @apply col-span-2 + } + + .content { + @apply col-span-10 + } } \ No newline at end of file diff --git a/front/helpers.ts b/front/helpers.ts index baadad4..f190fdf 100644 --- a/front/helpers.ts +++ b/front/helpers.ts @@ -8,7 +8,7 @@ export type ApiTypeBase = { results: any[]; } -export type ApiTypeExternalPartners = { +export type ApiTypeExternal = { 'НаименованиеПолное': string; Description: string; Ref_Key: string; diff --git a/front/pages/organization/new.vue b/front/pages/organization/new.vue index ec48ee5..d2a1c6c 100644 --- a/front/pages/organization/new.vue +++ b/front/pages/organization/new.vue @@ -1,59 +1,83 @@