|
83 | 83 | </div> |
84 | 84 | </template> |
85 | 85 | <template #royalty-cell="{ row }"> |
86 | | - {{ row.getValue('royalty') }} |
87 | | - </template> |
88 | | - <template #minRoyaltyPerMonth-cell="{ row }"> |
89 | | - {{ formatNumber(row.getValue('minRoyaltyPerMonth')) }} |
| 86 | + {{ row.getValue('royalty') }}% / от {{ formatNumber(row.getValue('minRoyaltyPerMonth')) }} |
90 | 87 | </template> |
91 | 88 | <template #marketingFee-cell="{ row }"> |
92 | | - {{ row.getValue('marketingFee') }} |
93 | | - </template> |
94 | | - <template #minMarketingFeePerMonth-cell="{ row }"> |
95 | | - {{ formatNumber(row.getValue('minMarketingFeePerMonth')) }} |
| 89 | + {{ row.getValue('marketingFee') }}% / от {{ formatNumber(row.getValue('minMarketingFeePerMonth')) }} |
96 | 90 | </template> |
97 | 91 | <template #comment-cell="{ row }"> |
98 | 92 | <div class="text-sm/4 whitespace-pre-wrap max-w-56"> |
@@ -161,6 +155,8 @@ const data = computed<PartnerAgreementWithData[]>(() => { |
161 | 155 | const columnVisibility = ref({ |
162 | 156 | id: false, |
163 | 157 | isActive: false, |
| 158 | + minRoyaltyPerMonth: false, |
| 159 | + minMarketingFeePerMonth: false, |
164 | 160 | }) |
165 | 161 | const rowSelection = ref() |
166 | 162 | const pagination = ref({ |
@@ -198,16 +194,16 @@ const columns: Ref<TableColumn<PartnerAgreementWithData>[]> = ref([{ |
198 | 194 | header: 'Файлы / сканы', |
199 | 195 | }, { |
200 | 196 | accessorKey: 'royalty', |
201 | | - header: 'Роялти, %', |
| 197 | + header: 'Роялти', |
202 | 198 | }, { |
203 | 199 | accessorKey: 'minRoyaltyPerMonth', |
204 | 200 | header: 'Мин. роялти', |
205 | 201 | }, { |
206 | 202 | accessorKey: 'marketingFee', |
207 | | - header: 'Маркетинговый взнос, %', |
| 203 | + header: 'Маркетинговый сбор', |
208 | 204 | }, { |
209 | 205 | accessorKey: 'minMarketingFeePerMonth', |
210 | | - header: 'Мин. маркетинговый взнос', |
| 206 | + header: 'Мин. маркетинговый сбор', |
211 | 207 | }, { |
212 | 208 | accessorKey: 'comment', |
213 | 209 | header: 'Комментарий', |
|
0 commit comments