|
|
@@ -22,95 +22,108 @@ define(['app/app'], function(app) {
|
|
|
$scope.paytype = 'ALL';
|
|
|
$scope.$$transfer = {};
|
|
|
|
|
|
- $scope.tradeRecordTableParams = new ngTableParams({
|
|
|
- page : 1,
|
|
|
- count : 30,
|
|
|
- sorting : {
|
|
|
- transferTime : 'DESC'
|
|
|
- }
|
|
|
- },{
|
|
|
- total : 0,
|
|
|
- getData : function ($defer, params) {
|
|
|
- var param = BaseService.parseParams(params.url());
|
|
|
- if ($scope.keyword && $scope.keyword.length > 0){
|
|
|
- param.keyword = $scope.keyword;
|
|
|
+ var getTradeRecordInfo = function () {
|
|
|
+ $scope.tradeRecordTableParams = new ngTableParams({
|
|
|
+ page : 1,
|
|
|
+ count : 30,
|
|
|
+ sorting : {
|
|
|
+ transferTime : 'DESC'
|
|
|
}
|
|
|
- if ($scope.startDate){
|
|
|
- param.fromDate = $scope.startDate.getTime();
|
|
|
- }
|
|
|
- if ($scope.endDate){
|
|
|
- param.toDate = $scope.endDate.getTime();
|
|
|
- }
|
|
|
- bankTransferService.getVendorBankTransferByMall(param, function (page) {
|
|
|
- if(page.code == 1) {
|
|
|
- $scope.bankTransRecore = page.data.data.content;
|
|
|
- if ($scope.bankTransRecore.length > 0){
|
|
|
- $scope.currencySymbol = $scope.bankTransRecore[0].currencyName;
|
|
|
+ },{
|
|
|
+ total : 0,
|
|
|
+ getData : function ($defer, params) {
|
|
|
+ var param = BaseService.parseParams(params.url());
|
|
|
+ if ($scope.keyword && $scope.keyword.length > 0){
|
|
|
+ param.keyword = $scope.keyword;
|
|
|
+ }
|
|
|
+ if ($scope.startDate){
|
|
|
+ param.fromDate = $scope.startDate.getTime();
|
|
|
+ }
|
|
|
+ if ($scope.endDate){
|
|
|
+ param.toDate = $scope.endDate.getTime();
|
|
|
+ }
|
|
|
+ bankTransferService.getVendorBankTransferByMall(param, function (page) {
|
|
|
+ if(page.code == 1) {
|
|
|
+ $scope.bankTransRecore = page.data.data.content;
|
|
|
+ if ($scope.bankTransRecore.length > 0){
|
|
|
+ $scope.currencySymbol = $scope.bankTransRecore[0].currencyName;
|
|
|
+ }
|
|
|
+ var pageObject = page.data.data;
|
|
|
+ $scope.totalPrice = page.data.total;
|
|
|
+ angular.forEach($scope.bankTransRecode, function (bankT) {
|
|
|
+ bankT.jsonReceive = angular.fromJson(bankT.jsonReceive);
|
|
|
+ });
|
|
|
+ $scope.totalPages = pageObject.totalPages;
|
|
|
+ $scope.param.currentPage = pageObject.number;
|
|
|
+ $scope.totalElements = pageObject.totalElements;
|
|
|
+
|
|
|
+ if(Number($scope.totalElements) > 0) {
|
|
|
+ $scope.$$transfer.start = Number(pageObject.size) * (Number(pageObject.number) - 1) + 1;
|
|
|
+ }else {
|
|
|
+ $scope.$$transfer.start = 0;
|
|
|
+ }
|
|
|
+ $scope.$$transfer.end = Number(pageObject.size) * (Number(pageObject.number) - 1) + Number(pageObject.numberOfElements);
|
|
|
+ //计算页数
|
|
|
+ $scope.acculatePages(pageObject.number, pageObject.totalPages);
|
|
|
+ }else {
|
|
|
+ toaster.pop('info', '获取信息失败:' + page.message);
|
|
|
}
|
|
|
- var pageObject = page.data.data;
|
|
|
- $scope.totalPrice = page.data.total;
|
|
|
- angular.forEach($scope.bankTransRecode, function (bankT) {
|
|
|
- bankT.jsonReceive = angular.fromJson(bankT.jsonReceive);
|
|
|
- });
|
|
|
- $scope.totalPages = pageObject.totalPages;
|
|
|
- $scope.param.currentPage = pageObject.number;
|
|
|
- $scope.totalElements = pageObject.totalElements;
|
|
|
+ }, function (res) {
|
|
|
+ toaster.pop('error', '获取信息失败 ', res.data);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- if(Number($scope.totalElements) > 0) {
|
|
|
- $scope.$$transfer.start = Number(pageObject.size) * (Number(pageObject.number) - 1) + 1;
|
|
|
+ var getBankInfo = function () {
|
|
|
+ $scope.bankInfoTableParams = new ngTableParams({
|
|
|
+ page : 1,
|
|
|
+ count : 10,
|
|
|
+ sorting : {
|
|
|
+ num : 'ASC'
|
|
|
+ }
|
|
|
+ },{
|
|
|
+ total : 0,
|
|
|
+ getData : function ($defer, params) {
|
|
|
+ var param = BaseService.parseParams(params.url());
|
|
|
+ bankInfoService.getSaleEeterpriseBank(param, {}, function(page) {
|
|
|
+ $scope.accounts = page.content;
|
|
|
+
|
|
|
+ $scope.$$bankInfo.totalElements = page.totalElements;
|
|
|
+ if(Number(page.totalElements) > 0) {
|
|
|
+ $scope.$$bankInfo.start = Number(page.size) * (Number(page.number) - 1) + 1;
|
|
|
}else {
|
|
|
- $scope.$$transfer.start = 0;
|
|
|
+ $scope.$$bankInfo.start = 0;
|
|
|
}
|
|
|
- $scope.$$transfer.end = Number(pageObject.size) * (Number(pageObject.number) - 1) + Number(pageObject.numberOfElements);
|
|
|
- //计算页数
|
|
|
- $scope.acculatePages(pageObject.number, pageObject.totalPages);
|
|
|
- }else {
|
|
|
- toaster.pop('info', '获取信息失败:' + page.message);
|
|
|
- }
|
|
|
- }, function (res) {
|
|
|
- toaster.pop('error', '获取信息失败 ', res.data);
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- $scope.bankInfoTableParams = new ngTableParams({
|
|
|
- page : 1,
|
|
|
- count : 10,
|
|
|
- sorting : {
|
|
|
- num : 'ASC'
|
|
|
- }
|
|
|
- },{
|
|
|
- total : 0,
|
|
|
- getData : function ($defer, params) {
|
|
|
- var param = BaseService.parseParams(params.url());
|
|
|
- bankInfoService.getSaleEeterpriseBank(param, {}, function(page) {
|
|
|
- $scope.accounts = page.content;
|
|
|
-
|
|
|
- $scope.$$bankInfo.totalElements = page.totalElements;
|
|
|
- if(Number(page.totalElements) > 0) {
|
|
|
- $scope.$$bankInfo.start = Number(page.size) * (Number(page.number) - 1) + 1;
|
|
|
- }else {
|
|
|
- $scope.$$bankInfo.start = 0;
|
|
|
- }
|
|
|
- $scope.$$bankInfo.end = Number(page.size) * (Number(page.number) - 1) + Number(page.numberOfElements);
|
|
|
+ $scope.$$bankInfo.end = Number(page.size) * (Number(page.number) - 1) + Number(page.numberOfElements);
|
|
|
|
|
|
- params.total(page.totalElements);
|
|
|
- $defer.resolve(page.content);
|
|
|
- }, function(response) {
|
|
|
- toaster.pop('error', '获取账户信息失败 ', response.data);
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
+ params.total(page.totalElements);
|
|
|
+ $defer.resolve(page.content);
|
|
|
+ }, function(response) {
|
|
|
+ toaster.pop('error', '获取账户信息失败 ', response.data);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
var loadAccountData = function() {
|
|
|
- $scope.bankInfoTableParams.page(1);
|
|
|
- $scope.bankInfoTableParams.reload();
|
|
|
+ if ($scope.bankInfoTableParams) {
|
|
|
+ $scope.bankInfoTableParams.page(1);
|
|
|
+ $scope.bankInfoTableParams.reload();
|
|
|
+ } else {
|
|
|
+ getBankInfo();
|
|
|
+ }
|
|
|
};
|
|
|
|
|
|
var loadHistory = function () {
|
|
|
- $scope.tradeRecordTableParams.page(1);
|
|
|
- $scope.tradeRecordTableParams.reload();
|
|
|
+ if ($scope.tradeRecordTableParams) {
|
|
|
+ $scope.tradeRecordTableParams.page(1);
|
|
|
+ $scope.tradeRecordTableParams.reload();
|
|
|
+ } else {
|
|
|
+ getTradeRecordInfo();
|
|
|
+ }
|
|
|
};
|
|
|
+ loadHistory();
|
|
|
|
|
|
var clearRecordParams = function () {
|
|
|
$scope.keyword = null;
|
|
|
@@ -138,7 +151,7 @@ define(['app/app'], function(app) {
|
|
|
break;
|
|
|
case 'accountTab':
|
|
|
clearRecordParams();
|
|
|
- // loadAccountData();
|
|
|
+ loadAccountData();
|
|
|
break;
|
|
|
}
|
|
|
};
|