Skip to content

Commit

Permalink
Fix: Accounting Entry Line (PanJiaChen#2926)
Browse files Browse the repository at this point in the history
* Fix: Accounting Entry Line

* Fix: Accounting Entry Line

* Fix: Accounting Entry Line

* Fix: Accounting Entry Line
  • Loading branch information
Ricargame authored Nov 5, 2024
1 parent 8271b12 commit 0344c32
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
-->

<template>
<el-card class="box-card">
<el-card class="box-acct-viewer">
<el-divider content-position="left">
{{ $t('window.containerInfo.accountingInformation.selection') }}
</el-divider>
Expand Down Expand Up @@ -94,3 +94,9 @@ export default defineComponent({
}
})
</script>

<style>
.box-acct-viewer .el-divider--horizontal {
margin: 11px 0px !important
}
</style>
28 changes: 20 additions & 8 deletions src/components/ADempiere/Form/AcctViewer/TableRecords/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
<template>
<div style="padding: 10px;height: -webkit-fill-available;">
<filter-columns />

<el-table
v-loading="isLoadingDataTable"
class="table-acct-viewer"
:data="tableData"
border
:element-loading-text="$t('notifications.loading')"
element-loading-background="rgba(255, 255, 255, 0.8)"
border
style="height: 70%;"
style="height: calc(100vh - 390px); font-size: 12px;"
:cell-style="getColumnStyle"
>
<index-column
:page-number="1"
Expand All @@ -44,7 +45,7 @@

<el-table-column
:label="$t('form.accountingViewer.account')"
:min-width="110"
:min-width="250"
header-align="center"
>
<template slot-scope="scope">
Expand All @@ -54,7 +55,7 @@

<el-table-column
:label="$t('form.accountingViewer.accountedDebit')"
:min-width="170"
:min-width="100"
header-align="center"
>
<span slot-scope="scope" class="cell-align-right">
Expand All @@ -64,7 +65,7 @@

<el-table-column
:label="$t('form.accountingViewer.accountedCredit')"
:min-width="180"
:min-width="100"
header-align="center"
>
<span slot-scope="scope" class="cell-align-right">
Expand Down Expand Up @@ -270,7 +271,9 @@ export default defineComponent({
})

const avaliableAccountingElements = getAvaliableAccountingElements()

function getColumnStyle() {
return 'padding: 0; height: 30px; border: none; '
}
return {
avaliableAccountingElements,
DISPLAY_COLUMN_PREFIX,
Expand All @@ -280,8 +283,17 @@ export default defineComponent({
isShowQuantityColumns,
// Computeds
isLoadingDataTable,
tableData
tableData,
//
getColumnStyle
}
}
})
</script>

<style>
.table-acct-viewer .el-table__cell {
padding: 0 !important;
line-height: 1 !important;
}
</style>
4 changes: 2 additions & 2 deletions src/lang/ADempiere/en/form/accountingViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
const accountingViewer = {
account: 'Account',
accountDate: 'Account Date',
accountedCredit: 'Accoutend Credit',
accountedDebit: 'Accoutend Debit',
accountedCredit: 'Credit',
accountedDebit: 'Debit',
accountingSchema: 'Account Schema',
activity: 'Activity',
businessPartner: 'Business Partner',
Expand Down
4 changes: 2 additions & 2 deletions src/lang/ADempiere/es/form/accountingViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
const accountingViewer = {
account: 'Cuenta',
accountDate: 'Fecha Contable',
accountedCredit: 'Crédito Contabilizado',
accountedDebit: 'Débito Contabilizado',
accountedCredit: 'Crédito',
accountedDebit: 'Débito',
accountingSchema: 'Esquema Contable',
activity: 'Actividad',
businessPartner: 'Socio del Negocio',
Expand Down

0 comments on commit 0344c32

Please sign in to comment.