@coopenomics/desktop 2.2.9 → 2.2.10

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.10](https://github.com/coopenomics/mono/compare/v2.2.9...v2.2.10) (2025-03-27)
+
+
+### Bug Fixes
+
+* add Zeus type ([7bcb6e3](https://github.com/coopenomics/mono/commit/7bcb6e30a77b0ab89c5293188b58f08f19c8761e))
+
+
+
+
+
 ## [2.2.9](https://github.com/coopenomics/mono/compare/v2.2.8...v2.2.9) (2025-03-12)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.9",
+  "version": "2.2.10",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -20,8 +20,8 @@
     "prepublishOnly": "npm run build:lib"
   },
   "dependencies": {
-    "@coopenomics/controller": "2.2.9",
-    "@coopenomics/sdk": "2.2.9",
+    "@coopenomics/controller": "2.2.10",
+    "@coopenomics/sdk": "2.2.10",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -45,7 +45,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "2.2.9",
+    "cooptypes": "2.2.10",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -94,5 +94,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "51d736eba49ce8aaea6e58c40772254c0c194f46"
+  "gitHead": "e5e28ff652112fe3bacb8036a898a1344ad361fa"
 }

package/src/boot/init-stores.ts

@@ -28,8 +28,14 @@ export default boot(async ({ router }) => {
   await cardStore.initWallet();
 
   // Загрузка аккаунта
-  if (session.isAuth && session.username)
-    await account.getAccount(session.username)
+  if (session.isAuth && session.username){
+    try {
+      await account.getAccount(session.username)
+    } catch(e){
+      session.close()
+    }
+  }
+
 
   // Добавление динамических маршрутов как дочерних к 'base'
   const baseRoute = router.getRoutes().find(route => route.name === 'base');

package/src/desktops/User/model/index.ts

@@ -160,16 +160,6 @@ export const manifest = {
 
         },
 
-        {
-          path: '/:coopname/contacts',
-          name: 'contacts',
-          component: markRaw(ContactsPage),
-          meta: {
-            title: 'Контакты',
-            icon: 'fa-solid fa-info',
-            roles: [],
-          },
-        },
         // {
         //   path: '/:coopname/marketplace',
         //   name: 'marketplace',
@@ -251,6 +241,17 @@ export const manifest = {
         //     },
         //   ],
         // },
+        {
+          path: '/:coopname/contacts',
+          name: 'contacts',
+          component: markRaw(ContactsPage),
+          meta: {
+            title: 'Контакты',
+            icon: 'fa-solid fa-info',
+            roles: [],
+          },
+        },
+
         // {
         //   meta: {
         //     title: 'Поддержка',

package/src/entities/Account/api/index.ts

@@ -1,6 +1,6 @@
 import { client } from 'src/shared/api/client';
 import { Queries } from '@coopenomics/sdk';
-import type { IAccount } from '../types';
+import type { IAccount, IAccounts, IGetAccounts } from '../types';
 
 async function getAccount(username: string): Promise<IAccount | undefined> {
   const { [Queries.Accounts.GetAccount.name]: output } = await client.Query(Queries.Accounts.GetAccount.query, {
@@ -12,6 +12,15 @@ async function getAccount(username: string): Promise<IAccount | undefined> {
   return output;
 }
 
+async function getAccounts(variables?: IGetAccounts): Promise<IAccounts> {
+  const { [Queries.Accounts.GetAccounts.name]: output } = await client.Query(Queries.Accounts.GetAccounts.query, {
+    variables
+  });
+
+  return output;
+}
+
 export const api ={
-  getAccount
+  getAccount,
+  getAccounts
 }

package/src/entities/Account/model/store.ts

@@ -1,25 +1,35 @@
 import { defineStore } from 'pinia'
 import { ref, Ref } from 'vue'
 import { api } from '../api'
-import type { IAccount } from '../types';
+import type { IAccount, IAccounts, IGetAccounts } from '../types';
 
 const namespace = 'accountStore';
 
-interface ISystemStore {
+interface IAccountStore {
   account: Ref<IAccount | undefined>
+  accounts: Ref<IAccounts>
   getAccount: (username: string) => Promise<IAccount | undefined>;
+  getAccounts: (data?: IGetAccounts) => Promise<IAccounts>;
 }
 
-export const useAccountStore = defineStore(namespace, (): ISystemStore => {
+export const useAccountStore = defineStore(namespace, (): IAccountStore => {
   const account = ref<IAccount>()
+  const accounts = ref<IAccounts>({items: [], totalCount: 0, totalPages: 0, currentPage: 1})
 
-  const getAccount = async (username: string) => {
+  const getAccount = async (username: string): Promise<IAccount | undefined> => {
     account.value = await api.getAccount(username);
     return account.value
   };
+  
+  const getAccounts = async(data?: IGetAccounts): Promise<IAccounts> => {
+    accounts.value = await api.getAccounts(data);
+    return accounts.value
+  }
 
   return {
     account,
-    getAccount
+    accounts,
+    getAccount,
+    getAccounts
   }
 })

package/src/entities/Account/types/index.ts

@@ -1,3 +1,11 @@
-import { Queries } from '@coopenomics/sdk';
+import { Queries, Zeus } from '@coopenomics/sdk';
 
 export type IAccount = Queries.Accounts.GetAccount.IOutput[typeof Queries.Accounts.GetAccount.name]
+export type IAccounts = Queries.Accounts.GetAccounts.IOutput[typeof Queries.Accounts.GetAccounts.name]
+export type IGetAccounts = {data?: Queries.Accounts.GetAccounts.IInput['data'], options?: Queries.Accounts.GetAccounts.IInput['options']}
+
+export const AccountTypes = Zeus.AccountType
+
+export type IIndividualData = Zeus.ModelTypes['Individual']
+export type IOrganizationData = Zeus.ModelTypes['Organization']
+export type IEntrepreneurData = Zeus.ModelTypes['Entrepreneur']

package/src/entities/Session/model/store.ts

@@ -57,8 +57,6 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
       await globalStore.init();
       isAuth.value = globalStore.hasCreditials;
 
-      //TODO добавить более детальную проверку авторизации
-
       getInfo();
 
       try {
@@ -80,7 +78,8 @@ export const useSessionStore = defineStore('session', (): ISessionStore => {
       } catch (e: any) {
         console.error(e);
         FailAlert(e.message);
-        //TODO logout
+        close()
+        globalStore.logout()
       }
     }
   };

package/src/features/Account/UpdateAccount/api/index.ts

@@ -0,0 +1,14 @@
+import { client } from 'src/shared/api/client'
+import { Mutations } from '@coopenomics/sdk'
+
+async function updateAccount(data: Mutations.Accounts.UpdateAccount.IInput['data']): Promise<Mutations.Accounts.UpdateAccount.IOutput[[typeof Mutations.Accounts.UpdateAccount.name][number]]>{
+  const {[Mutations.Accounts.UpdateAccount.name]: result} = await client.Mutation(Mutations.Accounts.UpdateAccount.mutation, {variables: {
+    data
+  }})
+
+  return result
+}
+
+export const api = {
+  updateAccount
+}

package/src/features/Account/UpdateAccount/index.ts

@@ -0,0 +1 @@
+export * from './model'

package/src/features/Account/UpdateAccount/model/index.ts

@@ -0,0 +1,16 @@
+import type { Mutations } from '@coopenomics/sdk';
+import { api } from '../api'
+import { IAccount } from 'src/entities/Account/types';
+
+export type IUpdateAccountInput = Mutations.Accounts.UpdateAccount.IInput['data']
+
+export function useUpdateAccount() {
+
+  async function updateAccount(data: IUpdateAccountInput): Promise<IAccount> {
+    const account = await api.updateAccount(data);
+
+    return account;
+  }
+
+  return { updateAccount };
+}

package/src/features/Branch/SelectBranch/ui/SelectBranchOverlay.vue

@@ -60,8 +60,9 @@ div
   }
 
   const back = () => step.value--
-
-  branchStore.loadPublicBranches({ coopname: system.info.coopname })
+  
+  if (session.isAuth)
+    branchStore.loadPublicBranches({ coopname: system.info.coopname })
 
   const generate = async () => {
     isLoading.value = true

package/src/features/User/AddUser/ui/AddUserDialog/AddUserDialog.vue

@@ -99,6 +99,7 @@ import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()
 
 import { notEmpty } from 'src/shared/lib/utils';
+import { useAccountStore } from 'src/entities/Account/model';
 
 const { state, addUserState, clearUserData } = useRegistratorStore()
 const spread_minimum = ref(true) //TODO REPLACE IT!
@@ -204,6 +205,7 @@ const addUserNow = (userDataForm: any) => {
   userDataForm.validate().then(async (success: boolean) => {
     if (success) {
       try {
+        const accountStore = useAccountStore()
         loading.value = true
         await addUser()
         SuccessAlert('Пайщик добавлен в реестр, а приглашение отправлено на его email');
@@ -211,6 +213,7 @@ const addUserNow = (userDataForm: any) => {
         addUserState.created_at = ''
         clearUserData()
         loading.value = false
+        accountStore.getAccounts()
       } catch (e: any) {
         loading.value = false
         FailAlert(`Возникла ошибка: ${e.message}`)

package/src/features/User/Logout/model/index.ts

@@ -1,13 +1,13 @@
 import { useSessionStore } from 'src/entities/Session'
 import { useGlobalStore } from 'src/shared/store'
-import { api } from '../api'
+// import { api } from '../api'
 import { useCurrentUserStore } from 'src/entities/User'
 
 export function useLogoutUser() {
   async function logout(): Promise<void> {
     const global = useGlobalStore()
-
-    if (global.tokens?.refresh.token) await api.logoutUser(global.tokens?.refresh.token)
+    //TODO: "начать с начала" при регистрации бажит на это - да и в целом пора бы маршруты срезать эти
+    // if (global.tokens?.refresh.token) await api.logoutUser(global.tokens?.refresh.token)
 
     await global.logout()
 

package/src/pages/Cooperative/ListOfBranches/ui/ListOfBranchesPage.vue

@@ -53,11 +53,9 @@ div
               BankDetailsCard(:bankDetails="props.row.bank_account")
             div.col-md-4.col-xs-12.q-pa-sm
               p.text-center.text-overline карточка председателя
-              IndividualCard(:individual="props.row.trustee" :readonly="true").q-mt-sm
+              EditableIndividualCard(:participantData="props.row.trustee" :readonly="true").q-mt-sm
               div.text-wrap
                 p.text-grey для замены председателя участка - измените его имя аккаунта в карточке участка на аккаунт одного из пайщиков.
-
-
 </template>
 
 <script lang="ts" setup>
@@ -67,7 +65,7 @@ import { useEditableTableRows } from 'src/shared/lib/composables/useEditableTabl
 import { CreateBranchButton } from 'src/features/Branch/CreateBranch';
 import { getNameFromUserData } from 'src/shared/lib/utils/getNameFromUserData';
 import { BranchCard } from 'src/widgets/BranchCard';
-import { IndividualCard } from 'src/widgets/IndividualCard';
+import { EditableIndividualCard } from 'src/shared/ui/EditableIndividualCard';
 import { BankDetailsCard } from 'src/widgets/BankDetailsCard';
 import { useSystemStore } from 'src/entities/System/model';
 const { info } = useSystemStore()

package/src/shared/lib/composables/useEditableData.ts

@@ -21,7 +21,7 @@ export function useEditableData<T extends Record<string, any>>(
 
   // Автоматически отслеживаем изменения в editableData
   watch(
-    () => editableData,
+    editableData,
     (newData) => {
       isEditing.value = !isEqual(newData.value, originalData.value); // Глубокое сравнение объектов
       validateForm(); // Проверка валидности формы при изменении данных

package/src/shared/ui/EditableEntrepreneurCard/EditableEntrepreneurCard.vue

@@ -0,0 +1,170 @@
+<template lang="pug">
+q-form(ref="form")
+  q-input(
+    dense
+    v-model="data.last_name"
+    standout="bg-teal text-white"
+    label="Фамилия"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.first_name"
+    standout="bg-teal text-white"
+    label="Имя"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.middle_name"
+    standout="bg-teal text-white"
+    label="Отчество"
+    :readonly="readonly"
+    :rules="[val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.birthdate"
+    standout="bg-teal text-white"
+    mask="date"
+    label="Дата рождения"
+    placeholder="Формат: год/месяц/день"
+    :readonly="readonly"
+    :rules="['date', val => notEmpty(val)]"
+    autocomplete="off"
+  )
+    template(v-slot:append)
+      q-icon(name="event" class="cursor-pointer" v-if="!readonly")
+        q-popup-proxy(cover transition-show="scale" transition-hide="scale")
+          q-date(v-model="data.birthdate")
+            .row.items-center.justify-end
+              q-btn(v-close-popup label="Закрыть" color="primary" flat)
+
+  q-input(
+    dense
+    v-model="data.phone"
+    standout="bg-teal text-white"
+    label="Номер телефона"
+    mask="+7 (###) ###-##-##"
+    fill-mask
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => notEmptyPhone(val)]"
+    autocomplete="off"
+  )
+
+  q-select(
+    dense
+    v-model="data.country"
+    standout="bg-teal text-white"
+    label="Страна"
+    :options="[{ label: 'Российская Федерация', value: 'Российская Федерация' }]"
+    map-options
+    emit-value
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+  )
+
+  q-input(
+    dense
+    v-model="data.city"
+    standout="bg-teal text-white"
+    label="Город"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.full_address"
+    standout="bg-teal text-white"
+    label="Адрес регистрации"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.details.inn"
+    standout="bg-teal text-white"
+    mask="############"
+    label="ИНН предпринимателя"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => (val.length === 10 || val.length === 12) || 'ИНН должен содержать 10 или 12 цифр']"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.details.ogrn"
+    standout="bg-teal text-white"
+    mask="###############"
+    label="ОГРНИП"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => (val.length === 13 || val.length === 15) || 'ОГРНИП должен содержать 13 или 15 цифр']"
+    autocomplete="off"
+  )
+
+  EditableActions(
+    v-if="!readonly"
+    :isEditing="isEditing"
+    :isDisabled="isDisabled"
+    @save="saveChanges"
+    @cancel="cancelChanges"
+  )
+</template>
+
+<script setup lang="ts">
+  import { ref } from 'vue';
+  import { useEditableData } from 'src/shared/lib/composables/useEditableData';
+  import { notEmpty, notEmptyPhone, validatePersonalName } from 'src/shared/lib/utils';
+  import { failAlert, SuccessAlert } from 'src/shared/api';
+  import { EditableActions } from 'src/shared/ui/EditableActions';
+  import { type IUpdateAccountInput, useUpdateAccount } from 'src/features/Account/UpdateAccount/model';
+  import { type IEntrepreneurData } from 'src/entities/Account/types';
+  
+  const emit = defineEmits(['update']);
+  const { updateAccount } = useUpdateAccount();
+  
+  const props = defineProps({
+    participantData: {
+      type: Object as () => IEntrepreneurData,
+      required: true
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    }
+  });
+  
+  const localEntrepreneurData = ref(props.participantData);
+  const form = ref();
+  
+  const handleSave = async () => {
+    try {
+      const account_data: IUpdateAccountInput = {
+        username: props.participantData.username,
+        entrepreneur_data: data.value,
+      };
+      await updateAccount(account_data);
+      emit('update', JSON.parse(JSON.stringify(data.value)));
+      SuccessAlert('Данные аккаунта обновлены');
+    } catch (e) {
+      console.log(e);
+      failAlert(e);
+    }
+  };
+  
+  const { editableData: data, isEditing, isDisabled, saveChanges, cancelChanges } = useEditableData(
+    localEntrepreneurData.value,
+    handleSave,
+    form
+  );
+</script>

package/src/shared/ui/EditableEntrepreneurCard/index.ts

@@ -0,0 +1 @@
+export {default as EditableEntrepreneurCard} from './EditableEntrepreneurCard.vue'

package/src/shared/ui/EditableIndividualCard/EditableIndividualCard.vue

@@ -0,0 +1,203 @@
+<template lang="pug">
+q-form(ref="form" v-if="data")
+  q-input(
+    dense
+    v-model="data.email"
+    standout="bg-teal text-white"
+    label="Email"
+    :readonly="readonly"
+    :rules="[val => validEmail(val)]"
+    autocomplete="off"
+  )  
+  q-input(
+    dense
+    v-model="data.first_name"
+    standout="bg-teal text-white"
+    label="Имя"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.middle_name"
+    standout="bg-teal text-white"
+    label="Отчество"
+    :readonly="readonly"
+    :rules="[val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.last_name"
+    standout="bg-teal text-white"
+    label="Фамилия"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val), val => validatePersonalName(val)]"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.birthdate"
+    standout="bg-teal text-white"
+    mask="date"
+    label="Дата рождения"
+    placeholder="Формат: год/месяц/день"
+    :readonly="readonly"
+    :rules="['date', val => notEmpty(val)]"
+    autocomplete="off"
+  )
+    template(v-slot:append)
+      q-icon(name="event" class="cursor-pointer" v-if="!readonly")
+        q-popup-proxy(cover transition-show="scale" transition-hide="scale")
+          q-date(v-model="data.birthdate")
+            .row.items-center.justify-end
+              q-btn(v-close-popup label="Закрыть" color="primary" flat)
+
+  q-input(
+    dense
+    v-model="data.phone"
+    standout="bg-teal text-white"
+    label="Телефон"
+    :readonly="readonly"
+    :rules="[val => notEmpty(val)]"
+    autocomplete="off"
+  )
+
+  div(v-if="data.passport")
+    q-input(
+      dense
+      v-model="data.passport.code"
+      standout="bg-teal text-white"
+      label="Код подразделения"
+      mask="###-###"
+      :readonly="readonly"
+      :rules="[val => notEmpty(val), val => val.length === 7 || 'Код подразделения состоит из 6 цифр и тире (xxx-xxx)']"
+      autocomplete="off"
+    )
+
+    q-input(
+      dense
+      :model-value="data.passport.series"
+      @update:model-value="val => data.passport.series = Number(val)"
+      standout="bg-teal text-white"
+      label="Серия паспорта"
+      mask="####"
+      type="text"
+      :readonly="readonly"
+      :rules="[val => notEmpty(val), val => String(val).length === 4 || 'Серия должна состоять из 4 цифр']"
+      autocomplete="off"
+    )
+
+    q-input(
+      dense
+      :model-value="data.passport.number"
+      @update:model-value="val => data.passport.number = Number(val)"
+      standout="bg-teal text-white"
+      label="Номер паспорта"
+      mask="######"
+      type="text"
+      :readonly="readonly"
+      :rules="[val => notEmpty(val), val => String(val).length === 6 || 'Номер паспорта должен состоять из 6 цифр']"
+      autocomplete="off"
+    )
+
+
+
+    q-input(
+      dense
+      v-model="data.passport.issued_at"
+      standout="bg-teal text-white"
+      mask="date"
+      label="Дата выдачи"
+      :readonly="readonly"
+      :rules="['date', val => notEmpty(val)]"
+      autocomplete="off"
+    )
+      template(v-slot:append)
+        q-icon(name="event" class="cursor-pointer" v-if="!readonly")
+          q-popup-proxy(cover transition-show="scale" transition-hide="scale")
+            q-date(v-model="data.passport.issued_at")
+              .row.items-center.justify-end
+                q-btn(v-close-popup label="Закрыть" color="primary" flat)
+
+    q-input(
+      dense
+      v-model="data.passport.issued_by"
+      standout="bg-teal text-white"
+      label="Кем выдан"
+      :readonly="readonly"
+      :rules="[val => notEmpty(val)]"
+      autocomplete="off"
+    )
+
+    q-input(
+      dense
+      v-model="data.full_address"
+      standout="bg-teal text-white"
+      label="Адрес регистрации"
+      :readonly="readonly"
+      :rules="[val => notEmpty(val)]"
+      autocomplete="off"
+    )
+
+  EditableActions(
+    v-if="!readonly"
+    :isEditing="isEditing"
+    :isDisabled="isDisabled"
+    @save="saveChanges"
+    @cancel="cancelChanges"
+  )
+  </template>
+  
+  <script lang="ts" setup>
+  import { ref } from 'vue';
+  import { useEditableData } from 'src/shared/lib/composables/useEditableData';
+  import { validEmail } from 'src/shared/lib/utils/validEmailRule';
+  import { validatePersonalName, notEmpty } from 'src/shared/lib/utils';
+  import { failAlert, SuccessAlert } from 'src/shared/api';
+  import { type IUpdateAccountInput, useUpdateAccount } from 'src/features/Account/UpdateAccount/model';
+  import { EditableActions } from 'src/shared/ui/EditableActions';
+  import { type IIndividualData } from 'src/entities/Account/types';
+  
+  const { updateAccount } = useUpdateAccount()
+  
+  const props = defineProps({
+    participantData: {
+      type: Object as () => IIndividualData,
+      required: true
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    }
+  });
+  
+  const localParticipantData = ref(props.participantData);
+  const form = ref();
+  const emit = defineEmits(['update']);
+  
+  const handleSave = async () => {
+    try {
+      const account_data: IUpdateAccountInput = {
+        username: props.participantData.username,
+        individual_data: data.value,
+      }
+      await updateAccount(account_data);
+      emit('update', JSON.parse(JSON.stringify(data.value)))
+      SuccessAlert('Данные аккаунта обновлены')
+    } catch (e: any) {
+      failAlert(e);
+    }
+  };
+  
+  const { editableData: data, isEditing, isDisabled, saveChanges, cancelChanges } = useEditableData(
+    localParticipantData.value,
+    handleSave,
+    form
+  );
+  </script>
+  

package/src/shared/ui/EditableIndividualCard/index.ts

@@ -0,0 +1 @@
+export {default as EditableIndividualCard} from './EditableIndividualCard.vue'

package/src/shared/ui/EditableOrganizationCard/EditableOrganizationCard.vue

@@ -0,0 +1,215 @@
+<template lang="pug">
+q-form(ref="form" v-if="data")
+  q-select(
+    dense
+    v-model="data.type"
+    standout="bg-teal text-white"
+    label="Тип организации"
+    :options="[{ label: 'Потребительский Кооператив', value: 'coop' }, { label: 'Производственный Кооператив', value: 'prodcoop' }, { label: 'ООО', value: 'ooo' }]"
+    emit-value
+    map-options
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+  )
+
+  q-input(
+    dense
+    v-model="data.short_name"
+    standout="bg-teal text-white"
+    label="Краткое наименование"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.full_name"
+    standout="bg-teal text-white"
+    label="Полное наименование"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.represented_by.last_name"
+    standout="bg-teal text-white"
+    label="Фамилия представителя"
+    :rules="[val => notEmpty(val), val => validatePersonalName(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.represented_by.first_name"
+    standout="bg-teal text-white"
+    label="Имя представителя"
+    :rules="[val => notEmpty(val), val => validatePersonalName(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.represented_by.middle_name"
+    standout="bg-teal text-white"
+    label="Отчество представителя"
+    :rules="[val => validatePersonalName(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.represented_by.based_on"
+    standout="bg-teal text-white"
+    label="На основании"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.represented_by.position"
+    standout="bg-teal text-white"
+    label="Должность представителя"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.phone"
+    standout="bg-teal text-white"
+    label="Телефон"
+    mask="+7 (###) ###-##-##"
+    fill-mask
+    :rules="[val => notEmpty(val), val => notEmptyPhone(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.country"
+    standout="bg-teal text-white"
+    label="Страна"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.city"
+    standout="bg-teal text-white"
+    label="Город"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.full_address"
+    standout="bg-teal text-white"
+    label="Юридический адрес"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.fact_address"
+    standout="bg-teal text-white"
+    label="Фактический адрес"
+    :rules="[val => notEmpty(val)]"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+
+  q-input(
+    dense
+    v-model="data.details.inn"
+    standout="bg-teal text-white"
+    mask="############"
+    label="ИНН"
+    :rules="[val => notEmpty(val), val => (val.length === 10 || val.length === 12) || 'ИНН должен содержать 10 или 12 цифр']"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.details.ogrn"
+    standout="bg-teal text-white"
+    mask="###############"
+    label="ОГРН"
+    :rules="[val => notEmpty(val), val => (val.length === 13 || val.length === 15) || 'ОГРН должен содержать 13 или 15 цифр']"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+  q-input(
+    dense
+    v-model="data.details.kpp"
+    standout="bg-teal text-white"
+    mask="#########"
+    label="КПП"
+    :rules="[val => notEmpty(val), val => val.length === 9 || 'КПП должен содержать 9 цифр']"
+    :readonly="readonly"
+    autocomplete="off"
+  )
+
+  EditableActions(
+    v-if="!readonly"
+    :isEditing="isEditing"
+    :isDisabled="isDisabled"
+    @save="saveChanges"
+    @cancel="cancelChanges"
+  )
+</template>
+  
+  <script lang="ts" setup>
+  import { ref } from 'vue';
+  import { useEditableData } from 'src/shared/lib/composables/useEditableData';
+  import { notEmpty, notEmptyPhone, validatePersonalName } from 'src/shared/lib/utils';
+  import { failAlert, SuccessAlert } from 'src/shared/api';
+  import { EditableActions } from 'src/shared/ui/EditableActions';
+  import { type IUpdateAccountInput, useUpdateAccount } from 'src/features/Account/UpdateAccount/model';
+  import { type IOrganizationData } from 'src/entities/Account/types';
+  
+  const emit = defineEmits(['update']);
+  const { updateAccount } = useUpdateAccount();
+  
+  const props = defineProps({
+    participantData: {
+      type: Object as () => IOrganizationData,
+      required: true
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    }
+  });
+  
+  const localOrganizationData = ref(props.participantData);
+  const form = ref();
+  
+  const handleSave = async () => {
+    try {
+      const account_data: IUpdateAccountInput = {
+        username: props.participantData.username,
+        organization_data: data.value,
+      };
+      await updateAccount(account_data);
+      emit('update', JSON.parse(JSON.stringify(data.value)));
+      SuccessAlert('Данные аккаунта обновлены');
+    } catch (e) {
+      console.log(e);
+      failAlert(e);
+    }
+  };
+  const { editableData: data, isEditing, isDisabled, saveChanges, cancelChanges } = useEditableData(
+    localOrganizationData.value,
+    handleSave,
+    form
+  );
+</script>
+  

package/src/shared/ui/EditableOrganizationCard/index.ts

@@ -0,0 +1 @@
+export {default as EditableOrganizationCard} from './EditableOrganizationCard.vue'

package/src/shared/ui/UserDataForm/OrganizationDataForm/OrganizationDataForm.vue

@@ -7,6 +7,7 @@ div(v-if="userData.organization_data").q-gutter-sm.q-mt-md
     :options="[{ label: 'Потребительский Кооператив', value: 'coop' }, { label: 'Производственный Кооператив', value: 'prodcoop' }, { label: 'ООО', value: 'ooo' }]"
     emit-value
     map-options).q-mb-md
+    
   q-input(v-model="userData.organization_data.short_name" standout="bg-teal text-white" hint="ПК Ромашка" label="Краткое наименование организации" :rules="[val => notEmpty(val)]" autocomplete="off")
   q-input(v-model="userData.organization_data.full_name" standout="bg-teal text-white" hint="Потребительский Кооператив 'Ромашка'" label="Полное наименование организации" :rules="[val => notEmpty(val)]" autocomplete="off")
   q-input(v-model="userData.organization_data.represented_by.last_name" standout="bg-teal text-white" label="Фамилия представителя" hint="" :rules="[val => notEmpty(val), val => validatePersonalName(val)]" autocomplete="off")

package/src/widgets/Cooperative/Participants/ListOfParticipants/ui/ListOfParticipantsWidget.vue

@@ -1,10 +1,10 @@
 <template lang="pug">
+
 q-table(
-  ref="tableRef" v-model:expanded="expanded"
+  ref="tableRef"
   flat
-  :rows="participants.results"
+  :rows="accountStore.accounts.items"
   :columns="columns"
-  :table-colspan="9"
   row-key="username"
   :pagination="pagination"
   virtual-scroll
@@ -15,12 +15,10 @@ q-table(
 ).full-height
   template(#top)
     slot(name="top")
-
+      
   template(#header="props")
-
     q-tr(:props="props")
       q-th(auto-width)
-
       q-th(
         v-for="col in props.cols"
         :key="col.name"
@@ -28,76 +26,161 @@ q-table(
       ) {{ col.label }}
 
   template(#body="props")
+      
     q-tr(:key="`m_${props.row.username}`" :props="props")
       q-td(auto-width)
-        // q-toggle(v-model="props.expand" checked-icon="fas fa-chevron-circle-left" unchecked-icon="fas fa-chevron-circle-right" )
-        q-btn(size="sm" color="primary" round dense :icon="props.expand ? 'remove' : 'add'" @click="props.expand = !props.expand")
+        q-btn(
+          size="sm"
+          color="primary"
+          round
+          dense
+          :icon="expanded.get(props.row.username) ? 'remove' : 'add'"
+          @click="toggleExpand(props.row.username)"
+        )
+      
+      q-td {{ getName(props.row) }}
+      q-td {{ props.row.private_account.type === AccountTypes.Individual ? 'физ. лицо' : (props.row.private_account.type === AccountTypes.Organization ? 'юр. лицо' : (props.row.private_account.type === AccountTypes.Entrepreneur ? 'инд. предприниматель' : 'неизвестно')) }}
       q-td {{ props.row.username }}
-      q-td {{ props.row.private_data?.last_name }}
-      q-td {{ props.row.private_data?.first_name }}
-      q-td {{ props.row.private_data?.middle_name }}
-      q-td {{ props.row.private_data?.phone }}
-      q-td {{ props.row.private_data?.email }}
-      q-td {{ moment(props.row.private_data?.birthdate).format('DD.MM.YY') }}
-      q-td {{ moment(props.row.private_data?._created_at).format('DD.MM.YY HH:mm:ss') }}
-
-
-    q-tr(v-show="props.expand" :key="`e_${props.row.username}`" :props="props" class="q-virtual-scroll--with-prev")
-      q-td(colspan="100%")
-        slot(:expand="props.expand" :receiver="props.row.username")
-
+      q-td {{ moment(props.row.blockchain_account?.created).format('DD.MM.YY HH:mm:ss') }}
+
+    q-tr(v-if="expanded.get(props.row.username)" :key="`e_${props.row.username}`" :props="props" class="q-virtual-scroll--with-prev")
+      q-td(colspan="100%" style="padding: 0 !important;")
+        q-tabs(
+          v-model="currentTab[props.row.username]"
+          align="justify"
+          stretch
+          dense
+          indicator-color="lime"
+        )
+          q-tab(name="info" label="Данные" class="bg-primary text-white")
+          q-tab(name="document" label="Документы" class="bg-primary text-white")
+
+        q-tab-panels(v-model="currentTab[props.row.username]" animated)
+          q-tab-panel(name="info")
+            component(:is="useComponent(props.row)" :participantData="usePrivateData(props.row)" @update="newData => update(props.row, newData)")
+
+          q-tab-panel(name="document")
+            slot(:expand="expanded.get(props.row.username)" :receiver="props.row.username")
+          
 </template>
-
 <script setup lang="ts">
-import { ref } from 'vue'
-import { Notify } from 'quasar'
-
-import { sendGET } from 'src/shared/api';
-const participants = ref({ results: [] })
-const onLoading = ref(false)
-
-import moment from 'moment-with-locales-es6'
-
-const loadParticipants = async () => {
-  try {
-    onLoading.value = true
-
-    participants.value = await sendGET('/v1/users', {
-      limit: 100
-    })
-
-    onLoading.value = false
-  } catch (e: any) {
-    onLoading.value = false
-    Notify.create({
-      message: e.message,
-      type: 'negative',
-    })
+  import { ref, reactive } from 'vue'
+  import { Notify } from 'quasar'
+  import { EditableEntrepreneurCard } from 'src/shared/ui/EditableEntrepreneurCard';
+  import { EditableIndividualCard } from 'src/shared/ui/EditableIndividualCard';
+  import { EditableOrganizationCard } from 'src/shared/ui/EditableOrganizationCard';
+  import { useAccountStore } from 'src/entities/Account/model';
+  import moment from 'moment-with-locales-es6'
+  import { AccountTypes, type IAccount, type IIndividualData, type IOrganizationData, type IEntrepreneurData } from 'src/entities/Account/types';
+  
+  const accountStore = useAccountStore()
+  
+  const onLoading = ref(false)
+
+  const update = (
+  account: IAccount,
+  newData: IIndividualData | IOrganizationData | IEntrepreneurData
+) => {
+  
+  if (account.private_account?.type === AccountTypes.Individual) {
+    const individual = newData as IIndividualData;
+    account.private_account.individual_data = {
+      ...individual,
+      passport: individual.passport ?? undefined, // заменяет null на undefined
+    };
+  } else if (account.private_account?.type === AccountTypes.Entrepreneur) {
+    account.private_account.entrepreneur_data = newData as IEntrepreneurData
+  } else if (account.private_account?.type === AccountTypes.Organization) {
+    account.private_account.organization_data = newData as IOrganizationData
+  }
+  
+};
+
+  
+  // `Map` для отслеживания состояния раскрытых строк и вкладок
+  const expanded = reactive(new Map<string, boolean>())
+  const currentTab = reactive<Record<string, string>>({})
+
+  // Определяем, какой компонент использовать
+  const useComponent = (account: IAccount) => {
+    if (account.private_account)
+      switch (account.private_account.type) {
+        case AccountTypes.Individual:
+          return EditableIndividualCard
+        case AccountTypes.Entrepreneur:
+          return EditableEntrepreneurCard
+        case AccountTypes.Organization:
+          return EditableOrganizationCard
+      }
+  }
+  
+  const usePrivateData = (account: IAccount) => {
+    if (account.private_account)
+      switch (account.private_account.type) {
+        case AccountTypes.Individual:
+          return account.private_account?.individual_data
+        case AccountTypes.Entrepreneur:
+          return account.private_account?.entrepreneur_data
+        case AccountTypes.Organization:
+          return account.private_account?.organization_data
+      }
+  }
+  
+  // Загружаем данные
+  const loadParticipants = async () => {
+    try {
+      onLoading.value = true
+
+      await accountStore.getAccounts({options: {
+        page: 1,
+        limit: 1000,
+        sortOrder: 'DESC'
+      }})
+            
+      onLoading.value = false
+    } catch (e: any) {
+      onLoading.value = false
+      Notify.create({
+        message: e.message,
+        type: 'negative',
+      })
+    }
   }
-}
-
-loadParticipants()
-
-const columns = [
-  { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
-  { name: 'last_name', align: 'left', label: 'Фамилия', field: 'last_name', sortable: true },
-  { name: 'first_name', align: 'left', label: 'Имя', field: 'first_name', sortable: true },
-  { name: 'middle_name', align: 'left', label: 'Отчество', field: 'middle_name', sortable: true },
-
-  { name: 'phone', align: 'left', label: 'Телефон', field: 'phone', sortable: false },
-  { name: 'email', align: 'left', label: 'Е-почта', field: 'email', sortable: false },
-  { name: 'birthday', align: 'left', label: 'Дата рождения', field: 'birthday', sortable: true },
-  {
-    name: 'created_at',
-    align: 'left',
-    label: 'Зарегистрирован',
-    field: 'created_at',
-    sortable: true,
-  },
-] as any
 
-const expanded = ref([])
-const tableRef = ref(null)
-const pagination = ref({ rowsPerPage: 10 })
+  loadParticipants()
+
+  const columns = [
+    { name: 'name', align: 'left', label: 'ФИО / Наименование', field: 'name', sortable: true },
+    { name: 'type', align: 'left', label: 'Тип', field: 'type' },
+    { name: 'username', align: 'left', label: 'Аккаунт', field: 'username', sortable: true },
+    {
+      name: 'created_at',
+      align: 'left',
+      label: 'Зарегистрирован',
+      field: 'created_at',
+      sortable: true,
+    },
+  ] as any
+
+  const tableRef = ref(null)
+  const pagination = ref({ rowsPerPage: 10 })
+
+  // Функция для переключения раскрытия строки
+  const toggleExpand = (id: string) => {
+    expanded.set(id, !expanded.get(id))
+    if (!currentTab[id]) {
+      currentTab[id] = 'info' // Устанавливаем вкладку по умолчанию
+    }
+  }
+  
+  const getName = (account: IAccount) => {
+    if (account?.private_account?.type === AccountTypes.Individual){
+      return `${account.private_account.individual_data?.last_name} ${account.private_account.individual_data?.first_name} ${account.private_account.individual_data?.middle_name}`
+    } else if (account?.private_account?.type === AccountTypes.Entrepreneur){
+      return `${account.private_account.entrepreneur_data?.last_name} ${account.private_account.entrepreneur_data?.first_name} ${account.private_account.entrepreneur_data?.middle_name}`      
+    } else if (account?.private_account?.type === AccountTypes.Organization){
+      return `${account.private_account.organization_data?.short_name}`
+    }
+  }
 
-</script>
+  </script>

package/src/widgets/IndividualCard/ui/IndividualCard.vue

@@ -142,29 +142,29 @@ div
   )
 </template>
 
-  <script lang="ts" setup>
-  import { useEditableData } from 'src/shared/lib/composables/useEditableData';
-  import { notEmpty, notEmptyPhone } from 'src/shared/lib/utils';
-  import { validEmail } from 'src/shared/lib/utils/validEmailRule';
-  import { validatePersonalName } from 'src/shared/lib/utils';
-  import { EditableActions } from 'src/shared/ui/EditableActions';
-  import { Cooperative } from 'cooptypes';
+<script lang="ts" setup>
+import { useEditableData } from 'src/shared/lib/composables/useEditableData';
+import { notEmpty, notEmptyPhone } from 'src/shared/lib/utils';
+import { validEmail } from 'src/shared/lib/utils/validEmailRule';
+import { validatePersonalName } from 'src/shared/lib/utils';
+import { EditableActions } from 'src/shared/ui/EditableActions';
+import { Cooperative } from 'cooptypes';
 
-  const props = defineProps({
-    individual: {
-      type: Object as () => Cooperative.Users.IIndividualData,
-      required: true
-    },
-    readonly: {
-      type: Boolean,
-      required: false,
-      default: true
-    }
-  });
+const props = defineProps({
+  individual: {
+    type: Object as () => Cooperative.Users.IIndividualData,
+    required: true
+  },
+  readonly: {
+    type: Boolean,
+    required: false,
+    default: true
+  }
+});
 
-  const handleSave = (updatedIndividual: Cooperative.Users.IIndividualData) => {
-    console.log('Сохранено:', updatedIndividual);
-  };
+const handleSave = (updatedIndividual: Cooperative.Users.IIndividualData) => {
+  console.log('Сохранено:', updatedIndividual);
+};
 
-  const { editableData: data, isEditing, saveChanges, cancelChanges } = useEditableData(props.individual, handleSave);
-  </script>
+const { editableData: data, isEditing, saveChanges, cancelChanges } = useEditableData(props.individual, handleSave);
+</script>