Skip to content

T
traffic-front
Commit 6badbf04 authored by zhkwei's avatar zhkwei
Browse files
Options

1、VAT和CIT千分位、右对齐；2、EAM资产导出资产编号列bug

parent 209f4d4d
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 57 deletions
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js
View file @ 6badbf04
......@@ -197,25 +197,25 @@
caption: $translate.instant('DebitAmount'),
dataField: "debitAmount",
format: {type: 'fixedPoint', precision: 2},
width: 180
width: 200
},
{
caption: $translate.instant('CreditAmount'),
dataField: "creditAmount",
format: {type: 'fixedPoint', precision: 2},
width: 180
width: 200
},
{
caption: $translate.instant('BeginningBalance'),
dataField: "beginningBalance",
format: {type: 'fixedPoint', precision: 2},
width: 180
width: 200
},
{
caption: $translate.instant('EndingBalance'),
dataField: "endingBalance",
format: {type: 'fixedPoint', precision: 2},
width: 180
width: 200
}
],
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.ctrl.js
View file @ 6badbf04
......@@ -195,10 +195,10 @@
dataSource: 'gridDataSource'
},
columns: [
{caption: $translate.instant('Attribute'),dataField: "Attribute",width: 200},
{caption: $translate.instant('Attribute'),dataField: "attribute",width: 200},
{caption: $translate.instant('AccountCode'),dataField: "accountCode",width: 200},
{caption: $translate.instant('AccountDescription'), dataField: "accountDescription",width: 250},
{caption: $translate.instant('AccountPeriod'), dataField: "accountPeriod",width: 120},
{caption: $translate.instant('AccountPeriod'), dataField: "accountPeriod",width: 100},
{
caption: $translate.instant('DebitAmount'),
dataField: "debitAmount",
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.ctrl.js
View file @ 6badbf04
......@@ -240,8 +240,18 @@
columnDefs: [
{ name: $translate.instant('CashFlowEntry'), width: '32%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>' },
{ name: $translate.instant('Item'), width: '38%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName2}}<span></div>' },
{ name: $translate.instant('CurrentPeriodAmount'), width: '15%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodAmt}}<span></div>' },
{ name: $translate.instant('ThisYearAccumulatedAmount'), width: '15%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.ytdAmt}}<span></div>' }
{
name: $translate.instant('CurrentPeriodAmount'),
headerCellClass:'rightHeader',
width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodAmt | number:2}}<span></div>'
},
{
name: $translate.instant('ThisYearAccumulatedAmount'),
headerCellClass:'rightHeader',
width: '15%',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.ytdAmt | number:2}}<span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.ctrl.js
View file @ 6badbf04
......@@ -287,8 +287,16 @@
{ name: $translate.instant('BillingDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('SalesTaxNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salesTaxNum}}</span></div>' },
{ name: $translate.instant('SalesTaxName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salespersonName}}</span></div>' },
{ name: $translate.instant('Amount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount}}</span></div>' },
{ name: $translate.instant('TaxAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxAmount}}</span></div>' },
{
name: $translate.instant('Amount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount | number:2}}</span></div>'
},
{
name: $translate.instant('TaxAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.taxAmount | number:2}}</span></div>'
},
{ name: $translate.instant('VerificationMethod'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.verificationMethod}}</span></div>' },
{ name: $translate.instant('ConfirmDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certifiedDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('InvoiceType'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceType}}</span></div>' },
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-coupa-purchasing-report/vat-preview-coupa-purchasing-report.ctrl.js
View file @ 6badbf04
......@@ -297,7 +297,12 @@
{ name: $translate.instant('CoupaDescription'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.description}}</span></div>' },
{ name: $translate.instant('SupplierNumber'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.supplierNum}}</span></div>' },
{ name: $translate.instant('Supplier'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.supplier}}</span></div>' },
{ name: $translate.instant('Total'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalAmount}}</span></div>' },
{
name: $translate.instant('Total'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalAmount | number:2}}</span></div>'
},
{ name: $translate.instant('Currency'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.currency}}</span></div>' },
{ name: $translate.instant('Bill'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billNum}}</span></div>' },
{ name: $translate.instant('Paid'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.paid}}</span></div>' },
......@@ -311,8 +316,18 @@
{ name: $translate.instant('CoupaBillingDate'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('LastUpdatedDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.lastUpdatedDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('LastUpdatedPerson'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.lastUpdatedPerson}}</span></div>' },
{ name: $translate.instant('CoupaTotalTaxAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalTaxAmount}}</span></div>' },
{ name: $translate.instant('TotalTaxAmountHeader'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalTaxAmountHeader}}</span></div>' },
{
name: $translate.instant('CoupaTotalTaxAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalTaxAmount | number:2}}</span></div>'
},
{
name: $translate.instant('TotalTaxAmountHeader'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalTaxAmountHeader | number:2}}</span></div>'
},
{ name: $translate.instant('BillingNote'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingNote}}</span></div>' }
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-coupa-purchasing-report/vat-preview-coupa-purchasing-report.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-data/vat-preview-invoice-data.ctrl.js
View file @ 6badbf04
......@@ -292,15 +292,42 @@
columnDefs: [
{ name: $translate.instant('ProjectName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.projectName}}<span></div>' },
// { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
{ name: $translate.instant('IDTotalAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.totalAmount }}<span></div>' },
{ name: $translate.instant('Amount1'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount1}}</span></div>' },
{ name: $translate.instant('Amount2'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount2}}</span></div>' },
{ name: $translate.instant('Amount3'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount3}}</span></div>' },
{ name: $translate.instant('Amount4'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount4}}</span></div>' },
{ name: $translate.instant('Amount5'), cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.amount5}}</span></div>' },
{ name: $translate.instant('Amount6'), cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.amount6}}</span></div>' },
{ name: $translate.instant('Amount7'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.amount7 }}</span></div>' },
{ name: $translate.instant('OtherAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.otherAmount}}</span></div>' }
{
name: $translate.instant('IDTotalAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.totalAmount | number:2}}<span></div>' },
{
name: $translate.instant('Amount1'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount1 | number:2}}</span></div>' },
{
name: $translate.instant('Amount2'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount2 | number:2}}</span></div>' },
{
name: $translate.instant('Amount3'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount3 | number:2}}</span></div>' },
{
name: $translate.instant('Amount4'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount4 | number:2}}</span></div>' },
{
name: $translate.instant('Amount5'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents " style="text-align: right"><span>{{row.entity.amount5 | number:2}}</span></div>' },
{
name: $translate.instant('Amount6'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents " style="text-align: right"><span>{{row.entity.amount6 | number:2}}</span></div>' },
{
name: $translate.instant('Amount7'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount7 | number:2}}</span></div>' },
{
name: $translate.instant('OtherAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.otherAmount | number:2}}</span></div>' }
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-data/vat-preview-invoice-data.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js
View file @ 6badbf04
......@@ -300,11 +300,21 @@
{ name: $translate.instant('CustomerCompanyName'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fpdm}}">{{row.entity.customerCompanyName}}</span></div>' },
{ name: $translate.instant('InvoiceType'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.invoiceType}}</span></div>' },
{ name: $translate.instant('BillingContent'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.billingContent}}</span></div>' },
{ name: $translate.instant('InvoiceAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.invoiceAmount}}</span></div>' },
{
name: $translate.instant('InvoiceAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span title="{{row.entity.fplx}}">{{row.entity.invoiceAmount | number:2}}</span></div>'
},
{ name: $translate.instant('Applicant'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.applicant}}</span></div>' },
{ name: $translate.instant('OAApplicationNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents "><span>{{row.entity.oaApplicationNum}}</span></div>' },
{ name: $translate.instant('ContractNo'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.contractNo }}</span></div>' },
{ name: $translate.instant('ContractAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.contractAmount}}</span></div>' },
{
name: $translate.instant('ContractAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.contractAmount | number:2}}</span></div>'
},
{ name: $translate.instant('Department'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.department}}</span></div>' },
{ name: $translate.instant('ApplicationDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDate| date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('BillingDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate| date:"yyyy-MM-dd"}}</span></div>' },
......@@ -314,8 +324,13 @@
{ name: $translate.instant('InvoicePaperNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoicesAmount}}</span></div>' },
{ name: $translate.instant('CustomerCompanyTaxNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.customerCompanyTaxNum}}</span></div>' },
{ name: $translate.instant('CustomerSourceSystem'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.contractSourceSystem}}</span></div>' },
{ name: $translate.instant('TaxRate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxRate*100+"%"}}</span></div>' },
{ name: $translate.instant('TaxAmount'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxAmount}}</span></div>' },
{ name: $translate.instant('TaxRate'), width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.taxRate*100+"%"}}</span></div>' },
{
name: $translate.instant('TaxAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.taxAmount | number:2}}</span></div>'
},
{ name: $translate.instant('InvoiceStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceStatus}}</span></div>' },
{ name: $translate.instant('InvoiceSource'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.source}}</span></div>' },
{ name: $translate.instant('InvoiceRemarks'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.remarks}}</span></div>' }
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.ctrl.js
View file @ 6badbf04
......@@ -330,11 +330,36 @@
{ name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
{ name: $translate.instant('Currency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.journalCurrencyCode}}</span></div>' },
{ name: $translate.instant('LocalCurrency'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.sobCurrencyCode}}</span></div>' },
{ name: $translate.instant('JournalDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedDr}}</span></div>' },
{ name: $translate.instant('JournalCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountedCr}}</span></div>' },
{ name: $translate.instant('Amount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>' },
{ name: $translate.instant('LocalCurrencyDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredDr}}</span></div>' },
{ name: $translate.instant('LocalCurrencyCreditAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.enteredCr}}</span></div>' },
{
name: $translate.instant('JournalDebitAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedDr | number:2}}</span></div>'
},
{
name: $translate.instant('JournalCreditAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedCr | number:2}}</span></div>'
},
{
name: $translate.instant('Amount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span></span></div>'
},
{
name: $translate.instant('LocalCurrencyDebitAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.enteredDr | number:2}}</span></div>'
},
{
name: $translate.instant('LocalCurrencyCreditAmount'),
headerCellClass:'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.enteredCr | number:2}}</span></div>'
},
{ name: $translate.instant('CashFlowEntry'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.cfItem}}</span></div>' },
{ name: $translate.instant('City'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute1}}</span></div>' },
{ name: $translate.instant('TransactionDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute2| date:"yyyy-MM-dd"}}</span></div>' },
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.ctrl.js
View file @ 6badbf04
......@@ -538,9 +538,20 @@
enableColumnMenus: false,
enableHorizontalScrollbar : 1,
columnDefs: [
{ name: $translate.instant('ProjectName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>' },
{ name: $translate.instant('EndingBalance'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBal}}<span></div>' },
{ name: $translate.instant('InitialBalance'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.begBal}}</span></div>' }
{
name: $translate.instant('ProjectName'),
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>'
},
{
name: $translate.instant('EndingBalance'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.endBal | number:2}}<span></div>'
},
{
name: $translate.instant('InitialBalance'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.begBal | number:2}}</span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.ctrl.js
View file @ 6badbf04
......@@ -555,9 +555,20 @@
enableSorting: false,
enableColumnMenus: false,
columnDefs: [
{ name: $translate.instant('ProjectName'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>' },
{ name: $translate.instant('CurrentPeriodAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodAmt}}<span></div>' },
{ name: $translate.instant('ThisYearAccumulatedAmount'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.ytdAmt}}</span></div>' }
{
name: $translate.instant('ProjectName'),
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.itemName}}<span></div>'
},
{
name: $translate.instant('CurrentPeriodAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodAmt | number:2}}<span></div>'
},
{
name: $translate.instant('ThisYearAccumulatedAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.ytdAmt | number:2}}</span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.ctrl.js
View file @ 6badbf04
......@@ -301,8 +301,16 @@
{ name: $translate.instant('FillInDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fillInDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('RedLetterInfoSalesTaxNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.salesTaxNumber}}</span></div>' },
{ name: $translate.instant('SalespersonName'), cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.salespersonName}}</span></div>' },
{ name: $translate.instant('RedLetterInfoTotalAmount'), cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalAmount}}</span></div>' },
{ name: $translate.instant('RedLetterInfoTotalTaxAmount'), cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalTaxAmount}}</span></div>' },
{
name: $translate.instant('RedLetterInfoTotalAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalAmount | number:2}}</span></div>'
},
{
name: $translate.instant('RedLetterInfoTotalTaxAmount'),
headerCellClass:'rightHeader',
cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalTaxAmount | number:2}}</span></div>'
},
{ name: $translate.instant('ApplicationSelectionDescription'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDescription}}</span></div>' },
{ name: $translate.instant('ApplicantsManager'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicantManager }}</span></div>' },
{ name: $translate.instant('InvoiceCode'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js
View file @ 6badbf04
......@@ -328,14 +328,44 @@
{ name: $translate.instant('ProductManual'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment6Name}}</span></div>' },
{ name: $translate.instant('ProjectInstruction'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment7Name}}</span></div>' },
{ name: $translate.instant('InterCompanyDescription'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment8Name}}</span></div>' },
{ name: $translate.instant('Alternate1Description'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
{ name: $translate.instant('Alternate2Description'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
{ name: $translate.instant('BegBal'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.begBalBeq}}</span></div>' },
{ name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodDrBeq}}</span></div>' },
{ name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodCrBeq}}</span></div>' },
{ name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.endBalBeq}}</span></div>' },
{ name: $translate.instant('SeasonDebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdDrBeq}}</span></div>' },
{ name: $translate.instant('SeasonCreditsAmount'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.qtdCrBeq}}</span></div>' }
{ name: $translate.instant('Alternate1Description'),width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment9Name}}</span></div>' },
{ name: $translate.instant('Alternate2Description'), width: 100,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment10Name}}</span></div>' },
{
name: $translate.instant('BegBal'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.begBalBeq | number:2}}</span></div>'
},
{
name: $translate.instant('DebitAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodDrBeq | number:2}}</span></div>'
},
{
name: $translate.instant('CreditAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.periodCrBeq | number:2}}</span></div>'
},
{
name: $translate.instant('EndingBalance'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.endBalBeq | number:2}}</span></div>'
},
{
name: $translate.instant('SeasonDebitAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.qtdDrBeq | number:2}}</span></div>'
},
{
name: $translate.instant('SeasonCreditsAmount'),
headerCellClass:'rightHeader',
width: 160,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.qtdCrBeq | number:2}}</span></div>'
}
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.less
View file @ 6badbf04
......@@ -123,7 +123,9 @@
}
}
.rightHeader{
text-align: right;
}
.popover {
min-width: 370px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment