Skip to content

T
traffic-front
Commit b27e0d44 authored by eddie.woo's avatar eddie.woo
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents 63e7b2c3 b50a3f69
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 76 deletions
atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrganizationDto.java
View file @ b27e0d44
...@@ -466,6 +466,14 @@ public class OrganizationDto { ...@@ -466,6 +466,14 @@ public class OrganizationDto {
this.pLevel = pLevel; this.pLevel = pLevel;
} }
public Integer getPLevel() {
return pLevel;
}
public void setPLevel(Integer pLevel) {
this.pLevel = pLevel;
}
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/Organization.java
View file @ b27e0d44
...@@ -787,6 +787,30 @@ public class Organization extends BaseEntity implements Serializable { ...@@ -787,6 +787,30 @@ public class Organization extends BaseEntity implements Serializable {
this.pLevel = pLevel; this.pLevel = pLevel;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.p_level
*
* @return the value of organization.p_level
*
* @mbg.generated
*/
public Integer getPLevel() {
return pLevel;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.p_level
*
* @param pLevel the value for organization.p_level
*
* @mbg.generated
*/
public void setPLevel(Integer pLevel) {
this.pLevel = pLevel;
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.create_time * This method returns the value of the database column organization.create_time
...@@ -1699,6 +1723,8 @@ public class Organization extends BaseEntity implements Serializable { ...@@ -1699,6 +1723,8 @@ public class Organization extends BaseEntity implements Serializable {
this.logoutTime = logoutTime; this.logoutTime = logoutTime;
} }
public Area getArea() { public Area getArea() {
return area; return area;
} }
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/OrganizationMapper.xml
View file @ b27e0d44
...@@ -791,6 +791,9 @@ ...@@ -791,6 +791,9 @@
<if test="parentId != null"> <if test="parentId != null">
parent_id = #{parentId,jdbcType=VARCHAR}, parent_id = #{parentId,jdbcType=VARCHAR},
</if> </if>
<if test="parentId == null">
parent_id = NULL,
</if>
<if test="taxPayerNumber != null"> <if test="taxPayerNumber != null">
tax_payer_number = #{taxPayerNumber,jdbcType=VARCHAR}, tax_payer_number = #{taxPayerNumber,jdbcType=VARCHAR},
</if> </if>
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ b27e0d44
...@@ -1835,6 +1835,7 @@ ...@@ -1835,6 +1835,7 @@
"DataImportLog": "Data Import Log", "DataImportLog": "Data Import Log",
"DataImportLogTitle": "Data Import Log", "DataImportLogTitle": "Data Import Log",
"SelectedOrganization": "Selected Organization", "SelectedOrganization": "Selected Organization",
"SelectedDataType": "Selected DataType",
"extractFinancialData": "Extract Financial Data", "extractFinancialData": "Extract Financial Data",
"ExtractFinancialDataTitle": "Extract Financial Data", "ExtractFinancialDataTitle": "Extract Financial Data",
"extractInvoiceData": "Extract Invoice Data", "extractInvoiceData": "Extract Invoice Data",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ b27e0d44
...@@ -361,10 +361,10 @@ ...@@ -361,10 +361,10 @@
"LandAppreciationTax": "土地增值税", "LandAppreciationTax": "土地增值税",
"LastMonth": "上月实际", "LastMonth": "上月实际",
"LegalCode": "法人代码", "LegalCode": "法人代码",
"LegalPersonName": "法定代表人/负责人名称", "LegalPersonName": "法定负责人名称",
"LegalPersonPhoneNumber": "法定代表人/负责人手机", "LegalPersonPhoneNumber": "法定负责人手机",
"LegalPersonLandlineNum": "法定代表人/负责人座机", "LegalPersonLandlineNum": "法定负责人座机",
"LegalPersonEmailAddress": "法定代表人/负责人邮箱", "LegalPersonEmailAddress": "法定负责人邮箱",
"RegFinancialOfficerName": "注册登记财务负责人姓名", "RegFinancialOfficerName": "注册登记财务负责人姓名",
"RegFinancialOfficerPhoneNum": "注册登记财务负责人手机", "RegFinancialOfficerPhoneNum": "注册登记财务负责人手机",
"RegFinancialOfficerLandlineNum": "注册登记财务负责人座机", "RegFinancialOfficerLandlineNum": "注册登记财务负责人座机",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/infrastructure.json
View file @ b27e0d44
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
"BranchLocalTaxPaymentRatio": "分支机构就地纳税比例", "BranchLocalTaxPaymentRatio": "分支机构就地纳税比例",
"TotalAssets": "资产总额", "TotalAssets": "资产总额",
"NationalEconomicIndustry": "所属国民经济行业", "NationalEconomicIndustry": "所属国民经济行业",
"EngageNationalProhibitIndustry": "从事国家限制或禁止行业", "EngageNationalProhibitIndustry": "从事国家限制行业",
"ApplicableAccountingStandardsOrAccountingSystems": "适用会计准则或会计制度", "ApplicableAccountingStandardsOrAccountingSystems": "适用会计准则或会计制度",
"GeneralCorporateFinancialStatementFormat": "采用一般企业财务报表格式", "GeneralCorporateFinancialStatementFormat": "采用一般企业财务报表格式",
"SmallMeagerProfit": "小型微利企业", "SmallMeagerProfit": "小型微利企业",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ b27e0d44
...@@ -2079,6 +2079,8 @@ ...@@ -2079,6 +2079,8 @@
"DataImportLog": "数据导入记录", "DataImportLog": "数据导入记录",
"DataImportLogTitle": "数据导入记录", "DataImportLogTitle": "数据导入记录",
"SelectedOrganization": "选择机构", "SelectedOrganization": "选择机构",
"SelectedDataType": "选择数据类型",
"extractFinancialData": "财务数据抽取", "extractFinancialData": "财务数据抽取",
"ExtractFinancialDataTitle": "财务数据抽取", "ExtractFinancialDataTitle": "财务数据抽取",
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ b27e0d44
...@@ -399,7 +399,8 @@ ...@@ -399,7 +399,8 @@
{ {
dataField: "createTime", dataField: "createTime",
caption: $translate.instant('RevisionDate'), caption: $translate.instant('RevisionDate'),
allowHeaderFiltering:false allowHeaderFiltering:false,
dataType: "date"
}, },
{ {
dataField: "comment", dataField: "comment",
...@@ -2011,7 +2012,7 @@ ...@@ -2011,7 +2012,7 @@
$scope.isCanOrganizationIsActiveBtn = true; $scope.isCanOrganizationIsActiveBtn = true;
}); });
} }
generalSelectCompanyText();
}; };
// 进入高级配置编辑状态 // 进入高级配置编辑状态
...@@ -2219,6 +2220,10 @@ ...@@ -2219,6 +2220,10 @@
$scope.selectCompanyExtra.completeRecordTotalInstitutions?"是":"否"; $scope.selectCompanyExtra.completeRecordTotalInstitutions?"是":"否";
}; };
var generalSelectCompanyText = function(){
$scope.selectCompany.engageNationalProhibitIndustry = $scope.selectCompany.engageNationalProhibitIndustry?"是":"否";
};
// 添加或者编辑机构成功之后，刷新当前页面的数据 // 添加或者编辑机构成功之后，刷新当前页面的数据
$scope.$watch('isOrgUpdate', function (newValue, oldValue) { $scope.$watch('isOrgUpdate', function (newValue, oldValue) {
if (newValue) { if (newValue) {
...@@ -2391,9 +2396,11 @@ ...@@ -2391,9 +2396,11 @@
//加载用户权限list //加载用户权限list
loadUserRoleList(org.id); loadUserRoleList(org.id);
generalSelectCompanyText();
}); });
orgService.getSingleOrgExtra(org.id).success(function (data) { orgService.getSingleOrgExtra(org.id).success(function (data) {
if(data){ if(data){
$scope.selectCompanyExtra = data; $scope.selectCompanyExtra = data;
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ b27e0d44
...@@ -161,13 +161,13 @@ ...@@ -161,13 +161,13 @@
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
<div class="col-sm-12" ng-show="!isInternational"> <div class="col-sm-12" ng-show="!isInternational">
<span class="">{{'Abbreviation' | translate}}：<span <span class="">{{'Abbreviation' | translate}}：<span
title="{{selectCompany.abbreviation}}">{{selectCompany.abbreviation ? (selectCompany.foundationDate):'无'}}</span></span> title="{{selectCompany.abbreviation}}">{{selectCompany.abbreviation ? (selectCompany.abbreviation):'无'}}</span></span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="">{{'FoundationDate' | translate}}：<span <span class="">{{'FoundationDate' | translate}}：<span
title="{{selectCompany.foundationDate}}">{{selectCompany.foundationDate ? (selectCompany.foundationDate):'无'}}</span></span> title="{{selectCompany.foundationDate}}">{{selectCompany.foundationDate | dateFormat:'YYYY-MM-DD'}}</span></span>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<div class="form-group" > <div class="form-group" >
<div class="col-sm-12"> <div class="col-sm-12">
<span class="control-label"> {{'RegistrationLocationEn' | translate}}：<span <span class="control-label"> {{'RegistrationLocationEn' | translate}}：<span
title="{{selectCompany.RegistrationLocationEn}}">{{selectCompany.RegistrationLocationEn }}</span></span> title="{{selectCompany.registrationLocationEn}}">{{selectCompany.registrationLocationEn }}</span></span>
</div> </div>
</div> </div>
<div class="form-group" ng-show="!isInternational"> <div class="form-group" ng-show="!isInternational">
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ b27e0d44
...@@ -221,7 +221,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -221,7 +221,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.isUpdate = true; $scope.isUpdate = true;
}); });
} else { } else {
if (editModel.parentID && $scope.selectedOrganization.suborgList) { if (editModel.parentID && $scope.selectedOrganization.suborgList) {
if (editModel.parentID === editModel.id) { if (editModel.parentID === editModel.id) {
...@@ -238,7 +237,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', ' ...@@ -238,7 +237,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
return; return;
} }
}; };
editModel.isActive = !editModel.isActive; editModel.isActive = !editModel.isActive;
orgService.updateOrg(editModel).success(function (data) { orgService.updateOrg(editModel).success(function (data) {
if (data && !data.result) { if (data && !data.result) {
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ b27e0d44
...@@ -316,13 +316,12 @@ ...@@ -316,13 +316,12 @@
| translate}}：</label> | translate}}：</label>
<div class="col-sm-9" <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.foundationDate.$invalid && (orgControlForm.foundationDate.$dirty || orgControlForm.$submitted)}"> ng-class="{'has-error':orgControlForm.foundationDate.$invalid && (orgControlForm.foundationDate.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker" > <div class="input-daterange startDatepicker">
<input type="text" id="foundationDate" class="input-sm form-control" name="foundationDate" ng-model="editOrgModel.foundationDate" <input type="text" id="foundationDate" class="input-sm form-control" name="foundationDate" ng-model="editOrgModel.foundationDate"
placeholder="{{resources.FoundationDate}}"/> placeholder="{{resources.FoundationDate}}"/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div style="clear: both;"></div> <div style="clear: both;"></div>
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js
View file @ b27e0d44
...@@ -32,13 +32,15 @@ ...@@ -32,13 +32,15 @@
$scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式 $scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式
$scope.selectedPeriod = null; $scope.selectedPeriod = null;
$scope.showTotalSecondRow = false; $scope.showTotalSecondRow = false;
$scope.checkedCompanyList = []; $scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = []; $scope.companyList = [];
$scope.m = []; $scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
$scope.importATExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/ATExcelFile'; $scope.importATExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/ATExcelFile';
var date = new Date(); var date = new Date();
var year = date.getFullYear(); var year = date.getFullYear();
var month = date.getMonth(); var month = date.getMonth();
...@@ -737,7 +739,7 @@ ...@@ -737,7 +739,7 @@
} }
var period = $scope.UploadPeriodTime; var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyList); var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
// var orgIds = $scope.checkedCompanyList; // var orgIds = $scope.checkedCompanyList;
Upload.upload({ Upload.upload({
...@@ -1196,20 +1198,24 @@ ...@@ -1196,20 +1198,24 @@
}; };
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id); var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) { if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){ } else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1); $scope.checkedCompanyList.splice(index, 1);
} }
}); });
if ($scope.companyList.length === $scope.checkedCompanyList.length) { $scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.selectedAll = true;
} else { $scope.checkedCompanyTypeList = "";
$scope.selectedAll = false; $scope.checkedCompanyCodeList = [];
} angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
...@@ -1218,7 +1224,7 @@ ...@@ -1218,7 +1224,7 @@
$scope.selectedOne = true; $scope.selectedOne = true;
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) { angular.forEach($scope.companyList, function (i, index) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
i.checked = true; i.checked = true;
}) })
}else { }else {
...@@ -1228,6 +1234,12 @@ ...@@ -1228,6 +1234,12 @@
i.checked = false; i.checked = false;
}) })
} }
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
View file @ b27e0d44
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
{{'PleaseSelect' | translate}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()" <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne" ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px"> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.name}}</span> <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
</div> </div>
</li> </li>
</ul> </ul>
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js
View file @ b27e0d44
...@@ -32,10 +32,12 @@ ...@@ -32,10 +32,12 @@
$scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式 $scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式
$scope.selectedPeriod = null; $scope.selectedPeriod = null;
$scope.showTotalSecondRow = false; $scope.showTotalSecondRow = false;
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.checkedCompanyList = [];
$scope.companyList = []; $scope.companyList = [];
$scope.m = []; $scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
$scope.importCPRExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/CPRExcelFile'; $scope.importCPRExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/CPRExcelFile';
...@@ -735,7 +737,7 @@ ...@@ -735,7 +737,7 @@
} }
var period = $scope.UploadPeriodTime; var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyList); var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({ Upload.upload({
url: $scope.importCPRExcelFile, url: $scope.importCPRExcelFile,
...@@ -1242,20 +1244,24 @@ ...@@ -1242,20 +1244,24 @@
}; };
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id); var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) { if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){ } else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1); $scope.checkedCompanyList.splice(index, 1);
} }
}); });
if ($scope.companyList.length === $scope.checkedCompanyList.length) { $scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.selectedAll = true;
} else { $scope.checkedCompanyTypeList = "";
$scope.selectedAll = false; $scope.checkedCompanyCodeList = [];
} angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
...@@ -1264,7 +1270,7 @@ ...@@ -1264,7 +1270,7 @@
$scope.selectedOne = true; $scope.selectedOne = true;
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) { angular.forEach($scope.companyList, function (i, index) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
i.checked = true; i.checked = true;
}) })
}else { }else {
...@@ -1274,6 +1280,12 @@ ...@@ -1274,6 +1280,12 @@
i.checked = false; i.checked = false;
}) })
} }
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
View file @ b27e0d44
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
{{'PleaseSelect' | translate}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()" <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne" ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px"> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.name}}</span> <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
</div> </div>
</li> </li>
</ul> </ul>
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js
View file @ b27e0d44
...@@ -32,12 +32,14 @@ ...@@ -32,12 +32,14 @@
$scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式 $scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式
$scope.selectedPeriod = null; $scope.selectedPeriod = null;
$scope.showTotalSecondRow = false; $scope.showTotalSecondRow = false;
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.importIRExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/IRExcelFile'; $scope.importIRExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/IRExcelFile';
$scope.checkedCompanyList = [];
$scope.companyList = []; $scope.companyList = [];
$scope.m = []; $scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
var date = new Date(); var date = new Date();
var year = date.getFullYear(); var year = date.getFullYear();
...@@ -215,7 +217,7 @@ ...@@ -215,7 +217,7 @@
} }
var period = $scope.UploadPeriodTime; var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyList); var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({ Upload.upload({
url: $scope.importIRExcelFile, url: $scope.importIRExcelFile,
...@@ -509,20 +511,24 @@ ...@@ -509,20 +511,24 @@
}; };
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id); var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) { if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){ } else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1); $scope.checkedCompanyList.splice(index, 1);
} }
}); });
if ($scope.companyList.length === $scope.checkedCompanyList.length) { $scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.selectedAll = true;
} else { $scope.checkedCompanyTypeList = "";
$scope.selectedAll = false; $scope.checkedCompanyCodeList = [];
} angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
...@@ -531,7 +537,7 @@ ...@@ -531,7 +537,7 @@
$scope.selectedOne = true; $scope.selectedOne = true;
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) { angular.forEach($scope.companyList, function (i, index) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
i.checked = true; i.checked = true;
}) })
}else { }else {
...@@ -541,6 +547,12 @@ ...@@ -541,6 +547,12 @@
i.checked = false; i.checked = false;
}) })
} }
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.html
View file @ b27e0d44
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
{{'PleaseSelect' | translate}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()" <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne" ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px"> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.name}}</span> <span style="margin-left:5px;text-align: left;float: left;">{{i.name}}</span>
</div> </div>
</li> </li>
</ul> </ul>
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js
View file @ b27e0d44
...@@ -32,10 +32,12 @@ ...@@ -32,10 +32,12 @@
$scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式 $scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式
$scope.selectedPeriod = null; $scope.selectedPeriod = null;
$scope.showTotalSecondRow = false; $scope.showTotalSecondRow = false;
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.checkedCompanyList = [];
$scope.companyList = []; $scope.companyList = [];
$scope.m = []; $scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
$scope.importRLITExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/RLITExcelFile'; $scope.importRLITExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/RLITExcelFile';
...@@ -738,7 +740,7 @@ ...@@ -738,7 +740,7 @@
} }
var period = $scope.UploadPeriodTime; var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyList); var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({ Upload.upload({
url: $scope.importRLITExcelFile, url: $scope.importRLITExcelFile,
...@@ -1246,20 +1248,24 @@ ...@@ -1246,20 +1248,24 @@
}; };
$scope.selectOne = function () { $scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) { angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id); var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) { if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){ } else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1); $scope.checkedCompanyList.splice(index, 1);
} }
}); });
if ($scope.companyList.length === $scope.checkedCompanyList.length) { $scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.selectedAll = true;
} else { $scope.checkedCompanyTypeList = "";
$scope.selectedAll = false; $scope.checkedCompanyCodeList = [];
} angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
...@@ -1268,7 +1274,7 @@ ...@@ -1268,7 +1274,7 @@
$scope.selectedOne = true; $scope.selectedOne = true;
$scope.checkedCompanyList = []; $scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) { angular.forEach($scope.companyList, function (i, index) {
$scope.checkedCompanyList.push(i.id); $scope.checkedCompanyList.push(i);
i.checked = true; i.checked = true;
}) })
}else { }else {
...@@ -1278,6 +1284,12 @@ ...@@ -1278,6 +1284,12 @@
i.checked = false; i.checked = false;
}) })
} }
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList); console.log($scope.checkedCompanyList);
}; };
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ b27e0d44
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
{{'PleaseSelect' | translate}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()" <input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne" ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px"> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.name}}</span> <span style="margin-left:5px;text-align: left;">{{i.name}}</span>
</div> </div>
</li> </li>
</ul> </ul>
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ b27e0d44
...@@ -1435,6 +1435,8 @@ constant.fileTypeList = [ ...@@ -1435,6 +1435,8 @@ constant.fileTypeList = [
{code:2,type:"所有者权益变动表和汇率表"} {code:2,type:"所有者权益变动表和汇率表"}
]; ];
constant.maxButtonTitleLength = 20;
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.html
View file @ b27e0d44
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
<span class="text-bold" translate="SelectedOrganization"></span>: <span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 220px;">
{{'PleaseSelect' | translate}} {{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" style="width: 220px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()" <li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li> <span style="margin-left:5px;float: left;">全选</span></li>
...@@ -36,19 +36,19 @@ ...@@ -36,19 +36,19 @@
</div> </div>
<span class="text-bold" translate="InvoiceQJ"></span>: <span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px"> <div class="period-picker" style="margin-left:10px">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;" <input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:80px;"
readonly="readonly" ng-model="UploadPeriodTime"/> readonly="readonly" ng-model="UploadPeriodTime"/>
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
<span class="text-bold" translate="SelectedDataType"></span>:
<div class="dropdown" style="margin-left:10px"> <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 180px;">
{{'PleaseSelect' | translate}} {{checkedFileTypeList ? ((checkedFileTypeList)|limitString:maxTitleLength):('PleaseSelect' | translate)}}
<span class="caret" style="float: right "></span> <span class="caret" style="float: right "></span>
</button> </button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu2"> <ul class="dropdown-menu" style="width: 180px;" aria-labelledby="dropdownMenu2">
<li><input type="checkbox" ng-model="selectedAllFileType" ng-change="selectAllFileType()" <li><input type="checkbox" ng-model="selectedAllFileType" ng-change="selectAllFile()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li> <span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0; <li role="separator" class="divider" style="height: 1px;margin: 9px 0;
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<li ng-repeat="i in fileTypeList"> <li ng-repeat="i in fileTypeList">
<div class="checkbox-custom checkbox-default"> <div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOneFileType()" <input type="checkbox" ng-model="i.checked" ng-change="selectOneFileType()"
ng-checked="selectedOneFileType" ng-checked="selectedOneFile"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px"> style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.type}}</span> <span style="margin-left:5px;">{{i.type}}</span>
</div> </div>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}" <button type="button" atms-permission permission-control-type="ngIf" permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;" class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
translate="ImportBtn" translate="ImportBtn"
ng-click="doUpload(importEnum.ApiImport)"></button> ng-click="callApi()"></button>
</div> </div>
</div> </div>
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-financial-data/extract-financial-data.less
View file @ b27e0d44
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
} }
.period-picker { .period-picker {
width: 150px; width: 110px;
border: 1px solid #c7c5c0; border: 1px solid #c7c5c0;
display: inline-block; display: inline-block;
line-height: 20px; line-height: 20px;
......
atms-web/src/main/webapp/app/dataImport/data-extraction/extract-invoice-data/extract-invoice-data.html
View file @ b27e0d44
<div class="extract-invoice-data"> <div class="extract-invoice-data">
<!--标题--> <!--标题-->
<div class="nav-wrapper"> <div class="nav-wrapper">
<div class="nav-header" translate="ExtractFinancialDataTitle"></div> <div class="nav-header" translate="ExtractInvoiceDataTitle"></div>
<div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()"> <div class="alert alert-warning" style="width:400px;margin-bottom:5px;" ng-show="ImportErrorTab" ng-click="toggleErrorTab()">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}} <i class="fa fa-exclamation-circle" aria-hidden="true"></i>{{errorMsg}}
</div> </div>
......
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