Commit 7f08eb48 authored by sam.x.wang's avatar sam.x.wang

查询和桔子堆样式

parent ca1a6046
......@@ -76,6 +76,7 @@
<v-container ma-0 pa-0>
<Tableau :url="chartUrl"
width="100%"
ref="tableau"
:apiUrl="tableauApiUrl"
>
......@@ -100,7 +101,7 @@
{
iconName: '#d-iconyihuankuanbufen',
active: false,
title: '税种未返还税金分析',
title: '税分析',
chartUrl: process.env.VUE_APP_TABLEAU_API + 'getTableauTaxCategoryUnreturnedTax',
},
{
......
......@@ -7,6 +7,7 @@
<v-bottom-nav
:active.sync="bottomNav"
:value="true"
color="#ffffff"
absolute
style=" overflow: hidden;
position: fixed;
......@@ -16,25 +17,25 @@
>
<v-btn
color="teal"
color="#333333"
flat
value="panel"
depressed
:to="{name: 'panel'}"
>
<span style="font-size:20px ; color:#999999">仪表盘</span>
<v-icon color="#dddddd">table_chart</v-icon>
<span style="font-size:20px ; ">仪表盘</span>
<v-icon >table_chart</v-icon>
</v-btn>
<v-btn
color="teal"
color="#333333"
flat
value="mine"
depressed
:to="{name: 'mine'}"
>
<span style="font-size:20px ;color:#999999 " > 我的</span>
<v-icon color="#dddddd" >account_box</v-icon>
<span style="font-size:20px ; " > 我的</span>
<v-icon >account_box</v-icon>
</v-btn>
</v-bottom-nav>
......
vatModule.controller('VatPreviewJournalController', ['$rootScope','$scope', '$log', '$filter','$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
vatModule.controller('VatPreviewJournalController', ['$rootScope', '$scope', '$log', '$filter', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope, $scope, $log, $filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
$scope.startMonth = vatSessionService.year+vatSessionService.month;
$scope.endMonth = vatSessionService.year+vatSessionService.month;
$scope.startMonth = vatSessionService.year + vatSessionService.month;
$scope.endMonth = vatSessionService.year + vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
......@@ -67,7 +67,7 @@
$scope.getDataFromDatabase($scope.queryParams);
};
$scope.getDataFromDatabase = function (queryParams){
$scope.getDataFromDatabase = function (queryParams) {
vatPreviewService.getJEDataForDisplay(queryParams).success(function (data) {
if (data) {
// minDate = data.
......@@ -103,8 +103,7 @@
//计算本页记录数
if ($scope.queryJournalEntryResult.pageInfo.pageNum === totalPage) {
$scope.curPageItemCount = $scope.queryJournalEntryResult.pageInfo.total % $scope.pageSize;
}
else {
} else {
$scope.curPageItemCount = $scope.pageSize;
}
......@@ -188,13 +187,15 @@
}
loadJournalEntryDataFromDB(1);
if (!PWC.isNullOrEmpty($scope.criteriaList)) {
if ($scope.criteriaList.length > 6) {
$scope.criteriaListFirstRow = $scope.criteriaList.slice(0, 6);
$scope.criteriaListSecondRow = $scope.criteriaList.slice(6, $scope.criteriaList.length);
}
else {
} else {
$scope.criteriaListFirstRow = $scope.criteriaList.slice(0, $scope.criteriaList.length);
}
}
$('.filter-button').popover("hide");
};
......@@ -260,7 +261,7 @@
var downloadJE = function () {
vatPreviewService.initExportJEData($scope.queryParams).success(function (data, status, headers) {
if(status===204){
if (status === 204) {
SweetAlert.warning("没有数据可以下载");
return;
}
......@@ -306,78 +307,234 @@
virtualizationThreshold: 50,//默认加载50条数据,避免在数据展示时,只显示前面4条
enableSorting: false,
enableColumnMenus: false,
enableHorizontalScrollbar : 1,
enableHorizontalScrollbar: 1,
columnDefs: [
{ name: $translate.instant('ApprovalStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.approvalStatus}}<span></div>' },
{
name: $translate.instant('ApprovalStatus'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.approvalStatus}}<span></div>'
},
// { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
{ name: $translate.instant('Posting'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.postedStatus}}<span></div>' },
{ name: $translate.instant('AccountingPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.period}}</span></div>' },
{ name: $translate.instant('DocumentDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingDate | date:"yyyy-MM-dd"}}</span></div>' },
{ name: $translate.instant('JournalSource'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.journalSource}}</span></div>' },
{ name: $translate.instant('JournalCategory'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.category}}</span></div>' },
{ name: $translate.instant('JournalName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.name}}</span></div>' },
{ name: $translate.instant('DocumentNo'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.voucherNum}}</span></div>' },
{ name: $translate.instant('Summary'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.description}}</span></div>' },
{ name: $translate.instant('MainBodyDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment1Name}}</span></div>' },
{ name: $translate.instant('CostCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>' },
{ name: $translate.instant('SubjectDescription'),width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment3Name}}</span></div>' },
{ name: $translate.instant('AuxiliaryAccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>' },
{ name: $translate.instant('ProfitCenterDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>' },
{ 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('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('Posting'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.postedStatus}}<span></div>'
},
{
name: $translate.instant('AccountingPeriod'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.period}}</span></div>'
},
{
name: $translate.instant('DocumentDate'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountingDate | date:"yyyy-MM-dd"}}</span></div>'
},
{
name: $translate.instant('JournalSource'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.journalSource}}</span></div>'
},
{
name: $translate.instant('JournalCategory'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.category}}</span></div>'
},
{
name: $translate.instant('JournalName'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.name}}</span></div>'
},
{
name: $translate.instant('DocumentNo'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.voucherNum}}</span></div>'
},
{
name: $translate.instant('Summary'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.description}}</span></div>'
},
{
name: $translate.instant('MainBodyDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment1Name}}</span></div>'
},
{
name: $translate.instant('CostCenterDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment2Name}}</span></div>'
},
{
name: $translate.instant('SubjectDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment3Name}}</span></div>'
},
{
name: $translate.instant('AuxiliaryAccountDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment4Name}}</span></div>'
},
{
name: $translate.instant('ProfitCenterDescription'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.segment5Name}}</span></div>'
},
{
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('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'),
headerCellClass:'rightHeader',
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',
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',
headerCellClass: 'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span></span></div>'
},
{
name: $translate.instant('LocalCurrencyDebitAmount'),
headerCellClass:'rightHeader',
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',
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>' },
{ name: $translate.instant('BankAccountNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute3}}</span></div>' },
{ name: $translate.instant('BankSerialNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute4}}</span></div>' },
{ name: $translate.instant('SupplierCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute5}}</span></div>' },
{ name: $translate.instant('TransactionOrderNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute6}}</span></div>' },
{ name: $translate.instant('SupplierName'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute7}}</span></div>' },
{ name: $translate.instant('ReceiveCode'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute8}}</span></div>' },
{ name: $translate.instant('PreparedBy'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute9}}</span></div>' },
{ name: $translate.instant('Reviewer'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute10}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription1'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute11}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription2'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute12}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription3'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute13}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription4'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute14}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription5'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute15}}</span></div>' },
{ name: $translate.instant('CostCenterDepartmentDescription6'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute16}}</span></div>' },
{ name: $translate.instant('GroupCertificateNumber'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span></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>'
},
{
name: $translate.instant('BankAccountNumber'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute3}}</span></div>'
},
{
name: $translate.instant('BankSerialNumber'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute4}}</span></div>'
},
{
name: $translate.instant('SupplierCode'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute5}}</span></div>'
},
{
name: $translate.instant('TransactionOrderNumber'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute6}}</span></div>'
},
{
name: $translate.instant('SupplierName'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute7}}</span></div>'
},
{
name: $translate.instant('ReceiveCode'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute8}}</span></div>'
},
{
name: $translate.instant('PreparedBy'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute9}}</span></div>'
},
{
name: $translate.instant('Reviewer'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute10}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription1'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute11}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription2'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute12}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription3'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute13}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription4'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute14}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription5'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute15}}</span></div>'
},
{
name: $translate.instant('CostCenterDepartmentDescription6'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.attribute16}}</span></div>'
},
{
name: $translate.instant('GroupCertificateNumber'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span></span></div>'
}
]
};
......@@ -393,9 +550,9 @@
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.orgId = vatSessionService.project.organizationID;
if($rootScope.currentLanguage === 'en-us'){
if ($rootScope.currentLanguage === 'en-us') {
$('.periodInput')[0].style.left = "280px";
}else{
} else {
$('.periodInput')[0].style.left = "150px";
}
loadJournalEntryDataFromDB(1);
......
.color_active[data-v-60ac6546]{color:red!important}.head[data-v-18a52f4a]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
.color_active[data-v-1ced4d0d]{color:red!important}.head[data-v-579027fe]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
......@@ -49,4 +49,4 @@
//send 发送
xmlhttp.send();
}*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.e87f05ce.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.6ae9ce65.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.e87f05ce.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.6ae9ce65.js></script></body></html>
\ No newline at end of file
}*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.73dfc5ab.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.07374ae8.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.73dfc5ab.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.07374ae8.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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