@coopenomics/desktop 2025.5.5 → 2025.5.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/entities/Registrator/model/store.ts +15 -11
- package/src/features/Agreementer/SignAgreementDialog/model/index.ts +5 -3
- package/src/features/Agreementer/SignAgreementDialog/ui/SignAgreementDialog.vue +1 -1
- package/src/features/Decision/AuthorizeAndExecDecision/model/index.ts +6 -9
- package/src/features/Decision/CreateProject/model/index.ts +1 -1
- package/src/features/Decision/VoteAgainstDecision/model/index.ts +14 -2
- package/src/features/Decision/VoteForDecision/model/index.ts +9 -5
- package/src/features/FreeDecision/CreateProject/model/index.ts +1 -1
- package/src/features/Meet/CloseMeetWithDecision/model/index.ts +13 -13
- package/src/features/Meet/CreateMeet/model/index.ts +1 -1
- package/src/features/Meet/RestartMeet/model/index.ts +6 -3
- package/src/features/Request/AcceptRequest/api/index.ts +3 -10
- package/src/features/Request/ConfirmRecieveOnRequest/api/index.ts +4 -9
- package/src/features/Request/ConfirmSupplyOnRequest/api/index.ts +6 -11
- package/src/features/Request/ConfirmSupplyOnRequest/ui/ConfirmSupplyOnRequestButton.vue +1 -1
- package/src/features/Request/CreateChildOrder/model/index.ts +35 -30
- package/src/features/Request/CreateChildOrder/ui/CreateChildOrderButton/CreateChildOrderButton.vue +20 -15
- package/src/features/Request/DisputeOnRequest/api/index.ts +19 -24
- package/src/features/Request/DisputeOnRequest/ui/DisputeOnRequestButton.vue +1 -1
- package/src/features/Request/RecieveOnRequest/api/index.ts +6 -11
- package/src/features/Request/RecieveOnRequest/ui/RecieveOnRequestButton.vue +1 -1
- package/src/features/Request/SupplyOnRequest/api/index.ts +18 -27
- package/src/features/Union/AddCooperative/ui/AddCooperativeForm.vue +7 -5
- package/src/features/User/CreateUser/api/index.ts +28 -10
- package/src/features/User/CreateUser/model/index.ts +39 -31
- package/src/pages/Cooperative/ListOfAgenda/ui/ListOfAgendaQuestions.vue +8 -8
- package/src/pages/Cooperative/ListOfParticipants/ui/ListOfParticipantsPage.vue +3 -3
- package/src/pages/Registrator/SignUp/EmailInput.vue +0 -7
- package/src/pages/Union/ConnectionAgreement/ConnectionAgreementPage.vue +1 -1
- package/src/processes/process-decisions/index.ts +32 -29
- package/src/processes/select-branch/index.ts +1 -1
- package/src/shared/api/indexDB.ts +0 -1
- package/src/shared/lib/document/model/const.ts +30 -0
- package/src/shared/lib/document/model/entity.ts +33 -21
- package/src/shared/lib/document/model/index.ts +1 -1
- package/src/shared/lib/document/model/types.ts +2 -3
- package/src/shared/lib/types/document/index.ts +11 -13
- package/src/shared/lib/types/user/IUserData.ts +5 -6
- package/src/shared/lib/types/user/index.ts +1 -11
- package/src/shared/store/index.ts +9 -5
- package/src/shared/ui/BaseDocument/BaseDocument.vue +43 -42
- package/src/shared/ui/ComplexDocument/ComplexDocument.vue +7 -5
- package/src/shared/ui/ZodForm/ZodForm.vue +1 -1
- package/src/widgets/Cooperative/Documents/ListOfDocuments/ui/DocumentsTable.vue +2 -2
- package/src/widgets/Meets/MeetDetailsVoting/model.ts +4 -4
- package/src/widgets/Participants/ui/ParticipantCard.vue +3 -3
- package/src/widgets/Participants/ui/ParticipantDetails.vue +6 -6
- package/src/widgets/Participants/ui/ParticipantsTable.vue +3 -3
- package/src/widgets/Questions/ui/QuestionsTable/QuestionsTable.vue +8 -8
@@ -51,7 +51,7 @@ div.scroll-area(style="height: 90vh; overflow-y: auto;")
|
|
51
51
|
|
52
52
|
q-td {{ getDocumentHash(props.row).substring(0, 10) || '' }}
|
53
53
|
q-td {{ getDocumentTitle(props.row) }}
|
54
|
-
|
54
|
+
|
55
55
|
q-tr(
|
56
56
|
v-if="expanded.get(props.row?.id || props.row?.statement?.action?.global_sequence)"
|
57
57
|
:key="`e_${props.row?.id || props.row?.statement?.action?.global_sequence}`"
|
@@ -145,7 +145,7 @@ const columns:any[] = [
|
|
145
145
|
field: (row: any) => getDocumentTitle(row),
|
146
146
|
sortable: true
|
147
147
|
},
|
148
|
-
|
148
|
+
|
149
149
|
]
|
150
150
|
|
151
151
|
// Функция для переключения состояния развертывания
|
@@ -30,11 +30,11 @@ export const useMeetDetailsVoting = (
|
|
30
30
|
if (!meet?.processing?.meet) return false
|
31
31
|
|
32
32
|
const isAuthorized = meet.processing.meet.status === 'authorized'
|
33
|
-
|
33
|
+
|
34
34
|
const now = moment()
|
35
35
|
const openAt = moment(meet.processing.meet.open_at)
|
36
36
|
const closeAt = moment(meet.processing.meet.close_at)
|
37
|
-
|
37
|
+
|
38
38
|
const isWithinTimeframe = now.isAfter(openAt) && now.isBefore(closeAt)
|
39
39
|
|
40
40
|
return isAuthorized && isWithinTimeframe
|
@@ -84,7 +84,7 @@ export const useMeetDetailsVoting = (
|
|
84
84
|
username: sessionStore.username,
|
85
85
|
})
|
86
86
|
|
87
|
-
const signedBallot = await signDocument(generatedBallot)
|
87
|
+
const signedBallot = await signDocument(generatedBallot, sessionStore.username)
|
88
88
|
|
89
89
|
const vote: IVoteOnMeetInput = {
|
90
90
|
coopname,
|
@@ -114,4 +114,4 @@ export const useMeetDetailsVoting = (
|
|
114
114
|
formattedCloseDate,
|
115
115
|
submitVote
|
116
116
|
}
|
117
|
-
}
|
117
|
+
}
|
@@ -63,11 +63,11 @@ const getName = (account: IAccount) => {
|
|
63
63
|
const d = account.private_account
|
64
64
|
if (!d) return ''
|
65
65
|
switch (d.type) {
|
66
|
-
case AccountTypes.
|
66
|
+
case AccountTypes.individual:
|
67
67
|
return `${d.individual_data?.last_name} ${d.individual_data?.first_name} ${d.individual_data?.middle_name}`
|
68
|
-
case AccountTypes.
|
68
|
+
case AccountTypes.entrepreneur:
|
69
69
|
return `ИП ${d.entrepreneur_data?.last_name} ${d.entrepreneur_data?.first_name} ${d.entrepreneur_data?.middle_name}`
|
70
|
-
case AccountTypes.
|
70
|
+
case AccountTypes.organization:
|
71
71
|
return d.organization_data?.short_name
|
72
72
|
default:
|
73
73
|
return ''
|
@@ -57,18 +57,18 @@ watch(() => props.tabName, (newVal) => {
|
|
57
57
|
// Компонент для редактирования данных
|
58
58
|
const useComponent = (account: IAccount) => {
|
59
59
|
switch (account.private_account?.type) {
|
60
|
-
case AccountTypes.
|
61
|
-
case AccountTypes.
|
62
|
-
case AccountTypes.
|
60
|
+
case AccountTypes.individual: return EditableIndividualCard
|
61
|
+
case AccountTypes.entrepreneur: return EditableEntrepreneurCard
|
62
|
+
case AccountTypes.organization: return EditableOrganizationCard
|
63
63
|
}
|
64
64
|
}
|
65
65
|
|
66
66
|
// Получение данных участника
|
67
67
|
const usePrivateData = (account: IAccount) => {
|
68
68
|
switch (account.private_account?.type) {
|
69
|
-
case AccountTypes.
|
70
|
-
case AccountTypes.
|
71
|
-
case AccountTypes.
|
69
|
+
case AccountTypes.individual: return account.private_account.individual_data
|
70
|
+
case AccountTypes.entrepreneur: return account.private_account.entrepreneur_data
|
71
|
+
case AccountTypes.organization: return account.private_account.organization_data
|
72
72
|
}
|
73
73
|
}
|
74
74
|
|
@@ -101,11 +101,11 @@ const getName = (account: IAccount) => {
|
|
101
101
|
const d = account.private_account
|
102
102
|
if (!d) return ''
|
103
103
|
switch (d.type) {
|
104
|
-
case AccountTypes.
|
104
|
+
case AccountTypes.individual:
|
105
105
|
return `${d.individual_data?.last_name} ${d.individual_data?.first_name} ${d.individual_data?.middle_name}`
|
106
|
-
case AccountTypes.
|
106
|
+
case AccountTypes.entrepreneur:
|
107
107
|
return `ИП ${d.entrepreneur_data?.last_name} ${d.entrepreneur_data?.first_name} ${d.entrepreneur_data?.middle_name}`
|
108
|
-
case AccountTypes.
|
108
|
+
case AccountTypes.organization:
|
109
109
|
return d.organization_data?.short_name
|
110
110
|
default:
|
111
111
|
return ''
|
@@ -30,8 +30,8 @@ div.scroll-area(style="height: 90vh; overflow-y: auto;")
|
|
30
30
|
:is-voted-any="isVotedAny"
|
31
31
|
@toggle-expand="toggleExpand(props.row.table.id)"
|
32
32
|
@authorize="onAuthorizeDecision(props.row)"
|
33
|
-
@vote-for="onVoteFor(props.row
|
34
|
-
@vote-against="onVoteAgainst(props.row
|
33
|
+
@vote-for="onVoteFor(props.row)"
|
34
|
+
@vote-against="onVoteAgainst(props.row)"
|
35
35
|
)
|
36
36
|
|
37
37
|
template(#header="props")
|
@@ -59,8 +59,8 @@ div.scroll-area(style="height: 90vh; overflow-y: auto;")
|
|
59
59
|
:is-voted-for="isVotedFor"
|
60
60
|
:is-voted-against="isVotedAgainst"
|
61
61
|
:is-voted-any="isVotedAny"
|
62
|
-
@vote-for="onVoteFor(props.row
|
63
|
-
@vote-against="onVoteAgainst(props.row
|
62
|
+
@vote-for="onVoteFor(props.row)"
|
63
|
+
@vote-against="onVoteAgainst(props.row)"
|
64
64
|
)
|
65
65
|
q-td
|
66
66
|
q-btn(
|
@@ -167,11 +167,11 @@ const onAuthorizeDecision = (row: Cooperative.Document.IComplexAgenda) => {
|
|
167
167
|
emit('authorize', row)
|
168
168
|
}
|
169
169
|
|
170
|
-
const onVoteFor = (
|
171
|
-
emit('vote-for',
|
170
|
+
const onVoteFor = (row: Cooperative.Document.IComplexAgenda) => {
|
171
|
+
emit('vote-for', row)
|
172
172
|
}
|
173
173
|
|
174
|
-
const onVoteAgainst = (
|
175
|
-
emit('vote-against',
|
174
|
+
const onVoteAgainst = (row: Cooperative.Document.IComplexAgenda) => {
|
175
|
+
emit('vote-against', row)
|
176
176
|
}
|
177
177
|
</script>
|