diff --git a/back/inventory/serializers.py b/back/inventory/serializers.py index 855f53c..50383b7 100644 --- a/back/inventory/serializers.py +++ b/back/inventory/serializers.py @@ -10,7 +10,7 @@ class PartnerSerializer(serializers.ModelSerializer): class InventorySerializer(serializers.ModelSerializer): class Meta: model = InventoryItem - fields = ["id"] + fields = ["id", "partner"] class ElementSerializer(serializers.ModelSerializer): class Meta: diff --git a/back/inventory/views.py b/back/inventory/views.py index fb96300..175692e 100644 --- a/back/inventory/views.py +++ b/back/inventory/views.py @@ -106,7 +106,7 @@ class ElementViewSet(viewsets.ModelViewSet): # check if inventory exist if ( "inventory" in data - and InventoryItem.objects.filter(id=data["inventory"]).exist() + # and InventoryItem.objects.filter(id=data["inventory"]).exists() ): inventory_object = InventoryItem.objects.get(id=data["inventory"]) else: diff --git a/front/components/edit.vue b/front/components/edit.vue new file mode 100644 index 0000000..e5b6d3d --- /dev/null +++ b/front/components/edit.vue @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + Сохранить + + + + + {{ external_data.partner?.find(el => el["Ref_Key"] == state.partner)?.Description }} + + + + {{ item.external_id }} + + + {{ item.element_id }} + + + + + + \ No newline at end of file diff --git a/front/pages/organization/index.vue b/front/pages/organization/index.vue index b7c8c85..dde1f27 100644 --- a/front/pages/organization/index.vue +++ b/front/pages/organization/index.vue @@ -9,7 +9,7 @@ const { data } = await useFetch(`${apiBase}/partner/`, { headers }) - Новая инвентаризация + Новая инвентаризация diff --git a/front/pages/organization/new.vue b/front/pages/organization/new.vue index 355e455..ea3497c 100644 --- a/front/pages/organization/new.vue +++ b/front/pages/organization/new.vue @@ -1,135 +1,3 @@ - - - - - - - - - - - - - - - - - - - Сохранить - - - - - {{ external_data.partner?.find(el => el["Ref_Key"] == state.partner)?.Description }} - - + \ No newline at end of file diff --git a/front/pages/organization/p_[id]/i_[id].vue b/front/pages/organization/p_[id]/i_[id].vue deleted file mode 100644 index 079c2c2..0000000 --- a/front/pages/organization/p_[id]/i_[id].vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/front/pages/organization/p_[org_id]/i_[inv_id]/edit.vue b/front/pages/organization/p_[org_id]/i_[inv_id]/edit.vue new file mode 100644 index 0000000..c123028 --- /dev/null +++ b/front/pages/organization/p_[org_id]/i_[inv_id]/edit.vue @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue b/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue new file mode 100644 index 0000000..8a426c2 --- /dev/null +++ b/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue @@ -0,0 +1,20 @@ + + + + + Добавить элемент + + + + + \ No newline at end of file diff --git a/front/pages/organization/p_[id]/index.vue b/front/pages/organization/p_[org_id]/index.vue similarity index 76% rename from front/pages/organization/p_[id]/index.vue rename to front/pages/organization/p_[org_id]/index.vue index c96fa2d..3f65c29 100644 --- a/front/pages/organization/p_[id]/index.vue +++ b/front/pages/organization/p_[org_id]/index.vue @@ -7,12 +7,12 @@ headers.append("Content-Type", "application/json"); const route = useRoute() -const { data } = await useFetch(`${apiBase}/inventory?partner_id=${route.params.id}`, { headers }) +const { data } = await useFetch(`${apiBase}/inventory?partner_id=${route.params.org_id}`, { headers }) - + {{ row.id }}