diff --git a/back/tgbot/tgbot.py b/back/tgbot/tgbot.py index b1442df..7fe86c6 100644 --- a/back/tgbot/tgbot.py +++ b/back/tgbot/tgbot.py @@ -146,7 +146,7 @@ class TgBot: def format_tmc_name(self, tmc): return f"Название ТМЦ `{tmc.name}`\n" - + def format_element(self, field): return f"Элемент `{field.name}`\n" @@ -266,7 +266,7 @@ class TgBot: tmc = await CustomTable.objects.aget(id=tmc_element.tmc_id) fields = [] - async for e in tmc_element.field.filter(text=None): + async for e in tmc_element.field.filter(text=None, file_id=None): f = await BaseCustomField.objects.aget(id=e.field_id) fields.append({"name": f.name, "id": e.id}) keys = chunk(1, fields) @@ -336,7 +336,7 @@ class TgBot: await element.asave() - empty_fields = await tmc_element.field.filter(text=None).acount() + empty_fields = await tmc_element.field.filter(text=None, file_id=None).acount() if empty_fields > 0: context.chat_data["step"] = "add_tmc" await self.inv(update, context) diff --git a/front/pages/table/index.vue b/front/pages/table/index.vue index 23bbb9a..82964a3 100644 --- a/front/pages/table/index.vue +++ b/front/pages/table/index.vue @@ -16,11 +16,6 @@ const columns = [ key: 'name', label: 'Название' }, - { - - key: 'date', - label: 'Дата' - }, { key: 'tmc', @@ -37,21 +32,30 @@ const columns = [

Проведенные инвентаризации

- -