@coopenomics/desktop 2.2.10 → 2025.5.2

package/src/shared/ui/ComplexDocument/ComplexDocument.vue

@@ -1,25 +1,48 @@
 <template lang="pug">
 .row.justify-center
-  div.documents-gap.col-md-8.col-xs-12
-    BaseDocument(:doc="complexDocument.statement.document" :action="complexDocument.statement.action")
-    BaseDocument(v-if="complexDocument.decision && complexDocument.decision.document" :doc="complexDocument.decision.document" :action="complexDocument.decision.action")
+  div.documents-gap.col-md-7.col-xs-12
+    // Отображение основного документа с агрегатом
+    BaseDocument(
+      v-if="documentData.statement && documentData.statement.documentAggregate"
+      :documentAggregate="documentData.statement.documentAggregate"
+    )
 
-    BaseDocument(v-for="doc in complexDocument.links" v-bind:key="doc.hash" :doc="doc" :action="complexDocument.statement.action")
+    // Отображение связанных документов из агрегата
+    div(v-if="documentData.links.length > 0 && documentData.statement")
+      div(
+        v-for="linkedDoc, index in documentData.links"
+        v-bind:key="index"
+      ).documents-gap
+        BaseDocument(
+          :documentAggregate="linkedDoc"
+        )
 
+    // Отображение документа решения с агрегатом
+    BaseDocument(
+      v-if="documentData.decision && documentData.decision.documentAggregate"
+      :documentAggregate="documentData.decision.documentAggregate"
+    )
 </template>
 
 <script setup lang="ts">
 import { computed } from 'vue'
 import { BaseDocument } from '../BaseDocument';
-import { Cooperative } from 'cooptypes'
+import type { IDocumentPackageAggregate } from 'src/entities/Document/model/types'
 
 const props = defineProps({
   documents: {
-    type: Object as () => Cooperative.Document.IComplexDocument,
+    type: Object as () => IDocumentPackageAggregate,
     required: true
   },
 })
 
-const complexDocument = computed(() => props.documents)
-
+// Просто используем документы как есть
+const documentData = computed(() => props.documents)
 </script>
+
+<style lang="scss" scoped>
+.documents-gap {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+}
+</style>

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

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

package/src/shared/ui/CopyableInput/ui/CopyableInput.vue

@@ -0,0 +1,62 @@
+<template lang="pug">
+q-input(
+  :label="label"
+  :model-value="modelValue"
+  :readonly="readonly"
+  :standout="standout"
+  :dense="dense"
+  :class="inputClass"
+)
+  template(v-slot:append)
+    q-btn(
+      flat
+      round
+      dense
+      icon="fa fa-copy"
+      @click="copyToClipboard"
+    )
+      q-tooltip Копировать
+</template>
+
+<script lang="ts" setup>
+import { copyToClipboard as copy } from 'quasar'
+import { FailAlert, SuccessAlert } from 'src/shared/api'
+
+const props = defineProps({
+  modelValue: {
+    type: [String, Number],
+    required: true
+  },
+  label: {
+    type: String,
+    default: ''
+  },
+  readonly: {
+    type: Boolean,
+    default: true
+  },
+  standout: {
+    type: [Boolean, String],
+    default: false
+  },
+  dense: {
+    type: Boolean,
+    default: false
+  },
+  inputClass: {
+    type: String,
+    default: ''
+  }
+})
+
+const copyToClipboard = () => {
+  copy(String(props.modelValue))
+    .then(() => {
+      SuccessAlert('Скопировано в буфер обмена')
+    })
+    .catch((e) => {
+      console.error(e)
+      FailAlert('Не удалось скопировать')
+    })
+}
+</script>

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

@@ -125,14 +125,15 @@ q-form(ref="form")
   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 { 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';
-  
+  import 'src/shared/ui/InputStyles/index.scss';
+
   const emit = defineEmits(['update']);
   const { updateAccount } = useUpdateAccount();
-  
+
   const props = defineProps({
     participantData: {
       type: Object as () => IEntrepreneurData,
@@ -143,10 +144,10 @@ q-form(ref="form")
       default: false
     }
   });
-  
+
   const localEntrepreneurData = ref(props.participantData);
   const form = ref();
-  
+
   const handleSave = async () => {
     try {
       const account_data: IUpdateAccountInput = {
@@ -158,13 +159,13 @@ q-form(ref="form")
       SuccessAlert('Данные аккаунта обновлены');
     } catch (e) {
       console.log(e);
-      failAlert(e);
+      FailAlert(e);
     }
   };
-  
+
   const { editableData: data, isEditing, isDisabled, saveChanges, cancelChanges } = useEditableData(
     localEntrepreneurData.value,
     handleSave,
     form
   );
-</script>
+</script>

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

@@ -8,7 +8,7 @@ q-form(ref="form" v-if="data")
     :readonly="readonly"
     :rules="[val => validEmail(val)]"
     autocomplete="off"
-  )  
+  )
   q-input(
     dense
     v-model="data.first_name"
@@ -152,19 +152,20 @@ q-form(ref="form" v-if="data")
     @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 { 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';
-  
+  import 'src/shared/ui/InputStyles/index.scss';
+
   const { updateAccount } = useUpdateAccount()
-  
+
   const props = defineProps({
     participantData: {
       type: Object as () => IIndividualData,
@@ -175,11 +176,11 @@ q-form(ref="form" v-if="data")
       default: false
     }
   });
-  
+
   const localParticipantData = ref(props.participantData);
   const form = ref();
   const emit = defineEmits(['update']);
-  
+
   const handleSave = async () => {
     try {
       const account_data: IUpdateAccountInput = {
@@ -190,14 +191,13 @@ q-form(ref="form" v-if="data")
       emit('update', JSON.parse(JSON.stringify(data.value)))
       SuccessAlert('Данные аккаунта обновлены')
     } catch (e: any) {
-      failAlert(e);
+      FailAlert(e);
     }
   };
-  
+
   const { editableData: data, isEditing, isDisabled, saveChanges, cancelChanges } = useEditableData(
     localParticipantData.value,
     handleSave,
     form
   );
   </script>
-  

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

@@ -1,5 +1,14 @@
 <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-select(
     dense
     v-model="data.type"
@@ -165,51 +174,52 @@ q-form(ref="form" v-if="data")
     @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 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';
+import { validEmail } from 'src/shared/lib/utils/validEmailRule';
+import 'src/shared/ui/InputStyles/index.scss';
+
+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/Form/Form.vue

@@ -7,6 +7,7 @@ interface IFormProps {
   showCancel?: boolean
   buttonSubmitTxt?: string
   buttonCancelTxt?: string
+  disabled?: boolean
 }
 
 withDefaults(defineProps<IFormProps>(), {
@@ -15,6 +16,7 @@ withDefaults(defineProps<IFormProps>(), {
   showSubmit: true,
   buttonSubmitTxt: 'Продолжить',
   buttonCancelTxt: 'Отменить',
+  disabled: false,
 })
 
 const cancel = (): void => {
@@ -28,6 +30,6 @@ q-form(@submit.prevent="handlerSubmit")
     slot
     div.flex
       q-btn(v-if="showCancel" flat @click="cancel" size="sm") {{ buttonCancelTxt }}
-      q-btn(v-if="showSubmit" size="sm" type="submit" :loading="isSubmitting" color="primary") {{ buttonSubmitTxt }}
+      q-btn(v-if="showSubmit" size="sm" type="submit" :loading="isSubmitting" color="primary" :disabled="disabled") {{ buttonSubmitTxt }}
 
 </template>

package/src/shared/ui/InputStyles/index.scss

@@ -0,0 +1,29 @@
+// Стили для инпутов и валидации
+
+// Стили для изменения цвета ошибки валидации
+// .q-field__bottom--animated {
+//   .q-field__messages {
+//     color: red !important;
+//     font-weight: 500 !important;
+//   }
+// }
+
+// .q-field--error {
+//   .q-field__bottom {
+//     color: red !important;
+//   }
+
+//   .q-field__label {
+//     color: red !important;
+//   }
+
+//   &.q-field--highlighted {
+//     .q-field__control {
+//       color: red !important;
+//     }
+//   }
+
+//   .q-field__control {
+//     border-color: red !important;
+//   }
+// }

package/src/shared/ui/TabStyles/index.scss

@@ -0,0 +1,53 @@
+// Стили для компактных табов
+.compact-tabs {
+  border-radius: 8px 8px 0 0;
+  overflow: hidden;
+  background-color: rgba(0, 0, 0, 0.03);
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  border-bottom: none;
+
+  .q-dark & {
+    background-color: rgba(255, 255, 255, 0.05);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    border-bottom: none;
+  }
+
+  :deep(.q-tab) {
+    font-size: 11px !important;
+    font-weight: 400;
+    transition: all 0.2s ease;
+    letter-spacing: -0.2px;
+  }
+
+  :deep(.q-tab__label) {
+    font-size: 11px !important;
+    transition: transform 0.2s ease;
+  }
+
+  :deep(.q-tab__indicator) {
+    height: 3px;
+    opacity: 0.8;
+  }
+}
+
+.q-tab__label {
+  font-size: 12px !important;
+}
+.q-tab {
+  min-height: 32px !important;
+}
+
+// Стили для панелей табов
+.tab-panels-card {
+  font-size: 10px !important;
+  border-radius: 0 0 8px 8px;
+  background-color: rgba(0, 0, 0, 0.02);
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  border-top: none;
+
+  .q-dark & {
+    background-color: rgba(255, 255, 255, 0.03);
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    border-top: none;
+  }
+}

package/src/shared/ui/index.ts

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

package/src/{components/history/AccountEvents.vue → widgets/AccountActions/AccountActionsPage.vue}

@@ -25,8 +25,8 @@
 import { ref, watch, onMounted } from 'vue'
 import moment from 'moment-with-locales-es6'
 import { QTableProps } from 'quasar'
-import ActionCell from 'src/components/explorer/ActionCell.vue'
-import DataCell from 'src/components/explorer/DataCell.vue'
+import ActionCell from './ActionCell.vue'
+import DataCell from './DataCell.vue'
 
 const props = defineProps<{
   username: string

package/src/widgets/AccountActions/index.ts

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

package/src/widgets/BankDetailsCard/ui/BankDetailsCard.vue

@@ -75,7 +75,7 @@ import type { Zeus } from '@coopenomics/sdk';
 import { EditableActions } from 'src/shared/ui/EditableActions';
 import { notEmpty } from 'src/shared/lib/utils';
 import { useUpdateBranchBankAccount } from 'src/features/PaymentMethod/UpdateBankAccount/model';
-import { failAlert } from 'src/shared/api';
+import { FailAlert } from 'src/shared/api';
 
 const props = defineProps({
   bankDetails: {
@@ -93,7 +93,7 @@ const handleSave = async (data: Zeus.ModelTypes['BankPaymentMethod']) => {
     const { updateBankAccount } = useUpdateBranchBankAccount();
     await updateBankAccount(data);
   } catch(e){
-    failAlert(e)
+    FailAlert(e)
   }
 };
 

package/src/widgets/BranchCard/ui/BranchCard.vue

@@ -6,7 +6,7 @@ import type { IBranch } from 'src/entities/Branch/model';
 import { EditableActions } from 'src/shared/ui/EditableActions';
 import { ref } from 'vue';
 import { useEditBranch } from 'src/features/Branch/EditBranch';
-import { failAlert } from 'src/shared/api';
+import { FailAlert } from 'src/shared/api';
 
 const props = defineProps({
   branch: {
@@ -22,7 +22,7 @@ const handleSave = async (updatedBranch: IBranch) => {
   try {
     await editBranch(updatedBranch)
   } catch(e){
-    failAlert(e)
+    FailAlert(e)
   }
 
 };

package/src/widgets/Cooperative/Documents/ListOfDocuments/ui/DocumentCard.vue

@@ -0,0 +1,48 @@
+<template lang="pug">
+div.q-pa-xs.col-xs-12.col-sm-12.col-md-12.q-mt-md
+  q-card(bordered flat)
+    q-card-section.q-py-xs
+      div.text-subtitle2 {{ document.statement?.documentAggregate?.rawDocument?.full_title || '' }}
+      div.text-caption ID: {{ getDocumentHash(document).substring(0, 10) || '' }}
+
+    q-separator
+
+    q-card-actions(align="right")
+      q-btn(size="sm" flat icon="expand_more" @click="$emit('toggle-expand')")
+        | {{ expanded ? 'Скрыть' : 'Подробнее' }}
+
+    q-slide-transition
+      div(v-show="expanded")
+        q-separator
+        q-card-section
+          ComplexDocument(:documents="document")
+</template>
+
+<script setup lang="ts">
+import { ComplexDocument } from 'src/shared/ui/ComplexDocument'
+import type { IDocumentPackageAggregate } from 'src/entities/Document/model'
+
+withDefaults(defineProps<{
+  document: IDocumentPackageAggregate
+  expanded?: boolean
+}>(), {
+  expanded: false
+})
+
+defineEmits<{
+  (e: 'toggle-expand'): void
+}>()
+
+// Получение хеша документа из агрегата
+function getDocumentHash(doc: IDocumentPackageAggregate) {
+  if (doc.statement?.documentAggregate?.rawDocument?.hash) {
+    return doc.statement.documentAggregate.rawDocument.hash
+  }
+
+  if (doc.decision?.documentAggregate?.rawDocument?.hash) {
+    return doc.decision.documentAggregate.rawDocument.hash
+  }
+
+  return 'нет хеша'
+}
+</script>