Skip to content

T
traffic-front
Commit 26cb676d authored by gary's avatar gary
Browse files
Options

1、机构管理中的 其他信息修改为税务信息 

2、机构管理 机构列表设置默认隐藏的列
3、机构管理中的 其他信息 添加全部展开和折叠按钮
4、区域为国际化修改了省 可空逻辑

// todo
1、机构国际化修改
2、股东搜索机构
parent 57378487
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 9 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AreaRegionServiceImpl.java
View file @ 26cb676d
......@@ -91,7 +91,7 @@ public class AreaRegionServiceImpl {
AreaRegion provinceRegion = new AreaRegion();
provinceRegion.setId(CommonUtils.getUUID());
provinceRegion.setAreaId(area.getId());
provinceRegion.setRegionId(provinceId);
provinceRegion.setRegionId(null==provinceId?"":area.getId());
areaRegionMapper.insert(provinceRegion);
}
// city
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ 26cb676d
......@@ -342,7 +342,8 @@
"TaxOfficerList": "专管员列表",
"ReturnRate": "返还率",
"EquityInformation": "股权信息",
"OrganizationExtraData": "其他信息",
"OrganizationExtraInfo": "其他信息",
"OrganizationTaxInfo": "税务信息",
"TaxPreferentialInformation": "税收优惠信息",
"OrganizationAdvancedOptions": "高级设置",
"OrganizationMsgEnterpriseAccountSetRequired": "请选择企业账套",
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.ctrl.js
View file @ 26cb676d
......@@ -2,7 +2,7 @@
.controller('OrganizationListViewController', ['$location', '$scope', '$log', 'SweetAlert', '$translate', 'areaRegionService', 'exportService','uiGridTreeViewConstants', '$timeout', 'dimensionService', '$interval', 'orgService', '$q','loginContext','equityService',
function ($location, $scope, $log, SweetAlert, $translate, areaRegionService, exportService,uiGridTreeViewConstants, $timeout, dimensionService, $interval, orgService, $q, loginContext,equityService) {
$scope.expanded = true;
$scope.expanded = false;
var translate={
Enabled:$translate.instant('BusinessUnitActive'), //已启用
Disabled: $translate.instant('BusinessUnitDisabled'),//已停用
......@@ -283,10 +283,10 @@
dataSource: 'DataGridSource'
},
showBorders: true,
/*"export": {
export: {
enabled: true,
filename: "机构信息列表"
},*/
fileName: "机构信息列表"
},
columnChooser: {
enabled: true
},
......@@ -371,301 +371,361 @@
{
dataField: "taxPayerNumberExtra",
caption: $translate.instant('TaxPayerNumberExtra'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "businessScope",
caption: $translate.instant('BusinessScope'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "registrationType",
caption: $translate.instant('RegistrationType'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "architectureType",
caption: $translate.instant('ArchitectureType'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxCreditRating",
caption: $translate.instant('TaxCreditRating'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "numOfBranches",
caption: $translate.instant('NumOfBranches'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "legalPersonName",
caption: $translate.instant('LegalPersonName'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "phoneNumber",
caption: $translate.instant('phoneNumber'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "legalPersonIdNum",
caption: $translate.instant('LegalPersonIdNum'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "generalTaxpayerEffectiveTime",
caption: $translate.instant('GeneralTaxpayerEffectiveTime'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "registrationFinancialOfficerName",
caption: $translate.instant('RegistrationFinancialOfficerName'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "registrationFinancialIdNum",
caption: $translate.instant('RegistrationFinancialIdNum'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "registrationAddressEn",
caption: $translate.instant('RegistrationAddressEn'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "paidInCapital",
caption: $translate.instant('PaidInCapital'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "unifiedSocialCreditCode",
caption: $translate.instant('UnifiedSocialCreditCode'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "registrationStatus",
caption: $translate.instant('RegistrationStatus'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "logoffTime",
caption: $translate.instant('LogoffTime'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "registrationAuthority",
caption: $translate.instant('RegistrationAuthority'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "regFinancialAccountingType",
caption: $translate.instant('RegFinancialAccountingType'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "financialAccountingMethod",
caption: $translate.instant('FinancialAccountingMethod'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "financialAccountingRule",
caption: $translate.instant('FinancialAccountingRule'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "lowValueConsumablesAmortizationMethod",
caption: $translate.instant('LowValueConsumablesAmortizationMethod'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "depreciationMethod",
caption: $translate.instant('DepreciationMethod'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "costingMethod",
caption: $translate.instant('CostingMethod'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "accountingSoftware",
caption: $translate.instant('AccountingSoftware'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "isCompleteRecordTotalInstitutions",
caption: $translate.instant('IsCompleteRecordTotalInstitutions'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonName",
caption: $translate.instant('TaxClientPersonName'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonPhone",
caption: $translate.instant('TaxClientPersonPhone'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonIDNum",
caption: $translate.instant('TaxClientPersonIDNum'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "ticketHolderName",
caption: $translate.instant('TicketHolderName'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "ticketHolderPhoneNum",
caption: $translate.instant('TicketHolderPhoneNum'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "ticketHolderIDNumber",
caption: $translate.instant('TicketHolderIDNumber'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "nationalTaxHallAddress",
caption: $translate.instant('NationalTaxHallAddress'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "nationalTaxAdministratorName",
caption: $translate.instant('NationalTaxAdministratorName'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "nationalTaxAdministratorPhoneNum",
caption: $translate.instant('NationalTaxAdministratorPhoneNum'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "localTaxHallAddress",
caption: $translate.instant('LocalTaxHallAddress'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "localTaxAdministratorName",
caption: $translate.instant('LocalTaxAdministratorName'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "localTaxAdministratorPhoneNumber",
caption: $translate.instant('LocalTaxAdministratorPhoneNumber'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "eTAWebsite",
caption: $translate.instant('eTAWebsite'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "isSignTripartiteAgreement",
caption: $translate.instant('IsSignTripartiteAgreement'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "reportingCurrency",
caption: $translate.instant('ReportingCurrency'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "accountingRate",
caption: $translate.instant('AccountingRate'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "consolidationTime",
caption: $translate.instant('ConsolidationTime'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "employeesCurrentNum",
caption: $translate.instant('EmployeesCurrentNum'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "fiscalYearDeadline",
caption: $translate.instant('FiscalYearDeadline'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxAgent",
caption: $translate.instant('TaxAgent'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxAgentContact",
caption: $translate.instant('TaxAgentContact'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxRuleIntroduction",
caption: $translate.instant('TaxRuleIntroduction'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "auditRequirements",
caption: $translate.instant('AuditRequirements'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "otherFacts",
caption: $translate.instant('OtherFacts'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "taxReturnBusinessType",
caption: $translate.instant('TaxReturnBusinessType'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "branchLocalTaxPaymentRatio",
caption: $translate.instant('BranchLocalTaxPaymentRatio'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "totalAssets",
caption: $translate.instant('TotalAssets'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "nationalEconomicIndustry",
caption: $translate.instant('NationalEconomicIndustry'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "isEngageNationalRestrictionsOrProhibitions",
caption: $translate.instant('IsEngageNationalRestrictionsOrProhibitions'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "applicableAccountingStandardsOrAccountingSystems",
caption: $translate.instant('ApplicableAccountingStandardsOrAccountingSystems'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "isGeneralCorporateFinancialStatementFormat",
caption: $translate.instant('IsGeneralCorporateFinancialStatementFormat'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "isSmallMeagerProfit",
caption: $translate.instant('IsSmallMeagerProfit'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "isListedCompany",
caption: $translate.instant('IsListedCompany'),
visible : false ,
allowHeaderFiltering: false
},
{
dataField: "updateType",
caption: $translate.instant('UpdateType'),
visible : false ,
allowHeaderFiltering: false
}
],
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 26cb676d
......@@ -3,6 +3,8 @@
function ($scope, $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;
$scope.startDate = new Date(2019, 0, 1);
$scope.endDate = new Date(2019, 11, 31);
......@@ -1766,7 +1768,7 @@
// 编辑机构其他信息
$scope.updateOrgExtra = function () {
$('.extra-org-info .control-label span').attr("hidden","hidden");
$('.extra-org-info .right-option button').removeAttr("hidden");
$('.extra-org-info .right-option .button2position').removeAttr("hidden");
$('.extra-org-info .right-option .updOrgBtn').attr("hidden","hidden");
// $('.extra-org-info .control-label input') 不是数组所以用这种方式遍历
for (var i = 0; i < $('.extra-org-info .control-label input').length; i++) {
......@@ -1779,7 +1781,7 @@
$scope.updateOrgExtraCancel = function () {
$scope.selectCompanyExtra=$scope.comExtraOldData;
$('.extra-org-info .control-label span').removeAttr("hidden");
$('.extra-org-info .right-option button').attr("hidden","hidden");
$('.extra-org-info .right-option .button2position').attr("hidden","hidden");
$('.extra-org-info .right-option .updOrgBtn').removeAttr("hidden");
for (var i = 0; i < $('.extra-org-info .control-label input').length; i++) {
$('.extra-org-info .control-label input')[i].style.display = "none";
......@@ -2036,6 +2038,30 @@
DateMonthFormatError: $translate.instant('DateMonthFormatError')
};
$scope.collapseOrgExtraInfoAll = function () {
$scope.showTaxRegInfoContent = false;
$scope.showTraitRegInfoContent = false;
$scope.showTaxRule = false;
$scope.showReturnRateInfo = false;
$scope.showAccountingRateInfo = false;
$scope.showApprovedLevyInfo = false;
$scope.showTaxOfficerInfo = false;
$scope.showInvoiceInfo = false;
$scope.expanded = false;
};
$scope.expandOrgExtraInfoAll = function () {
$scope.showTaxRegInfoContent = true;
$scope.showTraitRegInfoContent = true;
$scope.showTaxRule = true;
$scope.showReturnRateInfo = true;
$scope.showAccountingRateInfo = true;
$scope.showApprovedLevyInfo = true;
$scope.showTaxOfficerInfo = true;
$scope.showInvoiceInfo = true;
$scope.expanded = true;
};
// 验证开始时间
$scope.checkStartDate = function (row) {
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 26cb676d
......@@ -63,7 +63,7 @@
{{'EquityInformation' | translate}}
</md-nav-item>
<md-nav-item md-nav-click="goto('page3')" name="page3">
{{'OrganizationExtraData' | translate}}
{{'OrganizationTaxInfo' | translate}}
</md-nav-item>
<md-nav-item md-nav-click="goto('page4')" name="page4" hidden="hidden">
{{'TaxPreferentialInformation' | translate}}
......@@ -325,6 +325,12 @@
<div class="extra-org-info">
<!--<label class="basic-label">{{'OrganizationBasicData' | translate}}</label>-->
<div class="right-option">
<button type="button" style="" ng-if="!expanded" class="btn btn-in-grid" ng-click="expandOrgExtraInfoAll()">
<i class="fa fa-expand" aria-hidden="true" ng-if="!expanded" ng-click="expandOrgExtraInfoAll()">&nbsp;</i>{{'ExpandAll' | translate }}
</button>
<button type="button" style="" ng-if="expanded" class="btn btn-in-grid" ng-click="collapseOrgExtraInfoAll()">
<i class="fa fa-compress" aria-hidden="true" ng-if="expanded" ng-click="collapseOrgExtraInfoAll()">&nbsp;</i>{{'CollapseAll' | translate}}
</button>
<button type="button" class="updOrgBtn btn btn-in-grid"
style="width: 117px;" ng-click="updateOrgExtra()"
ng-if="hasEditPermission"><i
......
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