Skip to content

T
traffic-front
Commit 6ff6b040 authored by gary's avatar gary
Browse files
Options

1、fixbug

parent a3ba953d
Show whitespace changes
Inline Side-by-side
Showing with 350 additions and 245 deletions
atms-api/pom.xml
View file @ 6ff6b040
......@@ -514,6 +514,22 @@
</includes>
<targetPath>${basedir}/target/classes/cit_excel_template</targetPath>
</resource>
<resource>
<directory>src/main/resources/analysis_excel_template</directory>
<includes>
<include>**/*.xls</include>
<include>**/*.xlsx</include>
</includes>
<targetPath>${basedir}/target/classes/analysis_excel_template</targetPath>
</resource>
<resource>
<directory>src/main/resources/user_excel_template</directory>
<includes>
<include>**/*.xls</include>
<include>**/*.xlsx</include>
</includes>
<targetPath>${basedir}/target/classes/user_excel_template</targetPath>
</resource>
</resources>
<plugins>
<plugin>
......
atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateGroupDto.java
View file @ 6ff6b040
......@@ -8,7 +8,7 @@ import java.util.List;
*/
public class TemplateGroupDto {
private String id;
private Long id;
private String name;
private String serviceTypeId;
private Date updateTime;
......@@ -31,11 +31,11 @@ public class TemplateGroupDto {
this.reportType = reportType;
}
public String getId() {
public Long getId() {
return id;
}
public void setId(String id) {
public void setId(Long id) {
this.id = id;
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ 6ff6b040
......@@ -106,9 +106,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
}
public OperationResultDto<Object> updateTemplateGroupName(TemplateGroupDto templateGroupDto) {
TemplateGroup entity = templateGroupMapper.selectByPrimaryKey(Long.parseLong(templateGroupDto.getId()));
TemplateGroup entity = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getId());
TemplateGroupExample example = new TemplateGroupExample();
example.createCriteria().andNameEqualTo(templateGroupDto.getName()).andIdNotEqualTo(Long.parseLong(templateGroupDto.getId())).andServiceTypeIdEqualTo(entity.getServiceTypeId()).andIndustryIdsEqualTo(entity.getIndustryIds()).andPayTaxTypeEqualTo(entity.getPayTaxType());
example.createCriteria().andNameEqualTo(templateGroupDto.getName()).andIdNotEqualTo(templateGroupDto.getId()).andServiceTypeIdEqualTo(entity.getServiceTypeId()).andIndustryIdsEqualTo(entity.getIndustryIds()).andPayTaxTypeEqualTo(entity.getPayTaxType());
List<TemplateGroup> templateGroups = templateGroupMapper.selectByExample(example);
if (!templateGroups.isEmpty()) {
OperationResultDto<Object> result = new OperationResultDto<>();
......@@ -125,7 +125,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public OperationResultDto<Object> deleteTemplateGroup(TemplateGroupDto templateGroupDto) {
OperationResultDto<Object> result = new OperationResultDto<>();
TemplateGroup templateGroupDb = templateGroupMapper.selectByPrimaryKey(Long.parseLong(templateGroupDto.getId()));
TemplateGroup templateGroupDb = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getId());
if (templateGroupDb.getIsSystemType()) {
result.setResult(false);
......@@ -133,7 +133,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
return result;
}
List<String> userOranizationNameList = organizationServiceTemplateGroupMapper.getOrgnizationServiceTemplateGroupOrgNames(Long.parseLong(templateGroupDto.getId()));
List<String> userOranizationNameList = organizationServiceTemplateGroupMapper.getOrgnizationServiceTemplateGroupOrgNames(templateGroupDto.getId());
if (userOranizationNameList != null && !userOranizationNameList.isEmpty()) {
result.setResult(false);
result.setResultMsg(TemplateGroupMessage.ORGANIZATION_USED_TEMPLATE_GROUP);
......
atms-web/src/main/webapp/app-resources/i18n/en-us/systemConfiguration.json
View file @ 6ff6b040
......@@ -92,7 +92,7 @@
"ReportType": "报表类型：",
"SelectReport": "报表：",
"Filter": "筛选:",
"Filter": "筛选",
"KeyValueConfiguration": "关键数据配置",
"AddKeyValue": "添加关键数据",
"FinancialStatement": "财务报表",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/systemConfiguration.json
View file @ 6ff6b040
......@@ -58,7 +58,7 @@
"EtsSubjectNameCol": "对应企业科目",
"ExistMappedOrg": "当前选中机构的科目对应已经存在，是否覆盖？",
"FillingInstructions": "填报说明",
"Filter": "筛选:",
"Filter": "筛选",
"FinancialStatement": "财务报表",
"Formula": "公式：",
"FormulaConfig": "公式配置",
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.html
View file @ 6ff6b040
......@@ -18,13 +18,16 @@
</button>
<div class="account-filter" style="display:inline-block;margin-left: 16px;">
<button type="button" style="font-size: 16px;" class="btn btn-in-grid" ng-click="showFilter()">
<i class="fa fa-filter" ng-click="showFilter()"><span>{{'Filter' | translate}}</span></i>
</button>
<!--
<span style="height: 25px;display: inline-block;line-height: 25px;vertical-align: middle;">
{{'Filter' | translate }}
</span>
<span>
<i class="fa fa-filter" style="font-size: 16px;" aria-hidden="true" ng-click="showFilter()"></i>
</span>
</span>-->
<div class="filter-select" tabindex="-1" style="display:none">
<ul ng-repeat=" x in taxPayerFilterList">
<li>
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.less
View file @ 6ff6b040
......@@ -81,8 +81,9 @@
}
.fa-filter {
font-size: 25px;
vertical-align: sub;
//font-size: 25px;
//vertical-align: sub;
width: 100%;
}
}
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 6ff6b040
......@@ -2135,21 +2135,21 @@
// 编辑机构其他信息
$scope.updateOrgExtra = function () {
$('.extra-organization-info .col-sm-4 span').attr("hidden", "hidden");
$('.extra-organization-info .col-sm-8 span').attr("hidden", "hidden");
$('.tax-reg-info-content .col-sm-4 span').attr("hidden", "hidden");
$('.tax-extra-info-content .col-sm-8 span').attr("hidden", "hidden");
$('.extra-organization-info .right-option .button2position').removeAttr("hidden");
$('.extra-organization-info .right-option .updOrgBtn').attr("hidden", "hidden");
for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
$('.extra-organization-info .col-sm-4 input')[i].style.display = "inline";
for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 input').length; i++) {
$('.tax-reg-info-content .col-sm-4 input')[i].style.display = "inline";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
$('.extra-organization-info .col-sm-4 select')[i].style.display = "inline";
for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 select').length; i++) {
$('.tax-reg-info-content .col-sm-4 select')[i].style.display = "inline";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
$('.extra-organization-info .col-sm-8 input')[i].style.display = "inline";
for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 input').length; i++) {
$('.tax-extra-info-content .col-sm-8 input')[i].style.display = "inline";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
$('.extra-organization-info .col-sm-8 select')[i].style.display = "inline";
for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 select').length; i++) {
$('.tax-extra-info-content .col-sm-8 select')[i].style.display = "inline";
}
$scope.editOldData = angular.copy($scope.editOrgExtraModel);
$scope.comExtraOldData = angular.copy($scope.selectCompanyExtra);
......@@ -2164,21 +2164,21 @@
};
var cancelWebChange = function(){
$('.extra-organization-info .col-sm-8 span').removeAttr("hidden");
$('.extra-organization-info .col-sm-4 span').removeAttr("hidden");
$('.tax-extra-info-content .col-sm-8 span').removeAttr("hidden");
$('.tax-reg-info-content .col-sm-4 span').removeAttr("hidden");
$('.extra-organization-info .right-option .button2position').attr("hidden","hidden");
$('.extra-organization-info .right-option .updOrgBtn').removeAttr("hidden");
for (var i = 0; i < $('.extra-organization-info .col-sm-4 input').length; i++) {
$('.extra-organization-info .col-sm-4 input')[i].style.display = "none";
for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 input').length; i++) {
$('.tax-reg-info-content .col-sm-4 input')[i].style.display = "none";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-4 select').length; i++) {
$('.extra-organization-info .col-sm-4 select')[i].style.display = "none";
for (var i = 0; i < $('.tax-reg-info-content .col-sm-4 select').length; i++) {
$('.tax-reg-info-content .col-sm-4 select')[i].style.display = "none";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-8 input').length; i++) {
$('.extra-organization-info .col-sm-8 input')[i].style.display = "none";
for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 input').length; i++) {
$('.tax-extra-info-content .col-sm-8 input')[i].style.display = "none";
}
for (var i = 0; i < $('.extra-organization-info .col-sm-8 select').length; i++) {
$('.extra-organization-info .col-sm-8 select')[i].style.display = "none";
for (var i = 0; i < $('.tax-extra-info-content .col-sm-8 select').length; i++) {
$('.tax-extra-info-content .col-sm-8 select')[i].style.display = "none";
}
};
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ 6ff6b040
......@@ -412,59 +412,71 @@
</div>
<div class="tax-reg-info-content" ng-show="showTaxRegInfoContent">
<div class="row">
<div class="col-sm-6">
<span class="control-label">{{'TaxPayerNumber' | translate}}：
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'TaxPayerNumber' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.unifiedSocialCreditCode}}">{{selectCompanyExtra.unifiedSocialCreditCode | limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.unifiedSocialCreditCode"
title="{{selectCompanyExtra.unifiedSocialCreditCode}}"
value="{{selectCompanyExtra.unifiedSocialCreditCode | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'TaxReturnBusinessType' | translate}}：<span
title="{{selectCompanyExtra.taxReturnBusinessType}}">{{selectCompanyExtra.taxReturnBusinessType}}</span>
<select class="input-group" style="display: none" name="taxReturnBusinessType"
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'TaxReturnBusinessType' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.taxReturnBusinessType}}">{{selectCompanyExtra.taxReturnBusinessType}}</span>
<select class="input-group" style="display: none"
name="taxReturnBusinessType"
ng-model="editOrgExtraModel.taxReturnBusinessType"
ng-options="x.code as x.code for x in taxReturnBusinessTypeList">
<option value="">{{resources.TaxReturnBusinessType}}</option>
<option value="">{{resources.TaxReturnBusinessType}}
</option>
</select>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label">{{'CompleteRecordTotalInstitutions' | translate}}：<span
title="{{selectCompanyExtra.completeRecordTotalInstitutions}}">{{selectCompanyExtra.completeRecordTotalInstitutions }}</span>
<select class="input-group" style="display: none" name="completeRecordTotalInstitutions"
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'CompleteRecordTotalInstitutions' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.completeRecordTotalInstitutions}}">{{selectCompanyExtra.completeRecordTotalInstitutions }}</span>
<select class="input-group" style="display: none"
name="completeRecordTotalInstitutions"
ng-model="editOrgExtraModel.completeRecordTotalInstitutions"
ng-options="x.code as x.type for x in trueFalse">
</select>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'RegFinancialAccountingType' | translate}}：<span
title="{{selectCompanyExtra.regFinancialAccountingType}}">{{selectCompanyExtra.regFinancialAccountingType }}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'RegFinancialAccountingType' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.regFinancialAccountingType}}">{{selectCompanyExtra.regFinancialAccountingType }}</span>
<select class="input-group" style="display: none" name="regFinancialAccountingType"
ng-model="editOrgExtraModel.regFinancialAccountingType"
ng-options="x.code as x.type for x in regFinancialAccountingTypeList">
</select>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'ApplicableAccountingRule' | translate}}：<span
title="{{selectCompanyExtra.applicableAccountingRule}}">{{selectCompanyExtra.applicableAccountingRule}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'ApplicableAccountingRule' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.applicableAccountingRule}}">{{selectCompanyExtra.applicableAccountingRule}}</span>
<select class="input-group" style="display: none" name="applicableAccountingRule"
ng-model="editOrgExtraModel.applicableAccountingRule"
ng-options="x.type as x.type for x in applicableAccountingRuleList">
<option value="">{{resources.ApplicableAccountingRule}}</option>
</select>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'TaxRegStatus' | translate}}：
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'TaxRegStatus' | translate}}：</span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.taxRegStatus}}">{{selectCompanyExtra.taxRegStatus | limitString:maxValueLength}}</span>
<select class="input-group" style="display: none"
name="taxRegStatus"
......@@ -472,220 +484,242 @@
ng-options="x.type as x.type for x in regStatusList ">
<option value="">{{resources.TaxRegStatus}}</option>
</select>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'LegalPersonName' | translate}}：<span
title="{{selectCompanyExtra.legalPersonName}}">{{selectCompanyExtra.legalPersonName |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'LegalPersonName' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.legalPersonName}}">{{selectCompanyExtra.legalPersonName |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonName"
title="{{selectCompanyExtra.legalPersonName}}"
value="{{selectCompanyExtra.legalPersonName | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'LegalPersonPhoneNumber' | translate}}：
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'LegalPersonPhoneNumber' | translate}}：</span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.legalPersonPhoneNumber}}">{{selectCompanyExtra.legalPersonPhoneNumber | limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonPhoneNumber"
title="{{selectCompanyExtra.legalPersonPhoneNumber}}"
value="{{selectCompanyExtra.legalPersonPhoneNumber | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'LegalPersonLandlineNum' | translate}}：<span
title="{{selectCompanyExtra.legalPersonLandlineNum}}">{{selectCompanyExtra.legalPersonLandlineNum |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'LegalPersonLandlineNum' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.legalPersonLandlineNum}}">{{selectCompanyExtra.legalPersonLandlineNum |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonLandlineNum"
title="{{selectCompanyExtra.legalPersonLandlineNum}}"
value="{{selectCompanyExtra.legalPersonLandlineNum | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'LegalPersonEmailAddress' | translate}}：
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'LegalPersonEmailAddress' | translate}}：</span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.legalPersonEmailAddress}}">{{selectCompanyExtra.legalPersonEmailAddress | limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.legalPersonEmailAddress"
title="{{selectCompanyExtra.legalPersonEmailAddress}}"
value="{{selectCompanyExtra.legalPersonEmailAddress | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'RegFinancialOfficerName' | translate}}：<span
title="{{selectCompanyExtra.regFinancialOfficerName}}">{{selectCompanyExtra.regFinancialOfficerName |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'RegFinancialOfficerName' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.regFinancialOfficerName}}">{{selectCompanyExtra.regFinancialOfficerName |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerName"
title="{{selectCompanyExtra.regFinancialOfficerName}}"
value="{{selectCompanyExtra.regFinancialOfficerName | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'RegFinancialOfficerPhoneNum' | translate}}：
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'RegFinancialOfficerPhoneNum' | translate}}：</span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.regFinancialOfficerPhoneNum}}">{{selectCompanyExtra.regFinancialOfficerPhoneNum | limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerPhoneNum"
title="{{selectCompanyExtra.regFinancialOfficerPhoneNum}}"
value="{{selectCompanyExtra.regFinancialOfficerPhoneNum | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'RegFinancialOfficerLandlineNum' | translate}}：<span
title="{{selectCompanyExtra.regFinancialOfficerLandlineNum}}">{{selectCompanyExtra.regFinancialOfficerLandlineNum |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'RegFinancialOfficerLandlineNum' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.regFinancialOfficerLandlineNum}}">{{selectCompanyExtra.regFinancialOfficerLandlineNum |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerLandlineNum"
title="{{selectCompanyExtra.regFinancialOfficerLandlineNum}}"
value="{{selectCompanyExtra.regFinancialOfficerLandlineNum | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'RegFinancialOfficerEmailAddress' | translate}}：
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'RegFinancialOfficerEmailAddress' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.regFinancialOfficerEmailAddress}}">{{selectCompanyExtra.regFinancialOfficerEmailAddress | limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.regFinancialOfficerEmailAddress"
title="{{selectCompanyExtra.regFinancialOfficerEmailAddress}}"
value="{{selectCompanyExtra.regFinancialOfficerEmailAddress | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'TaxClientPersonName' | translate}}：<span
title="{{selectCompanyExtra.taxClientPersonName}}">{{selectCompanyExtra.taxClientPersonName |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'TaxClientPersonName' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.taxClientPersonName}}">{{selectCompanyExtra.taxClientPersonName |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonName"
title="{{selectCompanyExtra.taxClientPersonName}}"
value="{{selectCompanyExtra.taxClientPersonName | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label">{{'TaxClientPersonPhoneNum' | translate}}：
<div class="col-sm-2" style="text-align: right;">
<span class="control-label">{{'TaxClientPersonPhoneNum' | translate}}：</span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.taxClientPersonPhoneNum}}">{{selectCompanyExtra.taxClientPersonPhoneNum | limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonPhoneNum"
title="{{selectCompanyExtra.taxClientPersonPhoneNum}}"
value="{{selectCompanyExtra.taxClientPersonPhoneNum | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'TaxClientPersonIdNum' | translate}}：<span
title="{{selectCompanyExtra.taxClientPersonIdNum}}">{{selectCompanyExtra.taxClientPersonIdNum |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'TaxClientPersonIdNum' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.taxClientPersonIdNum}}">{{selectCompanyExtra.taxClientPersonIdNum |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonIdNum"
title="{{selectCompanyExtra.taxClientPersonIdNum}}"
value="{{selectCompanyExtra.taxClientPersonIdNum | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label"> {{'TaxClientPersonEmailAddress' | translate}}：<span
title="{{selectCompanyExtra.taxClientPersonEmailAddress}}">{{selectCompanyExtra.taxClientPersonEmailAddress |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'TaxClientPersonEmailAddress' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.taxClientPersonEmailAddress}}">{{selectCompanyExtra.taxClientPersonEmailAddress |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxClientPersonEmailAddress"
title="{{selectCompanyExtra.taxClientPersonEmailAddress}}"
value="{{selectCompanyExtra.taxClientPersonEmailAddress | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'TicketHolderName' | translate}}：<span
title="{{selectCompanyExtra.ticketHolderName}}">{{selectCompanyExtra.ticketHolderName |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'TicketHolderName' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.ticketHolderName}}">{{selectCompanyExtra.ticketHolderName |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.ticketHolderName"
title="{{selectCompanyExtra.ticketHolderName}}"
value="{{selectCompanyExtra.ticketHolderName | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label"> {{'TicketHolderPhoneNum' | translate}}：<span
title="{{selectCompanyExtra.ticketHolderPhoneNum}}">{{selectCompanyExtra.ticketHolderPhoneNum |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'TicketHolderPhoneNum' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.ticketHolderPhoneNum}}">{{selectCompanyExtra.ticketHolderPhoneNum |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.ticketHolderPhoneNum"
title="{{selectCompanyExtra.ticketHolderPhoneNum}}"
value="{{selectCompanyExtra.ticketHolderPhoneNum | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'NationalTaxAdministratorName' | translate}}：<span
title="{{selectCompanyExtra.nationalTaxAdministratorName}}">{{selectCompanyExtra.nationalTaxAdministratorName |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'NationalTaxAdministratorName' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.nationalTaxAdministratorName}}">{{selectCompanyExtra.nationalTaxAdministratorName |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.nationalTaxAdministratorName"
title="{{selectCompanyExtra.nationalTaxAdministratorName}}"
value="{{selectCompanyExtra.nationalTaxAdministratorName | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label"> {{'LocalTaxAdministratorName' | translate}}：<span
title="{{selectCompanyExtra.localTaxAdministratorName}}">{{selectCompanyExtra.localTaxAdministratorName |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'LocalTaxAdministratorName' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.localTaxAdministratorName}}">{{selectCompanyExtra.localTaxAdministratorName |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.localTaxAdministratorName"
title="{{selectCompanyExtra.localTaxAdministratorName}}"
value="{{selectCompanyExtra.localTaxAdministratorName | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'NationalTaxHallAddress' | translate}}：<span
title="{{selectCompanyExtra.nationalTaxHallAddress}}">{{selectCompanyExtra.nationalTaxHallAddress |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'NationalTaxHallAddress' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.nationalTaxHallAddress}}">{{selectCompanyExtra.nationalTaxHallAddress |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.nationalTaxHallAddress"
title="{{selectCompanyExtra.nationalTaxHallAddress}}"
value="{{selectCompanyExtra.nationalTaxHallAddress | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label"> {{'LocalTaxHallAddress' | translate}}：<span
title="{{selectCompanyExtra.localTaxHallAddress}}">{{selectCompanyExtra.localTaxHallAddress |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'LocalTaxHallAddress' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.localTaxHallAddress}}">{{selectCompanyExtra.localTaxHallAddress |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.localTaxHallAddress"
title="{{selectCompanyExtra.localTaxHallAddress}}"
value="{{selectCompanyExtra.localTaxHallAddress | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label"> {{'NationalTaxAdministratorPhoneNum' | translate}}：<span
title="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum}}">{{selectCompanyExtra.nationalTaxAdministratorPhoneNum |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'NationalTaxAdministratorPhoneNum' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum}}">{{selectCompanyExtra.nationalTaxAdministratorPhoneNum |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.nationalTaxAdministratorPhoneNum"
title="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum}}"
value="{{selectCompanyExtra.nationalTaxAdministratorPhoneNum | limitString:maxValueLength}}"/>
</span>
</div>
<div class="col-sm-6">
<span class="control-label"> {{'LocalTaxAdministratorPhoneNum' | translate}}：<span
title="{{selectCompanyExtra.localTaxAdministratorPhoneNum}}">{{selectCompanyExtra.localTaxAdministratorPhoneNum |limitString:maxValueLength}}</span>
<div class="col-sm-2" style="text-align: right;">
<span class="control-label"> {{'LocalTaxAdministratorPhoneNum' | translate}}： </span>
</div>
<div class="col-sm-4">
<span title="{{selectCompanyExtra.localTaxAdministratorPhoneNum}}">{{selectCompanyExtra.localTaxAdministratorPhoneNum |limitString:maxValueLength}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.localTaxAdministratorPhoneNum"
title="{{selectCompanyExtra.localTaxAdministratorPhoneNum}}"
value="{{selectCompanyExtra.localTaxAdministratorPhoneNum | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<span class="control-label">{{'DepreciationMethod' | translate}}：<span
title="{{selectCompanyExtra.depreciationMethod}}">{{selectCompanyExtra.depreciationMethod }}</span>
<select class="input-group" style="display: none"
name="depreciationMethod"
ng-model="editOrgExtraModel.depreciationMethod"
ng-options="x.type as x.type for x in depreciationMethodList">
<option value="">{{resources.DepreciationMethod}}</option>
</select>
</span>
</div>
</div>
</div>
......@@ -697,267 +731,305 @@
<div class="tax-extra-info-content" ng-show="showExtraRegInfoContent">
<div class="quarter-div leftUp">
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label"> {{'TaxPayerNumberVat' | translate}}：<span
title="{{selectCompanyExtra.taxPayerNumberVat}}">{{selectCompanyExtra.taxPayerNumberVat}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label"> {{'TaxPayerNumberVat' | translate}}： </span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.taxPayerNumberVat}}">{{selectCompanyExtra.taxPayerNumberVat}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxPayerNumberVat"
title="{{selectCompanyExtra.taxPayerNumberVat}}"
value="{{selectCompanyExtra.taxPayerNumberVat}}"/>
</span>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label"> {{'TaxCreditRating' | translate}}：<span
title="{{selectCompanyExtra.taxCreditRating}}">{{selectCompanyExtra.taxCreditRating |limitString:maxValueLength}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label"> {{'TaxCreditRating' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.taxCreditRating}}">{{(selectCompanyExtra.taxCreditRating ? (selectCompanyExtra.taxCreditRating):'无') |limitString:maxValueLength}}</span>
<select class="input-group" style="display: none"
name="taxCreditRating"
ng-model="editOrgExtraModel.taxCreditRating"
ng-options="x.type as x.type for x in taxCreditRatingList">
<option value="">{{resources.TaxCreditRating}}</option>
</select>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12">
<span class="control-label"> {{'LowValueConsumablesAmortizationMethod' | translate}}：<span
title="{{selectCompanyExtra.lowValueConsumablesAmortizationMethod}}">{{selectCompanyExtra.lowValueConsumablesAmortizationMethod | limitString:maxValueLength}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label"> {{'LowValueConsumablesAmortizationMethod' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.lowValueConsumablesAmortizationMethod}}">{{(selectCompanyExtra.lowValueConsumablesAmortizationMethod ? (selectCompanyExtra.lowValueConsumablesAmortizationMethod):'无') | limitString:maxValueLength}}</span>
<select class="input-group" style="display: none"
name="lowValueConsumablesAmortizationMethod"
ng-model="editOrgExtraModel.lowValueConsumablesAmortizationMethod"
ng-options="x.type as x.type for x in lowValueConsumablesAmortizationMethodList">
<option value="">{{resources.LowValueConsumablesAmortizationMethod}}</option>
</select>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12">
<span class="control-label">{{'AccountingSoftware' | translate}}：<span
title="{{selectCompanyExtra.accountingSoftware}}">{{selectCompanyExtra.accountingSoftware }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'AccountingSoftware' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.accountingSoftware}}">{{(selectCompanyExtra.accountingSoftware ? (selectCompanyExtra.accountingSoftware):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.accountingSoftware"
title="{{selectCompanyExtra.accountingSoftware}}"
value="{{selectCompanyExtra.accountingSoftware | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<span class="control-label">{{'ThirdPartyBankAccountName' | translate}}：<span
title="{{selectCompanyExtra.bankAccountName}}">{{selectCompanyExtra.bankAccountName }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'ThirdPartyBankAccountName' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.bankAccountName}}">{{(selectCompanyExtra.bankAccountName ? (selectCompanyExtra.bankAccountName):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.bankAccountName"
title="{{selectCompanyExtra.bankAccountName}}"
value="{{selectCompanyExtra.bankAccountName | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12">
<span class="control-label">{{'ReportingCurrency' | translate}}：<span
title="{{selectCompanyExtra.reportingCurrency}}">{{selectCompanyExtra.reportingCurrency }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'ReportingCurrency' | translate}}： </span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.reportingCurrency}}">{{(selectCompanyExtra.reportingCurrency ? (selectCompanyExtra.reportingCurrency):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.reportingCurrency"
title="{{selectCompanyExtra.reportingCurrency}}"
value="{{selectCompanyExtra.reportingCurrency | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<span class="control-label">{{'TaxAgent' | translate}}：<span
title="{{selectCompanyExtra.taxAgent}}">{{selectCompanyExtra.taxAgent }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'TaxAgent' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.taxAgent}}">{{(selectCompanyExtra.taxAgent ? (selectCompanyExtra.taxAgent):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxAgent"
title="{{selectCompanyExtra.taxAgent}}"
value="{{selectCompanyExtra.taxAgent | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12">
<span class="control-label">{{'SecondaryApprovalAmount' | translate}}：<span
title="{{selectCompanyExtra.secondaryApprovalAmount}}">{{selectCompanyExtra.secondaryApprovalAmount }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'SecondaryApprovalAmount' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.secondaryApprovalAmount}}">{{(selectCompanyExtra.secondaryApprovalAmount ? (selectCompanyExtra.secondaryApprovalAmount):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.secondaryApprovalAmount"
title="{{selectCompanyExtra.secondaryApprovalAmount}}"
value="{{selectCompanyExtra.secondaryApprovalAmount | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label">{{'FiscalYearDeadline' | translate}}：<span
title="{{selectCompanyExtra.fiscalYearDeadline}}">{{selectCompanyExtra.fiscalYearDeadline|date:'yyyy-MM-dd'}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'FiscalYearDeadline' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.fiscalYearDeadline}}">{{(selectCompanyExtra.fiscalYearDeadline ? (selectCompanyExtra.fiscalYearDeadline|date:'yyyy-MM-dd'):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.fiscalYearDeadline"
title="{{selectCompanyExtra.fiscalYearDeadline}}"
value="{{selectCompanyExtra.fiscalYearDeadline | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label">{{'TaxRuleIntroduction' | translate}}：<span
title="{{selectCompanyExtra.taxRuleIntroduction}}">{{selectCompanyExtra.taxRuleIntroduction }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'TaxRuleIntroduction' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.taxRuleIntroduction}}">{{(selectCompanyExtra.taxRuleIntroduction ? (selectCompanyExtra.taxRuleIntroduction):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxRuleIntroduction"
title="{{selectCompanyExtra.taxRuleIntroduction}}"
value="{{selectCompanyExtra.taxRuleIntroduction | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label">{{'BusinessRegistrationNumber' | translate}}：<span
title="{{selectCompanyExtra.businessRegistrationNumber}}">{{selectCompanyExtra.businessRegistrationNumber }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'BusinessRegistrationNumber' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.businessRegistrationNumber}}">{{(selectCompanyExtra.businessRegistrationNumber ? (selectCompanyExtra.businessRegistrationNumber):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.businessRegistrationNumber"
title="{{selectCompanyExtra.businessRegistrationNumber}}"
value="{{selectCompanyExtra.businessRegistrationNumber | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label">{{'IssuedShares' | translate}}：<span
title="{{selectCompanyExtra.issuedShares}}">{{selectCompanyExtra.issuedShares }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'IssuedShares' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.issuedShares}}">{{(selectCompanyExtra.issuedShares ? (selectCompanyExtra.issuedShares):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.issuedShares"
title="{{selectCompanyExtra.issuedShares}}"
value="{{selectCompanyExtra.issuedShares | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-4" style="text-align: right" style="text-align: right;">
<span class="control-label">{{'DepreciationMethod' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.depreciationMethod}}">{{(selectCompanyExtra.depreciationMethod ? (selectCompanyExtra.depreciationMethod):'无')}}</span>
<select class="input-group" style="display: none"
name="depreciationMethod"
ng-model="editOrgExtraModel.depreciationMethod"
ng-options="x.type as x.type for x in depreciationMethodList">
<option value="">{{resources.DepreciationMethod}}</option>
</select>
</div>
</div>
</div>
<div class="quarter-div rightUp">
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label"> {{'TaxPayerNumberCit' | translate}}：<span
title="{{selectCompanyExtra.taxPayerNumberCit}}">{{selectCompanyExtra.taxPayerNumberCit}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label"> {{'TaxPayerNumberCit' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.taxPayerNumberCit}}">{{(selectCompanyExtra.taxPayerNumberCit ? (selectCompanyExtra.taxPayerNumberCit):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxPayerNumberCit"
title="{{selectCompanyExtra.taxPayerNumberCit}}"
value="{{selectCompanyExtra.taxPayerNumberCit}}"/>
</span>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12">
<span class="control-label"> {{'ActualBusinessAddress' | translate}}：<span
title="{{selectCompanyExtra.actualBusinessAddress}}">{{selectCompanyExtra.actualBusinessAddress }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label"> {{'ActualBusinessAddress' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.actualBusinessAddress}}">{{(selectCompanyExtra.actualBusinessAddress ? (selectCompanyExtra.actualBusinessAddress):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.actualBusinessAddress"
title="{{selectCompanyExtra.actualBusinessAddress}}"
value="{{selectCompanyExtra.actualBusinessAddress | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<span class="control-label">{{'ListedCompany' | translate}}：<span
title="{{selectCompanyExtra.listedCompany}}">{{selectCompanyExtra.listedCompany }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'ListedCompany' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.listedCompany}}">{{(selectCompanyExtra.listedCompany ? (selectCompanyExtra.listedCompany):'无')}}</span>
<select class="input-group" style="display: none"
name="listedCompany"
ng-model="editOrgExtraModel.listedCompany"
ng-options="x.code as x.type for x in trueFalse">
</select>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12">
<span class="control-label">{{'SignTripartiteAgreement' | translate}}：<span
title="{{selectCompanyExtra.signTripartiteAgreement}}">{{selectCompanyExtra.signTripartiteAgreement }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'SignTripartiteAgreement' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.signTripartiteAgreement}}">{{(selectCompanyExtra.signTripartiteAgreement ? (selectCompanyExtra.signTripartiteAgreement):'无')}}</span>
<select class="input-group" style="display: none"
name="signTripartiteAgreement"
ng-model="editOrgExtraModel.signTripartiteAgreement"
ng-options="x.code as x.type for x in trueFalse">
</select>
</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<span class="control-label">{{'ThirdPartyBankAccountNumber' | translate}}：<span
title="{{selectCompanyExtra.bankAccountNumber}}">{{selectCompanyExtra.bankAccountNumber }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'ThirdPartyBankAccountNumber' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.bankAccountNumber}}">{{(selectCompanyExtra.bankAccountNumber ? (selectCompanyExtra.bankAccountNumber):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.bankAccountNumber"
title="{{selectCompanyExtra.bankAccountNumber}}"
value="{{selectCompanyExtra.bankAccountNumber | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<span class="control-label">{{'EtaWebsite' | translate}}：<span
title="{{selectCompanyExtra.etaWebsite}}">{{selectCompanyExtra.etaWebsite }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'EtaWebsite' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.etaWebsite}}">{{(selectCompanyExtra.etaWebsite ? (selectCompanyExtra.etaWebsite):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.etaWebsite"
title="{{selectCompanyExtra.etaWebsite}}"
value="{{selectCompanyExtra.etaWebsite | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group">
<div class="col-sm-12">
<span class="control-label">{{'TaxAgentContact' | translate}}：<span
title="{{selectCompanyExtra.taxAgentContact}}">{{selectCompanyExtra.taxAgentContact }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'TaxAgentContact' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.taxAgentContact}}">{{(selectCompanyExtra.taxAgentContact ? (selectCompanyExtra.taxAgentContact):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.taxAgentContact"
title="{{selectCompanyExtra.taxAgentContact}}"
value="{{selectCompanyExtra.taxAgentContact | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="!isInternational">
<div class="col-sm-12">
<span class="control-label">{{'SmallMeagerProfit' | translate}}：<span
title="{{selectCompanyExtra.smallMeagerProfit}}">{{selectCompanyExtra.smallMeagerProfit }}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'SmallMeagerProfit' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.smallMeagerProfit}}">{{(selectCompanyExtra.smallMeagerProfit ? (selectCompanyExtra.smallMeagerProfit):'无')}}</span>
<select class="input-group" style="display: none"
name="smallMeagerProfit"
ng-model="editOrgExtraModel.smallMeagerProfit"
ng-options="x.code as x.type for x in trueFalse">
</select>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label">{{'AuditRequirements' | translate}}：<span
title="{{selectCompanyExtra.auditRequirements}}">{{selectCompanyExtra.auditRequirements}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'AuditRequirements' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.auditRequirements}}">{{(selectCompanyExtra.auditRequirements ? (selectCompanyExtra.auditRequirements):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.auditRequirements"
title="{{selectCompanyExtra.auditRequirements}}"
value="{{selectCompanyExtra.auditRequirements | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label">{{'Directors' | translate}}：<span
title="{{selectCompanyExtra.directors}}">{{selectCompanyExtra.directors}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'Directors' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.directors}}">{{(selectCompanyExtra.directors ? (selectCompanyExtra.directors):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.directors"
title="{{selectCompanyExtra.directors}}"
value="{{selectCompanyExtra.directors | limitString:maxValueLength}}"/>
</span>
</div>
</div>
<div class="form-group" ng-show="isInternational">
<div class="col-sm-12">
<span class="control-label">{{'ParValue' | translate}}：<span
title="{{selectCompanyExtra.parValue}}">{{selectCompanyExtra.parValue}}</span>
<div class="col-sm-4" style="text-align: right">
<span class="control-label">{{'ParValue' | translate}}：</span>
</div>
<div class ="col-sm-8">
<span title="{{selectCompanyExtra.parValue}}">{{(selectCompanyExtra.parValue ? (selectCompanyExtra.parValue):'无')}}</span>
<input class="input-group" style="display: none"
ng-model="editOrgExtraModel.parValue"
title="{{selectCompanyExtra.parValue}}"
value="{{selectCompanyExtra.parValue | limitString:maxValueLength}}"/>
</span>
</div>
</div>
</div>
......@@ -1166,7 +1238,8 @@
<!-- 报表模板名 -->
<span class="col-sm-8 block-span" ng-show="!selectCompany.isUpdate">{{service.templateGroupName}}</span>
<div class="col-sm-8 fix-height" ng-show="selectCompany.isUpdate" ng-class="{'has-error':service.selectedTemplateError}">
<select class="form-control account-set-select" style="width:300px" ng-model="service.templateGroupID" ng-change="checkTemplate(service)" name="templateGroupID"> <option ng-repeat="x in service.templateGroupList" value="{{x.id}}" title="{{x.name}}">{{x.name | limitString:30}}</option></select>
<select class="form-control account-set-select" style="width:300px" ng-model="service.templateGroupID" ng-change="checkTemplate(service)" name="templateGroupID">
<option ng-repeat="x in service.templateGroupList" value="{{x.id}}" title="{{x.name}}">{{x.name | limitString:30}}</option></select>
<p ng-show="service.selectedTemplateError" class="has-error label">{{service.selectedTemplateError}}</p>
</div>
</td>
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less
View file @ 6ff6b040
......@@ -459,9 +459,12 @@
outline: none;
}
input {
width: 70% !important;
}
select {
width : 172px;
height : 20px;
width: 70% !important;
}
.divider {
......@@ -496,7 +499,17 @@
font-weight: 700;
font-family: 'Microsoft YaHei Bold', 'Microsoft YaHei Regular', 'Microsoft YaHei';
}
.tax-reg-info-table{
.tax-reg-info-content {
.row input {
width: 70%;
}
.row select {
width: 70%;
}
}
}
.tax-extra-info-table {
......
atms-web/src/main/webapp/app/admin/infrastructure/userDetail/user-detail-view.ctrl.js
View file @ 6ff6b040
......@@ -495,7 +495,7 @@
$scope.userOperateType = constant.Operation.Edit;
$scope.isUpdateUser = false;
$scope.selectedUser = {
id: user.id
id: $stateParams.id
};
};
......
atms-web/src/main/webapp/app/common/controls/edit-user-modal/edit-user-modal.ctrl.js
View file @ 6ff6b040
......@@ -29,13 +29,12 @@ controller('editUserModalController', ['$scope', '$log', '$translate', 'uiGridCo
$scope.editUserModel.Status = userData.status;
$scope.editUserModel.OrganizationID = userData.organizationID;
$scope.editUserModel.Email = userData.email;
$scope.editUserModel.OrgName = userData.orgName;
$scope.editUserModel.orgName = userData.orgName;
$scope.editUserModel.RoleIDs = userData.roleIDs;
$scope.editUserModel.RoleNames = userData.roleNames;
$scope.editUserModel.CreateTime = userData.createTime;
$scope.editUserModel.Password = userData.password;
$scope.editUserModel.isAdmin = userData.isAdmin;
});
$('.edit-user-modal-wrapper .modal').modal('show');
};
......
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