Skip to content

T
traffic-front
Commit 3e9bb5ee authored by Cheng C Yang's avatar Cheng C Yang
Browse files
Options

Fix Bug 23331

parent 3230b2bb
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 70 deletions
atms-web/src/main/webapp/app/admin/basicData/financialData/enterpriseAccountManage/enterprise-account-manage.ctrl.js
View file @ 3e9bb5ee
basicDataModule
.controller('EnterpriseAccountManageController', ['$scope', '$log', 'SweetAlert', 'keywordmapService', 'uiGridConstants', '$translate', 'enterpriseAccountService', 'Upload', 'apiInterceptor', 'templateFormulaService', 'stdAccountService', '$interval', '$timeout', '$q', 'region',
function ($scope, $log, SweetAlert, keywordmapService, uiGridConstants, $translate, enterpriseAccountService, Upload, apiInterceptor, templateFormulaService, stdAccountService, $interval, $timeout, $q, region) {
.controller('EnterpriseAccountManageController', ['$scope', '$location', '$log', 'SweetAlert', 'keywordmapService', 'uiGridConstants', '$translate', 'enterpriseAccountService', 'Upload', 'apiInterceptor', 'templateFormulaService', 'stdAccountService', '$interval', '$timeout', '$q', 'region',
function ($scope, $location, $log, SweetAlert, keywordmapService, uiGridConstants, $translate, enterpriseAccountService, Upload, apiInterceptor, templateFormulaService, stdAccountService, $interval, $timeout, $q, region) {
'use strict';
......@@ -270,7 +270,6 @@
};
$scope.changeEnterpriseAccountSet = function () {
if (!$scope.enterpriseAccountSetSelectID) {
return;
......@@ -283,6 +282,15 @@
loadEnterpriseAccountSet();
};
var jumpToAccount = function () {
// TODO
if($scope.jumpingEnterpriseAccountSetID){
$scope.enterpriseAccountSetSelectID = $scope.jumpingEnterpriseAccountSetID;
$scope.changeEnterpriseAccountSet();
}
};
var loadEnterpriseAccountSet = function () {
enterpriseAccountService.getEnterpriseAccountSet($scope.enterpriseAccountSetSelectID).success(function (data) {
......@@ -453,7 +461,8 @@
var template = $translate.instant(data.resultMsg);
SweetAlert.warning(template);
return;
};
}
;
$scope.lastCode = $scope.editModel.code;
......@@ -469,7 +478,8 @@
SweetAlert.warning(template);
return;
};
}
;
$scope.lastCode = $scope.editModel.code;
SweetAlert.success($translate.instant('SaveSuccess'));
......@@ -692,20 +702,20 @@
if ($scope.singleSelected && $scope.singleSelected.id) {
SweetAlert.swal({
title: $translate.instant('Confirm') + $scope.isActiveBtStr + '?',
text: $translate.instant('ComfirmEnterpriceAccountIsActive').formatObj({
isActiveStr: $scope.isActiveBtStr,
code: $scope.singleSelected.code,
fullName: $scope.singleSelected.fullName
}),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
title: $translate.instant('Confirm') + $scope.isActiveBtStr + '?',
text: $translate.instant('ComfirmEnterpriceAccountIsActive').formatObj({
isActiveStr: $scope.isActiveBtStr,
code: $scope.singleSelected.code,
fullName: $scope.singleSelected.fullName
}),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
// 选中
......@@ -846,16 +856,16 @@
if ($scope.file) {
SweetAlert.swal({
title: $translate.instant('ComfirmImportData'),
text: $translate.instant('EnterpriseAccountSetOverLayImportTips'),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
title: $translate.instant('ComfirmImportData'),
text: $translate.instant('EnterpriseAccountSetOverLayImportTips'),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
// 选中
......@@ -1007,16 +1017,16 @@
if ($scope.file) {
SweetAlert.swal({
title: $translate.instant('ComfirmImportData'),
text: $translate.instant('EnterpriseAccountSetOverLayImportTips'),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
title: $translate.instant('ComfirmImportData'),
text: $translate.instant('EnterpriseAccountSetOverLayImportTips'),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
......@@ -1211,16 +1221,16 @@
var clearRepeatData = function (row) {
SweetAlert.swal({
title: $translate.instant('ConfirmOperation'),
text: $translate.instant('ClearRepeatItemTips'),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
title: $translate.instant('ConfirmOperation'),
text: $translate.instant('ClearRepeatItemTips'),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
......@@ -1374,7 +1384,8 @@
$scope.deleteEnterpriseAccountSetOrg = function (x) {
if (x) {
$scope.editModel.enterpriseAccountSetOrgList.splice(jQuery.inArray(x, $scope.editModel.enterpriseAccountSetOrgList), 1);
};
}
;
};
var getEnterpriseAccountSetOrgListUI = function () {
......@@ -1414,7 +1425,8 @@
}
enterpriseAccountSetOrgList.push(item);
};
}
;
}
$scope.editModel.saveOrgList = enterpriseAccountSetOrgList;
......@@ -1638,16 +1650,16 @@
// 删除关联机构
$scope.deleteRelevantOrg = function (model) {
SweetAlert.swal({
title: $translate.instant('Confirm') + $translate.instant('DeleteRelevantOrg') + '?',
text: $translate.instant('Confirm') + $translate.instant('DeleteRelevantOrg') + model.organizationName,
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
title: $translate.instant('Confirm') + $translate.instant('DeleteRelevantOrg') + '?',
text: $translate.instant('Confirm') + $translate.instant('DeleteRelevantOrg') + model.organizationName,
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: false,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
// 选中
......@@ -1737,10 +1749,10 @@
}, {
id: -1,
name: $translate.instant('StandardAccountCredit')
}, ];
},];
$scope.acctPropList = [
{ id: -1, name: '' },
{id: -1, name: ''},
{
id: 1,
name: $translate.instant('StandardAccountAcctPropAsset')
......@@ -1872,6 +1884,11 @@
$scope.isLoadComplete = true;
}, 500);
$timeout(function () {
jumpToAccount();
}, 600);
};
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 3e9bb5ee
infrastructureModule
.controller('OrganizationManageController', ['$scope', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'enterpriseAccountService', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService',
function ($scope, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, enterpriseAccountService, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService) {
.controller('OrganizationManageController', ['$scope', '$location', '$log', 'orgService', '$interval', 'uiGridTreeViewConstants', 'uiGridConstants', 'SweetAlert', 'projectService', '$translate', '$timeout', 'organizationStructureService', 'areaRegionService', 'apiInterceptor', 'enterpriseAccountService', 'businessUnitService', 'userService', 'roleService', '$q', 'permissionService', 'dimensionService', 'region', 'equityService', 'orgExtraService',
function ($scope, $location, $log, orgService, $interval, uiGridTreeViewConstants, uiGridConstants, SweetAlert, projectService, $translate, $timeout, organizationStructureService, areaRegionService, apiInterceptor, enterpriseAccountService, businessUnitService, userService, roleService, $q, permissionService, dimensionService, region, equityService, orgExtraService) {
'use strict';
$scope.expanded = false;
......@@ -2388,6 +2388,15 @@
});
};
// TODO 跳转到账套界面
$scope.jumpToAccount = function (enterpriseAccountSetID) {
// $location.path("/financialData/enterpriseAccountManage?enterpriseAccountSetID=" + enterpriseAccountSetID);
$location.path("/financialData/enterpriseAccountManage").search({
jumpingEnterpriseAccountSetID: enterpriseAccountSetID
});
};
// 选中机构
$scope.selectOrganization = function (branch) {
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 3e9bb5ee
......@@ -1438,7 +1438,7 @@
<!-- 账套名称 -->
<span class="block-span"
ng-show="!selectCompany.isUpdate">{{set.enterpriseAccountSetName}}</span>
ng-show="!selectCompany.isUpdate" ng-click="jumpToAccount(set.enterpriseAccountSetID)">{{set.enterpriseAccountSetName}}</span>
<select ng-show="selectCompany.isUpdate"
class="form-control account-set-select"
......
atms-web/src/main/webapp/app/cit/report/cit-report-layout/cit-report-layout.ctrl.js
View file @ 3e9bb5ee
......@@ -202,6 +202,15 @@
$scope.hasTaxReturnPermission = data[reportTemp.taxReturnCode];
$scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
$scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
// 将查看纳税申报表权限都赋上
$scope.hasBsPlPermission = true;
$scope.hasBsPermission = true;
$scope.hasPlPermission = true;
$scope.hasTaxReturnPermission = true;
$scope.hasQueryTaxReturnPermission = true;
$scope.hasEditTaxReturnPermission = true;
});
};
var toggleGroup = function (group) {
......
atms-web/src/main/webapp/app/vat/report/vat-report-layout/vat-report-layout.ctrl.js
View file @ 3e9bb5ee
......@@ -204,9 +204,7 @@
$scope.hasQueryTaxReturnPermission = data[reportTemp.taxReturn.queryCode];
$scope.hasEditTaxReturnPermission = data[reportTemp.taxReturn.editCode];
// TODO 临时代码,待删除
// 将查看纳税申报表权限都赋上
$scope.hasBsPlPermission = true;
$scope.hasBsPermission = true;
$scope.hasPlPermission = true;
......@@ -214,7 +212,6 @@
$scope.hasQueryTaxReturnPermission = true;
$scope.hasEditTaxReturnPermission = true;
});
};
var toggleGroup = function (group) {
......
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