Skip to content

T
traffic-front
Commit eb4ff044 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed entity page-- frank

parent 1076e372
Show whitespace changes
Inline Side-by-side
Showing with 613 additions and 2009 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationController.java
View file @ eb4ff044
......@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import pwc.taxtech.atms.dpo.OrgBasicDto;
import pwc.taxtech.atms.dpo.OrgInfoDto;
import pwc.taxtech.atms.dpo.OrgSelectDto;
import pwc.taxtech.atms.dpo.OrganizationDto;
import pwc.taxtech.atms.dto.*;
......@@ -18,6 +17,7 @@ import pwc.taxtech.atms.dto.navtree.NavTreeDto;
import pwc.taxtech.atms.dto.organization.*;
import pwc.taxtech.atms.dto.vatdto.JsonExportDto;
import pwc.taxtech.atms.organization.dpo.OrganizationHKDto;
import pwc.taxtech.atms.organization.entity.OrganizationHK;
import pwc.taxtech.atms.service.impl.OrganizationServiceImpl;
import pwc.taxtech.atms.service.impl.UserRoleServiceImpl;
import pwc.taxtech.atms.service.impl.UserServiceImpl;
......@@ -85,7 +85,7 @@ public class OrganizationController {
// @ApiOperation(value = "层级显示机构列表_列表显示")
@RequestMapping(value = "getOrgInfoList", method = RequestMethod.GET)
public @ResponseBody
List<OrgInfoDto> getOrgInfoList() {
List<OrganizationHK> getOrgInfoList() {
logger.info("GET /api/v1/org/getOrgInfoList");
return organizationService.getOrgInfo();
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java
View file @ eb4ff044
......@@ -236,7 +236,7 @@ public class OrganizationServiceImpl extends BaseService {
private OrganizationHKDto genarateSubOrgs(OrganizationHKDto parentOrg, List<OrganizationHK> orgs,
List<ServiceType> serviceList, Integer useType) {
if (parentOrg.getParentId()>0) {
if (parentOrg.getParentId() > 0) {
OrganizationHK organization = orgs.stream().filter(x -> x.getId().equals(parentOrg.getParentId()))
.collect(Collectors.toList()).get(0);
parentOrg.setParentName(organization == null ? null : organization.getName());
......@@ -338,36 +338,35 @@ public class OrganizationServiceImpl extends BaseService {
* @return List<OrgInfoDto>
* @author Gary J Li
*/
public List<OrgInfoDto> getOrgInfo() {
List<OrgInfoDto> orgInfoDtoList = new ArrayList<>();
List<OrgBasicDto> orgBasicDtoList = organizationMapper.selectIndBusiunitAreaOrgstrctReg(false);
List<OrganizationExtra> organizationExtraList = organizationExtraMapper.selectByExample(null);
if (orgBasicDtoList != null && !orgBasicDtoList.isEmpty()) {
for (OrgBasicDto orgBasicDto : orgBasicDtoList) {
OrgInfoDto orgInfoDto = new OrgInfoDto();
addBasicInfo(orgInfoDto, orgBasicDto);
for (OrganizationExtra organizationExtra : organizationExtraList) {
// 机构没有其他信息时，也将机构基本信息拼入查询结果
if (StringUtils.equals(orgBasicDto.getId(), organizationExtra.getOrganizationId())) {
addExtraInfo(orgInfoDto, organizationExtra);
break;
}
}
orgInfoDtoList.add(orgInfoDto);
}
}
public List<OrganizationHK> getOrgInfo() {
// List<OrganizationHKDto> orgInfoDtoList = new ArrayList<>();
List<OrganizationHK> orgBasicDtoList = organizationHKMapper.selectByExample(null);
// if (orgBasicDtoList != null && !orgBasicDtoList.isEmpty()) {
// for (OrgBasicDto orgBasicDto : orgBasicDtoList) {
// OrgInfoDto orgInfoDto = new OrgInfoDto();
// addBasicInfo(orgInfoDto, orgBasicDto);
// for (OrganizationExtra organizationExtra : organizationExtraList) {
// // 机构没有其他信息时，也将机构基本信息拼入查询结果
// if (StringUtils.equals(orgBasicDto.getId(), organizationExtra.getOrganizationId())) {
// addExtraInfo(orgInfoDto, organizationExtra);
// break;
// }
// }
// orgInfoDtoList.add(orgInfoDto);
// }
// }
//判断用户是否是admin用户，不是则进行机构权限判断
String uid = authUserHelper.getCurrentUserId();
User user = userMapper.selectByPrimaryKey(uid);
if (!user.getIsSuperAdmin()) {
UserOrganizationExample userOrganizationExample = new UserOrganizationExample();
userOrganizationExample.createCriteria().andUserIdEqualTo(user.getId());
List<UserOrganization> userOrganizations = userOrganizationMapper.selectByExample(userOrganizationExample);
List<String> userOrgIds = userOrganizations.stream().map(e -> e.getOrganizationId()).collect(toList());
List<OrgInfoDto> orgInfoDtoFilterList = orgInfoDtoList.stream().filter(orgInfoDto -> userOrgIds.contains(orgInfoDto.getId())).collect(toList());
return orgInfoDtoFilterList;
}
return orgInfoDtoList;
// String uid = authUserHelper.getCurrentUserId();
// User user = userMapper.selectByPrimaryKey(uid);
// if (!user.getIsSuperAdmin()) {
// UserOrganizationExample userOrganizationExample = new UserOrganizationExample();
// userOrganizationExample.createCriteria().andUserIdEqualTo(user.getId());
// List<UserOrganization> userOrganizations = userOrganizationMapper.selectByExample(userOrganizationExample);
// List<String> userOrgIds = userOrganizations.stream().map(e -> e.getOrganizationId()).collect(toList());
// List<OrgInfoDto> orgInfoDtoFilterList = orgInfoDtoList.stream().filter(orgInfoDto -> userOrgIds.contains(orgInfoDto.getId())).collect(toList());
// return orgInfoDtoFilterList;
// }
return orgBasicDtoList;
}
private void addBasicInfo(OrgInfoDto orgInfoDto, OrgBasicDto orgBasicDto) {
......@@ -1914,32 +1913,10 @@ public class OrganizationServiceImpl extends BaseService {
public OrganizationHKDto getSingleOrgByOrgId(Long orgId) {
OrganizationHK organizationHK = organizationHKMapper.selectByPrimaryKey(orgId);
OrganizationHKDto result = new OrganizationHKDto();
CommonUtils.copyProperties(organizationHK,result);
CommonUtils.copyProperties(organizationHK, result);
Assert.notNull(result, "result is null");
result.setLevel(result.getLevel() == null ? 0 : result.getLevel());
// result.setIsSystemDimension(result.getIsSystemDimension() == null ? false : result.getIsSystemDimension());
// 查询机构账套
// List<EnterpriseAccountSetOrgDto> query1 = enterpriseAccountSetOrgMapper.getSingleOrgByOrgIdToEASODto(orgId);
// for (EnterpriseAccountSetOrgDto p : query1) {
// SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
// p.setExpiredDateStr(p.getExpiredDate() == null ? "" : formatter.format(p.getExpiredDate()));
// p.setEffectiveDateStr(p.getEffectiveDate() == null ? "" : formatter.format(p.getEffectiveDate()));
// }
// result.setEnterpriseAccountSetOrgList(query1);
// 查询机构服务
// List<ServiceType> serviceType = serviceTypeMapper.selectByExample(null);
// List<OrganizationServiceTemplateGroupDto> query2 = organizationServiceTemplateGroupMapper
// .getSingleOrgByOrgIdToOSTGDto(orgId);
// for (OrganizationServiceTemplateGroupDto mapping : query2) {
// ServiceType st = serviceType.stream().filter(n -> Objects.equals(n.getId(), mapping.getServiceTypeId()))
// .findFirst().orElse(null);
// if (st != null) {
// mapping.setServiceTypeName(st.getName());
// }
// }
// result.setOrganizationServiceTemplateGroupList(query2);
if (result.getParentId()==0) {
if (result.getParentId() == 0) {
result.setParentName("");
} else {
OrganizationHK tParent = organizationHKMapper.selectByExample(null).stream()
......@@ -1947,7 +1924,6 @@ public class OrganizationServiceImpl extends BaseService {
Assert.notNull(tParent, "tParent is null");
result.setParentName(tParent.getName());
}
// result.setDimensionValueOrgList(dimensionService.getAllDimensionOrgListByOrgId(result.getId()));
return result;
}
......
atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationHK.java
View file @ eb4ff044
......@@ -44,6 +44,15 @@ public class OrganizationHK extends BaseEntity implements Serializable {
*/
private String code;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.is_active
*
* @mbg.generated
*/
private Boolean isActive;
/**
*
* This field was generated by MyBatis Generator.
......@@ -69,83 +78,38 @@ public class OrganizationHK extends BaseEntity implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.area_id
*
* @mbg.generated
*/
private String areaId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.region_id
*
* @mbg.generated
*/
private String regionId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.structure_id
*
* @mbg.generated
*/
private String structureId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.industry_id
*
* @mbg.generated
*/
private String industryId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.business_unit_id
*
* @mbg.generated
*/
private String businessUnitId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.is_active
* This field corresponds to the database column organization.register_address
*
* @mbg.generated
*/
private Boolean isActive;
private String registerAddress;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.register_address
* This field corresponds to the database column organization.authorised_capital
*
* @mbg.generated
*/
private String registerAddress;
private Float authorisedCapital;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.authorised_capital
* This field corresponds to the database column organization.issued_capital
*
* @mbg.generated
*/
private Float authorisedCapital;
private Float issuedCapital;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.issued_capital
* This field corresponds to the database column organization.industry
*
* @mbg.generated
*/
private Float issuedCapital;
private String industry;
/**
*
......@@ -297,275 +261,200 @@ public class OrganizationHK extends BaseEntity implements Serializable {
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table organization
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.id
*
* @return the value of organization.id
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.id
*
* @param id the value for organization.id
*
* @mbg.generated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.name
*
* @return the value of organization.name
*
* @mbg.generated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.name
*
* @param name the value for organization.name
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.area_id
*
* @mbg.generated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
private String areaId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.code
*
* @return the value of organization.code
*
* @mbg.generated
*/
public String getCode() {
return code;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.code
*
* @param code the value for organization.code
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.region_id
*
* @mbg.generated
*/
public void setCode(String code) {
this.code = code == null ? null : code.trim();
}
private String regionId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.parent_id
*
* @return the value of organization.parent_id
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.structure_id
*
* @mbg.generated
*/
public Long getParentId() {
return parentId;
}
private String structureId;
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.parent_id
*
* @param parentId the value for organization.parent_id
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.industry_id
*
* @mbg.generated
*/
public void setParentId(Long parentId) {
this.parentId = parentId;
}
private String industryId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.legal_form
*
* @return the value of organization.legal_form
* This field was generated by MyBatis Generator.
* This field corresponds to the database column organization.business_unit_id
*
* @mbg.generated
*/
public Integer getLegalForm() {
return legalForm;
}
private String businessUnitId;
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.legal_form
*
* @param legalForm the value for organization.legal_form
* This field was generated by MyBatis Generator.
* This field corresponds to the database table organization
*
* @mbg.generated
*/
public void setLegalForm(Integer legalForm) {
this.legalForm = legalForm;
}
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.area_id
* This method returns the value of the database column organization.id
*
* @return the value of organization.area_id
* @return the value of organization.id
*
* @mbg.generated
*/
public String getAreaId() {
return areaId;
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.area_id
* This method sets the value of the database column organization.id
*
* @param areaId the value for organization.area_id
* @param id the value for organization.id
*
* @mbg.generated
*/
public void setAreaId(String areaId) {
this.areaId = areaId == null ? null : areaId.trim();
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.region_id
* This method returns the value of the database column organization.name
*
* @return the value of organization.region_id
* @return the value of organization.name
*
* @mbg.generated
*/
public String getRegionId() {
return regionId;
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.region_id
* This method sets the value of the database column organization.name
*
* @param regionId the value for organization.region_id
* @param name the value for organization.name
*
* @mbg.generated
*/
public void setRegionId(String regionId) {
this.regionId = regionId == null ? null : regionId.trim();
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.structure_id
* This method returns the value of the database column organization.code
*
* @return the value of organization.structure_id
* @return the value of organization.code
*
* @mbg.generated
*/
public String getStructureId() {
return structureId;
public String getCode() {
return code;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.structure_id
* This method sets the value of the database column organization.code
*
* @param structureId the value for organization.structure_id
* @param code the value for organization.code
*
* @mbg.generated
*/
public void setStructureId(String structureId) {
this.structureId = structureId == null ? null : structureId.trim();
public void setCode(String code) {
this.code = code == null ? null : code.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.industry_id
* This method returns the value of the database column organization.is_active
*
* @return the value of organization.industry_id
* @return the value of organization.is_active
*
* @mbg.generated
*/
public String getIndustryId() {
return industryId;
public Boolean getIsActive() {
return isActive;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.industry_id
* This method sets the value of the database column organization.is_active
*
* @param industryId the value for organization.industry_id
* @param isActive the value for organization.is_active
*
* @mbg.generated
*/
public void setIndustryId(String industryId) {
this.industryId = industryId == null ? null : industryId.trim();
public void setIsActive(Boolean isActive) {
this.isActive = isActive;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.business_unit_id
* This method returns the value of the database column organization.parent_id
*
* @return the value of organization.business_unit_id
* @return the value of organization.parent_id
*
* @mbg.generated
*/
public String getBusinessUnitId() {
return businessUnitId;
public Long getParentId() {
return parentId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.business_unit_id
* This method sets the value of the database column organization.parent_id
*
* @param businessUnitId the value for organization.business_unit_id
* @param parentId the value for organization.parent_id
*
* @mbg.generated
*/
public void setBusinessUnitId(String businessUnitId) {
this.businessUnitId = businessUnitId == null ? null : businessUnitId.trim();
public void setParentId(Long parentId) {
this.parentId = parentId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.is_active
* This method returns the value of the database column organization.legal_form
*
* @return the value of organization.is_active
* @return the value of organization.legal_form
*
* @mbg.generated
*/
public Boolean getIsActive() {
return isActive;
public Integer getLegalForm() {
return legalForm;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.is_active
* This method sets the value of the database column organization.legal_form
*
* @param isActive the value for organization.is_active
* @param legalForm the value for organization.legal_form
*
* @mbg.generated
*/
public void setIsActive(Boolean isActive) {
this.isActive = isActive;
public void setLegalForm(Integer legalForm) {
this.legalForm = legalForm;
}
/**
......@@ -640,6 +529,30 @@ public class OrganizationHK extends BaseEntity implements Serializable {
this.issuedCapital = issuedCapital;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.industry
*
* @return the value of organization.industry
*
* @mbg.generated
*/
public String getIndustry() {
return industry;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.industry
*
* @param industry the value for organization.industry
*
* @mbg.generated
*/
public void setIndustry(String industry) {
this.industry = industry == null ? null : industry.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.payment_of_annual_government_fee
......@@ -1000,6 +913,126 @@ public class OrganizationHK extends BaseEntity implements Serializable {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.area_id
*
* @return the value of organization.area_id
*
* @mbg.generated
*/
public String getAreaId() {
return areaId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.area_id
*
* @param areaId the value for organization.area_id
*
* @mbg.generated
*/
public void setAreaId(String areaId) {
this.areaId = areaId == null ? null : areaId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.region_id
*
* @return the value of organization.region_id
*
* @mbg.generated
*/
public String getRegionId() {
return regionId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.region_id
*
* @param regionId the value for organization.region_id
*
* @mbg.generated
*/
public void setRegionId(String regionId) {
this.regionId = regionId == null ? null : regionId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.structure_id
*
* @return the value of organization.structure_id
*
* @mbg.generated
*/
public String getStructureId() {
return structureId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.structure_id
*
* @param structureId the value for organization.structure_id
*
* @mbg.generated
*/
public void setStructureId(String structureId) {
this.structureId = structureId == null ? null : structureId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.industry_id
*
* @return the value of organization.industry_id
*
* @mbg.generated
*/
public String getIndustryId() {
return industryId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.industry_id
*
* @param industryId the value for organization.industry_id
*
* @mbg.generated
*/
public void setIndustryId(String industryId) {
this.industryId = industryId == null ? null : industryId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization.business_unit_id
*
* @return the value of organization.business_unit_id
*
* @mbg.generated
*/
public String getBusinessUnitId() {
return businessUnitId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization.business_unit_id
*
* @param businessUnitId the value for organization.business_unit_id
*
* @mbg.generated
*/
public void setBusinessUnitId(String businessUnitId) {
this.businessUnitId = businessUnitId == null ? null : businessUnitId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table organization
......@@ -1015,17 +1048,13 @@ public class OrganizationHK extends BaseEntity implements Serializable {
sb.append(", id=").append(id);
sb.append(", name=").append(name);
sb.append(", code=").append(code);
sb.append(", isActive=").append(isActive);
sb.append(", parentId=").append(parentId);
sb.append(", legalForm=").append(legalForm);
sb.append(", areaId=").append(areaId);
sb.append(", regionId=").append(regionId);
sb.append(", structureId=").append(structureId);
sb.append(", industryId=").append(industryId);
sb.append(", businessUnitId=").append(businessUnitId);
sb.append(", isActive=").append(isActive);
sb.append(", registerAddress=").append(registerAddress);
sb.append(", authorisedCapital=").append(authorisedCapital);
sb.append(", issuedCapital=").append(issuedCapital);
sb.append(", industry=").append(industry);
sb.append(", paymentOfAnnualGovernmentFee=").append(paymentOfAnnualGovernmentFee);
sb.append(", annualReturnFillings=").append(annualReturnFillings);
sb.append(", boardMeetingRequirement=").append(boardMeetingRequirement);
......@@ -1041,6 +1070,11 @@ public class OrganizationHK extends BaseEntity implements Serializable {
sb.append(", residentSecretary=").append(residentSecretary);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", areaId=").append(areaId);
sb.append(", regionId=").append(regionId);
sb.append(", structureId=").append(structureId);
sb.append(", industryId=").append(industryId);
sb.append(", businessUnitId=").append(businessUnitId);
sb.append("]");
return sb.toString();
}
......
atms-dao/src/main/java/pwc/taxtech/atms/organization/entity/OrganizationHKExample.java
View file @ eb4ff044
This source diff could not be displayed because it is too large. You can view the blob instead.
atms-dao/src/main/resources/pwc/taxtech/atms/organization/dao/OrganizationHKMapper.xml
View file @ eb4ff044
......@@ -9,17 +9,13 @@
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="is_active" jdbcType="BIT" property="isActive" />
<result column="parent_id" jdbcType="BIGINT" property="parentId" />
<result column="legal_form" jdbcType="INTEGER" property="legalForm" />
<result column="area_id" jdbcType="VARCHAR" property="areaId" />
<result column="region_id" jdbcType="VARCHAR" property="regionId" />
<result column="structure_id" jdbcType="VARCHAR" property="structureId" />
<result column="industry_id" jdbcType="VARCHAR" property="industryId" />
<result column="business_unit_id" jdbcType="VARCHAR" property="businessUnitId" />
<result column="is_active" jdbcType="BIT" property="isActive" />
<result column="register_address" jdbcType="VARCHAR" property="registerAddress" />
<result column="authorised_capital" jdbcType="REAL" property="authorisedCapital" />
<result column="issued_capital" jdbcType="REAL" property="issuedCapital" />
<result column="industry" jdbcType="VARCHAR" property="industry" />
<result column="payment_of_annual_government_fee" jdbcType="TIMESTAMP" property="paymentOfAnnualGovernmentFee" />
<result column="annual_return_fillings" jdbcType="TIMESTAMP" property="annualReturnFillings" />
<result column="board_meeting_requirement" jdbcType="INTEGER" property="boardMeetingRequirement" />
......@@ -35,6 +31,11 @@
<result column="resident_secretary" jdbcType="VARCHAR" property="residentSecretary" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="area_id" jdbcType="VARCHAR" property="areaId" />
<result column="region_id" jdbcType="VARCHAR" property="regionId" />
<result column="structure_id" jdbcType="VARCHAR" property="structureId" />
<result column="industry_id" jdbcType="VARCHAR" property="industryId" />
<result column="business_unit_id" jdbcType="VARCHAR" property="businessUnitId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -107,12 +108,12 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, `name`, code, parent_id, legal_form, area_id, region_id, structure_id, industry_id,
business_unit_id, is_active, register_address, authorised_capital, issued_capital,
payment_of_annual_government_fee, annual_return_fillings, board_meeting_requirement,
business_license, renewal_of_business_license, entity_level, date_of_incorporation,
jurisdiction_of_formation, financial_year_end, annual_audit_requirement, registered_agent,
ownership_form, resident_secretary, create_time, update_time
id, `name`, code, is_active, parent_id, legal_form, register_address, authorised_capital,
issued_capital, industry, payment_of_annual_government_fee, annual_return_fillings,
board_meeting_requirement, business_license, renewal_of_business_license, entity_level,
date_of_incorporation, jurisdiction_of_formation, financial_year_end, annual_audit_requirement,
registered_agent, ownership_form, resident_secretary, create_time, update_time, area_id,
region_id, structure_id, industry_id, business_unit_id
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.organization.entity.OrganizationHKExample" resultMap="BaseResultMap">
<!--
......@@ -166,27 +167,29 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into organization (id, `name`, code,
parent_id, legal_form, area_id,
region_id, structure_id, industry_id,
business_unit_id, is_active, register_address,
authorised_capital, issued_capital, payment_of_annual_government_fee,
is_active, parent_id, legal_form,
register_address, authorised_capital, issued_capital,
industry, payment_of_annual_government_fee,
annual_return_fillings, board_meeting_requirement,
business_license, renewal_of_business_license,
entity_level, date_of_incorporation, jurisdiction_of_formation,
financial_year_end, annual_audit_requirement,
registered_agent, ownership_form, resident_secretary,
create_time, update_time)
create_time, update_time, area_id,
region_id, structure_id, industry_id,
business_unit_id)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR},
#{parentId,jdbcType=BIGINT}, #{legalForm,jdbcType=INTEGER}, #{areaId,jdbcType=VARCHAR},
#{regionId,jdbcType=VARCHAR}, #{structureId,jdbcType=VARCHAR}, #{industryId,jdbcType=VARCHAR},
#{businessUnitId,jdbcType=VARCHAR}, #{isActive,jdbcType=BIT}, #{registerAddress,jdbcType=VARCHAR},
#{authorisedCapital,jdbcType=REAL}, #{issuedCapital,jdbcType=REAL}, #{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
#{isActive,jdbcType=BIT}, #{parentId,jdbcType=BIGINT}, #{legalForm,jdbcType=INTEGER},
#{registerAddress,jdbcType=VARCHAR}, #{authorisedCapital,jdbcType=REAL}, #{issuedCapital,jdbcType=REAL},
#{industry,jdbcType=VARCHAR}, #{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
#{annualReturnFillings,jdbcType=TIMESTAMP}, #{boardMeetingRequirement,jdbcType=INTEGER},
#{businessLicense,jdbcType=VARCHAR}, #{renewalOfBusinessLicense,jdbcType=TIMESTAMP},
#{entityLevel,jdbcType=INTEGER}, #{dateOfIncorporation,jdbcType=TIMESTAMP}, #{jurisdictionOfFormation,jdbcType=INTEGER},
#{financialYearEnd,jdbcType=VARCHAR}, #{annualAuditRequirement,jdbcType=TIMESTAMP},
#{registeredAgent,jdbcType=VARCHAR}, #{ownershipForm,jdbcType=INTEGER}, #{residentSecretary,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{areaId,jdbcType=VARCHAR},
#{regionId,jdbcType=VARCHAR}, #{structureId,jdbcType=VARCHAR}, #{industryId,jdbcType=VARCHAR},
#{businessUnitId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.organization.entity.OrganizationHK">
<!--
......@@ -204,30 +207,15 @@
<if test="code != null">
code,
</if>
<if test="isActive != null">
is_active,
</if>
<if test="parentId != null">
parent_id,
</if>
<if test="legalForm != null">
legal_form,
</if>
<if test="areaId != null">
area_id,
</if>
<if test="regionId != null">
region_id,
</if>
<if test="structureId != null">
structure_id,
</if>
<if test="industryId != null">
industry_id,
</if>
<if test="businessUnitId != null">
business_unit_id,
</if>
<if test="isActive != null">
is_active,
</if>
<if test="registerAddress != null">
register_address,
</if>
......@@ -237,6 +225,9 @@
<if test="issuedCapital != null">
issued_capital,
</if>
<if test="industry != null">
industry,
</if>
<if test="paymentOfAnnualGovernmentFee != null">
payment_of_annual_government_fee,
</if>
......@@ -282,6 +273,21 @@
<if test="updateTime != null">
update_time,
</if>
<if test="areaId != null">
area_id,
</if>
<if test="regionId != null">
region_id,
</if>
<if test="structureId != null">
structure_id,
</if>
<if test="industryId != null">
industry_id,
</if>
<if test="businessUnitId != null">
business_unit_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -293,30 +299,15 @@
<if test="code != null">
#{code,jdbcType=VARCHAR},
</if>
<if test="isActive != null">
#{isActive,jdbcType=BIT},
</if>
<if test="parentId != null">
#{parentId,jdbcType=BIGINT},
</if>
<if test="legalForm != null">
#{legalForm,jdbcType=INTEGER},
</if>
<if test="areaId != null">
#{areaId,jdbcType=VARCHAR},
</if>
<if test="regionId != null">
#{regionId,jdbcType=VARCHAR},
</if>
<if test="structureId != null">
#{structureId,jdbcType=VARCHAR},
</if>
<if test="industryId != null">
#{industryId,jdbcType=VARCHAR},
</if>
<if test="businessUnitId != null">
#{businessUnitId,jdbcType=VARCHAR},
</if>
<if test="isActive != null">
#{isActive,jdbcType=BIT},
</if>
<if test="registerAddress != null">
#{registerAddress,jdbcType=VARCHAR},
</if>
......@@ -326,6 +317,9 @@
<if test="issuedCapital != null">
#{issuedCapital,jdbcType=REAL},
</if>
<if test="industry != null">
#{industry,jdbcType=VARCHAR},
</if>
<if test="paymentOfAnnualGovernmentFee != null">
#{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
</if>
......@@ -371,6 +365,21 @@
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="areaId != null">
#{areaId,jdbcType=VARCHAR},
</if>
<if test="regionId != null">
#{regionId,jdbcType=VARCHAR},
</if>
<if test="structureId != null">
#{structureId,jdbcType=VARCHAR},
</if>
<if test="industryId != null">
#{industryId,jdbcType=VARCHAR},
</if>
<if test="businessUnitId != null">
#{businessUnitId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.organization.entity.OrganizationHKExample" resultType="java.lang.Long">
......@@ -399,30 +408,15 @@
<if test="record.code != null">
code = #{record.code,jdbcType=VARCHAR},
</if>
<if test="record.isActive != null">
is_active = #{record.isActive,jdbcType=BIT},
</if>
<if test="record.parentId != null">
parent_id = #{record.parentId,jdbcType=BIGINT},
</if>
<if test="record.legalForm != null">
legal_form = #{record.legalForm,jdbcType=INTEGER},
</if>
<if test="record.areaId != null">
area_id = #{record.areaId,jdbcType=VARCHAR},
</if>
<if test="record.regionId != null">
region_id = #{record.regionId,jdbcType=VARCHAR},
</if>
<if test="record.structureId != null">
structure_id = #{record.structureId,jdbcType=VARCHAR},
</if>
<if test="record.industryId != null">
industry_id = #{record.industryId,jdbcType=VARCHAR},
</if>
<if test="record.businessUnitId != null">
business_unit_id = #{record.businessUnitId,jdbcType=VARCHAR},
</if>
<if test="record.isActive != null">
is_active = #{record.isActive,jdbcType=BIT},
</if>
<if test="record.registerAddress != null">
register_address = #{record.registerAddress,jdbcType=VARCHAR},
</if>
......@@ -432,6 +426,9 @@
<if test="record.issuedCapital != null">
issued_capital = #{record.issuedCapital,jdbcType=REAL},
</if>
<if test="record.industry != null">
industry = #{record.industry,jdbcType=VARCHAR},
</if>
<if test="record.paymentOfAnnualGovernmentFee != null">
payment_of_annual_government_fee = #{record.paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
</if>
......@@ -477,6 +474,21 @@
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.areaId != null">
area_id = #{record.areaId,jdbcType=VARCHAR},
</if>
<if test="record.regionId != null">
region_id = #{record.regionId,jdbcType=VARCHAR},
</if>
<if test="record.structureId != null">
structure_id = #{record.structureId,jdbcType=VARCHAR},
</if>
<if test="record.industryId != null">
industry_id = #{record.industryId,jdbcType=VARCHAR},
</if>
<if test="record.businessUnitId != null">
business_unit_id = #{record.businessUnitId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -491,17 +503,13 @@
set id = #{record.id,jdbcType=BIGINT},
`name` = #{record.name,jdbcType=VARCHAR},
code = #{record.code,jdbcType=VARCHAR},
is_active = #{record.isActive,jdbcType=BIT},
parent_id = #{record.parentId,jdbcType=BIGINT},
legal_form = #{record.legalForm,jdbcType=INTEGER},
area_id = #{record.areaId,jdbcType=VARCHAR},
region_id = #{record.regionId,jdbcType=VARCHAR},
structure_id = #{record.structureId,jdbcType=VARCHAR},
industry_id = #{record.industryId,jdbcType=VARCHAR},
business_unit_id = #{record.businessUnitId,jdbcType=VARCHAR},
is_active = #{record.isActive,jdbcType=BIT},
register_address = #{record.registerAddress,jdbcType=VARCHAR},
authorised_capital = #{record.authorisedCapital,jdbcType=REAL},
issued_capital = #{record.issuedCapital,jdbcType=REAL},
industry = #{record.industry,jdbcType=VARCHAR},
payment_of_annual_government_fee = #{record.paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
annual_return_fillings = #{record.annualReturnFillings,jdbcType=TIMESTAMP},
board_meeting_requirement = #{record.boardMeetingRequirement,jdbcType=INTEGER},
......@@ -516,7 +524,12 @@
ownership_form = #{record.ownershipForm,jdbcType=INTEGER},
resident_secretary = #{record.residentSecretary,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
area_id = #{record.areaId,jdbcType=VARCHAR},
region_id = #{record.regionId,jdbcType=VARCHAR},
structure_id = #{record.structureId,jdbcType=VARCHAR},
industry_id = #{record.industryId,jdbcType=VARCHAR},
business_unit_id = #{record.businessUnitId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -534,30 +547,15 @@
<if test="code != null">
code = #{code,jdbcType=VARCHAR},
</if>
<if test="isActive != null">
is_active = #{isActive,jdbcType=BIT},
</if>
<if test="parentId != null">
parent_id = #{parentId,jdbcType=BIGINT},
</if>
<if test="legalForm != null">
legal_form = #{legalForm,jdbcType=INTEGER},
</if>
<if test="areaId != null">
area_id = #{areaId,jdbcType=VARCHAR},
</if>
<if test="regionId != null">
region_id = #{regionId,jdbcType=VARCHAR},
</if>
<if test="structureId != null">
structure_id = #{structureId,jdbcType=VARCHAR},
</if>
<if test="industryId != null">
industry_id = #{industryId,jdbcType=VARCHAR},
</if>
<if test="businessUnitId != null">
business_unit_id = #{businessUnitId,jdbcType=VARCHAR},
</if>
<if test="isActive != null">
is_active = #{isActive,jdbcType=BIT},
</if>
<if test="registerAddress != null">
register_address = #{registerAddress,jdbcType=VARCHAR},
</if>
......@@ -567,6 +565,9 @@
<if test="issuedCapital != null">
issued_capital = #{issuedCapital,jdbcType=REAL},
</if>
<if test="industry != null">
industry = #{industry,jdbcType=VARCHAR},
</if>
<if test="paymentOfAnnualGovernmentFee != null">
payment_of_annual_government_fee = #{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
</if>
......@@ -612,6 +613,21 @@
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="areaId != null">
area_id = #{areaId,jdbcType=VARCHAR},
</if>
<if test="regionId != null">
region_id = #{regionId,jdbcType=VARCHAR},
</if>
<if test="structureId != null">
structure_id = #{structureId,jdbcType=VARCHAR},
</if>
<if test="industryId != null">
industry_id = #{industryId,jdbcType=VARCHAR},
</if>
<if test="businessUnitId != null">
business_unit_id = #{businessUnitId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
......@@ -623,17 +639,13 @@
update organization
set `name` = #{name,jdbcType=VARCHAR},
code = #{code,jdbcType=VARCHAR},
is_active = #{isActive,jdbcType=BIT},
parent_id = #{parentId,jdbcType=BIGINT},
legal_form = #{legalForm,jdbcType=INTEGER},
area_id = #{areaId,jdbcType=VARCHAR},
region_id = #{regionId,jdbcType=VARCHAR},
structure_id = #{structureId,jdbcType=VARCHAR},
industry_id = #{industryId,jdbcType=VARCHAR},
business_unit_id = #{businessUnitId,jdbcType=VARCHAR},
is_active = #{isActive,jdbcType=BIT},
register_address = #{registerAddress,jdbcType=VARCHAR},
authorised_capital = #{authorisedCapital,jdbcType=REAL},
issued_capital = #{issuedCapital,jdbcType=REAL},
industry = #{industry,jdbcType=VARCHAR},
payment_of_annual_government_fee = #{paymentOfAnnualGovernmentFee,jdbcType=TIMESTAMP},
annual_return_fillings = #{annualReturnFillings,jdbcType=TIMESTAMP},
board_meeting_requirement = #{boardMeetingRequirement,jdbcType=INTEGER},
......@@ -648,7 +660,12 @@
ownership_form = #{ownershipForm,jdbcType=INTEGER},
resident_secretary = #{residentSecretary,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
update_time = #{updateTime,jdbcType=TIMESTAMP},
area_id = #{areaId,jdbcType=VARCHAR},
region_id = #{regionId,jdbcType=VARCHAR},
structure_id = #{structureId,jdbcType=VARCHAR},
industry_id = #{industryId,jdbcType=VARCHAR},
business_unit_id = #{businessUnitId,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ eb4ff044
......@@ -258,25 +258,6 @@
cancelWebChange();
};
var cancelWebChange = function () {
$('.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 < $('.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 < $('.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 < $('.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 < $('.tax-extra-info-content .col-sm-8 select').length; i++) {
$('.tax-extra-info-content .col-sm-8 select')[i].style.display = "none";
}
};
// 提交修改的机构其他信息
$scope.updateOrgExtraSubmit = function () {
SweetAlert.swal({
......@@ -335,7 +316,6 @@
}
});
// 选中机构
$scope.selectOrganization = function (branch) {
var org = branch.data;
......@@ -344,7 +324,6 @@
var suborgList = getSubOrgList(branch);
$scope.selectedOrgID = org.id;
// 选中事件
// $scope.selectCompany = org;
orgService.getSingleOrg(org.id).success(function (data) {
if ($scope.selectNodeCount > 1) {
$scope.showOrgs = false;
......@@ -357,37 +336,6 @@
$scope.backups = {};
$scope.backups.enterpriseAccountSetOrgList = angular.copy($scope.selectCompany.enterpriseAccountSetOrgList);
$scope.backups.organizationServiceTemplateGroupList = angular.copy($scope.selectCompany.organizationServiceTemplateGroupList);
var orgAttributeList = _.filter(data.dimensionValueOrgList, function (attr) {
if (attr.id) {
return true;
} else {
return false;
}
});
var orgAttributeRowList = [];
if (orgAttributeList && orgAttributeList.length > 0) {
$scope.firstAttribute = orgAttributeList[0];
for (var i = 1; i < orgAttributeList.length; i = i + 2) {
var model = {
left: orgAttributeList[i]
};
if (i + 1 < orgAttributeList.length) {
model.right = orgAttributeList[i + 1];
}
orgAttributeRowList.push(model);
}
}
$scope.selectCompany.orgAttributeRowList = orgAttributeRowList;
$scope.isInternational = $scope.selectCompany.oversea;
cancelWebChange();
});
};
......@@ -401,33 +349,6 @@
DateMonthFormatError: $translate.instant('DateMonthFormatError')
};
$scope.collapseOrgExtraInfoAll = function () {
$scope.showTaxRegInfoContent = false;
$scope.showExtraRegInfoContent = false;
$scope.showTaxRule = false;
$scope.showReturnRateInfo = false;
$scope.showAccountingRateInfo = false;
$scope.showApprovedLevyInfo = false;
$scope.showTaxOfficerInfo = false;
$scope.showInvoiceInfo = false;
$scope.showTaxpayerQualification = false;
$scope.showEmployee = false;
$scope.expanded = false;
};
$scope.expandOrgExtraInfoAll = function () {
$scope.showTaxRegInfoContent = true;
$scope.showExtraRegInfoContent = true;
$scope.showTaxRule = true;
$scope.showReturnRateInfo = true;
$scope.showAccountingRateInfo = true;
$scope.showApprovedLevyInfo = true;
$scope.showTaxOfficerInfo = true;
$scope.showInvoiceInfo = true;
$scope.showTaxpayerQualification = true;
$scope.showEmployee = true;
$scope.expanded = true;
};
// 验证开始时间
$scope.checkStartDate = function (row) {
......@@ -702,32 +623,32 @@
caption: $translate.instant('OrganizationCode')
},
{
dataField: "taxPayerNumber",
dataField: "legalForm",
allowHeaderFiltering: true,
caption: $translate.instant('TaxPayerNumber')
caption: $translate.instant('legalForm')
},
{
dataField: "structureName",
caption: $translate.instant('OrganizationStructureDesc')
dataField: "entityLevel",
caption: $translate.instant('entityLevel')
},
{
dataField: "regionName",
caption: $translate.instant('AreaRegionTitle'),
dataField: "businessLicense",
caption: $translate.instant('businessLicense'),
allowHeaderFiltering: false
},
{
dataField: "businessUnitName",
caption: $translate.instant('BusinessUnitTitleName'),
dataField: "dateOfIncorporation",
caption: $translate.instant('dateOfIncorporation'),
allowHeaderFiltering: false
},
{
dataField: "areaName",
caption: $translate.instant('AreaTitleName'),
dataField: "jurisdictionOfFormation",
caption: $translate.instant('jurisdictionOfFormation'),
allowHeaderFiltering: false
},
{
dataField: "industryName",
caption: $translate.instant('PIndustry'),
dataField: "financialYearEnd",
caption: $translate.instant('financialYearEnd'),
allowHeaderFiltering: false
},
{
......@@ -745,408 +666,6 @@
$log.error(e);
}
}
},
{
dataField: "englishName",
caption: $translate.instant('OrganizationNameEn'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "abbreviation",
caption: $translate.instant('Abbreviation'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "foundationDate",
caption: $translate.instant('FoundationDate'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "registrationLocation",
caption: $translate.instant('RegistrationLocation'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "registrationLocationEn",
caption: $translate.instant('RegistrationLocationEn'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonName",
caption: $translate.instant('LegalPersonName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "businessScope",
caption: $translate.instant('BusinessScope'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regStatus",
caption: $translate.instant('RegStatus'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "architectureType",
caption: $translate.instant('ArchitectureType'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "nationalEconomicIndustry",
caption: $translate.instant('NationalEconomicIndustry'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "engageNationalProhibitIndustry",
caption: $translate.instant('EngageNationalProhibitIndustry'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "registrationCapital",
caption: $translate.instant('RegistrationCapital'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "paidInCapital",
caption: $translate.instant('PaidInCapital'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "numOfBranches",
caption: $translate.instant('NumOfBranches'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "unifiedSocialCreditCode",
caption: $translate.instant('UnifiedSocialCreditCode'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialAccountingType",
caption: $translate.instant('RegFinancialAccountingType'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxRegStatus",
caption: $translate.instant('TaxRegStatus'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxCreditRating",
caption: $translate.instant('TaxCreditRating'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "applicableAccountingRule",
caption: $translate.instant('ApplicableAccountingRule'),
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: "accountingSoftware",
caption: $translate.instant('AccountingSoftware'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "completeRecordTotalInstitutions",
caption: $translate.instant('CompleteRecordTotalInstitutions'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonName",
caption: $translate.instant('TaxClientPersonName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonPhoneNum",
caption: $translate.instant('TaxClientPersonPhoneNum'),
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: "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: "localTaxAdministratorPhoneNum",
caption: $translate.instant('LocalTaxAdministratorPhoneNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "etaWebsite",
caption: $translate.instant('EtaWebsite'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "signTripartiteAgreement",
caption: $translate.instant('SignTripartiteAgreement'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "reportingCurrency",
caption: $translate.instant('ReportingCurrency'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "consolidationTime",
caption: $translate.instant('ConsolidationTime'),
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: "otherFacts",
caption: $translate.instant('OtherFacts'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxReturnBusinessType",
caption: $translate.instant('TaxReturnBusinessType'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "smallMeagerProfit",
caption: $translate.instant('SmallMeagerProfit'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "listedCompany",
caption: $translate.instant('ListedCompany'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "applicableAccountingStandardsOrAccountingSystems",
caption: $translate.instant('ApplicableAccountingStandardsOrAccountingSystems'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxPayerNumberVat",
caption: $translate.instant('TaxPayerNumberVat'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxPayerNumberCit",
caption: $translate.instant('TaxPayerNumberCit'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxClientPersonEmailAddress",
caption: $translate.instant('TaxClientPersonEmailAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "bankAccountName",
caption: $translate.instant('BankAccountName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "bankAccountNumber",
caption: $translate.instant('BankAccountNumber'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonPhoneNumber",
caption: $translate.instant('LegalPersonPhoneNumber'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonLandlineNum",
caption: $translate.instant('LegalPersonLandlineNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "legalPersonEmailAddress",
caption: $translate.instant('LegalPersonEmailAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerName",
caption: $translate.instant('RegFinancialOfficerName'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerPhoneNum",
caption: $translate.instant('RegFinancialOfficerPhoneNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerLandlineNum",
caption: $translate.instant('RegFinancialOfficerLandlineNum'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "regFinancialOfficerEmailAddress",
caption: $translate.instant('RegFinancialOfficerEmailAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "actualBusinessAddress",
caption: $translate.instant('ActualBusinessAddress'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "secondaryApprovalAmount",
caption: $translate.instant('SecondaryApprovalAmount'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "businessRegistrationNumber",
caption: $translate.instant('BusinessRegistrationNumber'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "parValue",
caption: $translate.instant('ParValue'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "issuedShares",
caption: $translate.instant('IssuedShares'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "directors",
caption: $translate.instant('Directors'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "logoutTime",
caption: $translate.instant('LogoutTime'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "taxRuleIntroduction",
caption: $translate.instant('TaxRuleIntroduction'),
visible: false,
allowHeaderFiltering: false
},
{
dataField: "auditRequirements",
caption: $translate.instant('AuditRequirements'),
visible: false,
allowHeaderFiltering: false
}
],
// masterDetail: {
......@@ -1155,8 +674,6 @@
// },
onContentReady: function (e) {
$scope.orgUserGridInstance = e.component;
// $scope.orgTreeList = e;
// $scope.orgTreeListInstance = e.component;
var totalCount = e.component.totalCount();
if (totalCount > 0) {
$scope.totalCount = totalCount;
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html
View file @ eb4ff044
......@@ -98,10 +98,10 @@
<md-content>
<md-nav-bar md-selected-nav-item="currentNavItem" nav-bar-aria-label="navigation links">
<md-nav-item md-nav-click="goto('page1')" name="page1">
{{'OrganizationBasicData' | translate}}
{{'FundamentalInfo' | translate}}
</md-nav-item>
<md-nav-item md-nav-click="goto('page2')" name="page2">
{{'EquityInformation' | translate}}
{{'ShareholdingInfo' | translate}}
</md-nav-item>
<md-nav-item md-nav-click="goto('page3')" name="page3">
{{'ComplianceInfo' | translate}}
......@@ -136,7 +136,7 @@
<div class="col-sm-12">
<div class="col-sm-6"><span
class="control-label">{{'internalEntityCode'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.internalEntityCode}}">{{selectCompany.internalEntityCode}}</span>
<div class="col-sm-6"><span title="{{selectCompany.code}}">{{selectCompany.code}}</span>
</div>
</div>
</div>
......@@ -152,7 +152,7 @@
<div class="col-sm-12">
<div class="col-sm-6"><span
class="control-label">{{'registeredAddress'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.registeredAddress}}">{{selectCompany.registeredAddress}}</span>
<div class="col-sm-6"><span title="{{selectCompany.registerAddress}}">{{selectCompany.registerAddress}}</span>
</div>
</div>
</div>
......@@ -183,7 +183,7 @@
<div class="col-sm-12">
<div class="col-sm-6"><span class="control-label">{{'paymentofAnnualGovernmentFee'|translate}}:</span>
</div>
<div class="col-sm-6"><span title="{{selectCompany.paymentofAnnualGovernmentFee}}">{{selectCompany.paymentofAnnualGovernmentFee}}</span>
<div class="col-sm-6"><span title="{{selectCompany.paymentOfAnnualGovernmentFee}}">{{selectCompany.paymentOfAnnualGovernmentFee}}</span>
</div>
</div>
</div>
......@@ -192,7 +192,7 @@
<div class="col-sm-6"><span class="control-label">{{'annualReturnFillingsWithLocalCompaniesRegistry'|translate}}:</span>
</div>
<div class="col-sm-6"><span
title="{{selectCompany.annualReturnFillingsWithLocalCompaniesRegistry}}">{{selectCompany.annualReturnFillingsWithLocalCompaniesRegistry}}</span>
title="{{selectCompany.annualReturnFillings}}">{{selectCompany.annualReturnFillings}}</span>
</div>
</div>
</div>
......@@ -200,7 +200,7 @@
<div class="col-sm-12">
<div class="col-sm-6"><span class="control-label">{{'BoardMeetingRequirement'|translate}}:</span>
</div>
<div class="col-sm-6"><span title="{{selectCompany.ReN}}">{{selectCompany.BoardMeetingRequirement}}</span>
<div class="col-sm-6"><span title="{{selectCompany.boardMeetingRequirement}}">{{selectCompany.boardMeetingRequirement}}</span>
</div>
</div>
</div>
......@@ -210,7 +210,7 @@
<div class="col-sm-12">
<div class="col-sm-6"><span
class="control-label">{{'businessLicense'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.name}}">{{selectCompany.name}}</span>
<div class="col-sm-6"><span title="{{selectCompany.businessLicense}}">{{selectCompany.businessLicense}}</span>
</div>
</div>
</div>
......@@ -219,7 +219,7 @@
<div class="col-sm-6"><span class="control-label">{{'RenewalOfBusinessLicenseFeePayment'|translate}}:</span>
</div>
<div class="col-sm-6"><span
title="{{selectCompany.RenewalOfBusinessLicenseFeePayment}}">{{selectCompany.RenewalOfBusinessLicenseFeePayment}}</span>
title="{{selectCompany.renewalOfBusinessLicense}}">{{selectCompany.renewalOfBusinessLicense}}</span>
</div>
</div>
</div>
......@@ -235,7 +235,7 @@
<div class="col-sm-12">
<div class="col-sm-6"><span
class="control-label">{{'DateOfIncorporation'|translate}}:</span></div>
<div class="col-sm-6"><span title="{{selectCompany.DateOfIncorporation}}">{{selectCompany.DateOfIncorporation}}</span>
<div class="col-sm-6"><span title="{{selectCompany.dateOfIncorporation}}">{{selectCompany.dateOfIncorporation}}</span>
</div>
</div>
</div>
......@@ -259,7 +259,7 @@
<div class="col-sm-12">
<div class="col-sm-6"><span class="control-label">{{'annualAuditRequirements'|translate}}:</span>
</div>
<div class="col-sm-6"><span title="{{selectCompany.annualAuditRequirements}}">{{selectCompany.annualAuditRequirements}}</span>
<div class="col-sm-6"><span title="{{selectCompany.annualAuditRequirement}}">{{selectCompany.annualAuditRequirement}}</span>
</div>
</div>
</div>
......@@ -310,8 +310,7 @@
<div ng-show="currentNavItem==='page2'" class="equity-info-table">
<!--Equity information-->
<div class="label-current-holding">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' |
translate}}</label>
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
</div>
<div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;"
......@@ -332,8 +331,7 @@
<!--Direcotr information-->
<div class="label-director">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' |
translate}}</label>
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' | translate}}</label>
</div>
<div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;"
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ eb4ff044
......@@ -75,11 +75,11 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// $scope.OrgAccountRowIndex = 1;
// $scope.newOrgAccountRow();
$scope.selfDimensionModel = getAddOrgSetDimension();
// $scope.selfDimensionModel = getAddOrgSetDimension();
// initIsCheckedServiceList();
// resetErrorStatus();
$scope.orgControlForm.$setPristine();
$scope.advancedControlForm.$setPristine();
// $scope.advancedControlForm.$setPristine();
// set first active page is basic info
$('#orgControlTab a:first').tab('show');
// $('#orgModalFooter').css('padding-left','139px');
......@@ -229,25 +229,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
var saveLocalOrg = function () {
$scope.orgControlForm.$setSubmitted();
// var fail = false;
// if($('.localRequired').attr("required")==="required"){
// $('.localRequired').each( function (index,ele){
// if(null==ele.value||""===ele.value){
// SweetAlert.error("请检查必填项");
// fail = true;
// return false;
// }
// });
// };
// $('.orgAreaRequired').each( function (index,ele){
// if(null==ele.innerText||""===ele.innerText){
// SweetAlert.error("请检查必填项");
// fail = true;
// return false;
// }
// });
console.log(saveVerify());
if(saveVerify()) return;
......@@ -273,63 +254,20 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.isShowAdvanced = false;
}
//$scope.advancedControlForm.$setSubmitted();
//if ($scope.advancedControlForm.$invalid) {
// $scope.isShowAdvanced = true;
// return;
//} else {
// $scope.isShowAdvanced = false;
//}
//客户代码是固定死的
// $scope.editOrgModel.clientCode = $scope.projectClientName;
var editModel = $scope.editOrgModel;
// 是否为境外企业
editModel.oversea = $scope.isInternational;
//判断新增或修改
//$scope.isAdd = editModel.SaveAsNew;
if ($scope.selectProjectIndustry) {
editModel.industryID = $scope.selectProjectIndustry.id;
}
//层级
if ($scope.selectLevelType) {
editModel.structureID = $scope.selectLevelType.id;
editModel.structureName = $scope.selectLevelType.name;
}
// 区域是必填项
if ($scope.selectProvince && ($scope.selectCity || $scope.selectRegionID)) {
editModel.regionID = $scope.selectRegionID || $scope.selectCity.regionID;
}
var pId = editModel.parentID;
//上级公司
if (!pId || pId === constant.organization.parentIdNull) {
editModel.parentID = constant.organization.parentIdNull;
}
//事业部
if ($scope.selectBusinessUnit) {
editModel.businessUnitID = $scope.selectBusinessUnit.ID;
}
//区域
if ($scope.componentSelectedArea) {
editModel.areaID = $scope.selectedAreaId;
}
//所属业务线校验
if(!editModel.businessUnitID){
SweetAlert.error("请检查必填项");
return;
}
//区域校验
if (editModel.areaID === "") {
SweetAlert.error("请检查必填项");
return;
}
if((typeof $scope.editOrgModel.foundationDate) ==="string"){
if (""!==($scope.editOrgModel.foundationDate)) {
......@@ -337,43 +275,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
}
}
//账套
if ($scope.orgAccountList) {
$scope.editOrgModel.enterpriseAccountSetOrgList = [];
$scope.orgAccountList.forEach(function (row) {
if (row.enterpriseAccountSetSelectID) {
var enterpriseAccountSetOrg = {};
enterpriseAccountSetOrg.enterpriseAccountSetID = row.enterpriseAccountSetSelectID;
enterpriseAccountSetOrg.effectiveDateStr = row.startDate;
enterpriseAccountSetOrg.expiredDateStr = row.endDate;
enterpriseAccountSetOrg.organizationID = $scope.editOrgModel.id;
enterpriseAccountSetOrg.id = row.id;
$scope.editOrgModel.enterpriseAccountSetOrgList.push(enterpriseAccountSetOrg);
}
});
}
//服务
if ($scope.isCheckedServiceList) {
$scope.editOrgModel.organizationServiceTemplateGroupList = [];
$scope.isCheckedServiceList.forEach(function (row) {
if (row.isChecked) {
var organizationServiceTemplateGroup = {};
organizationServiceTemplateGroup.organizationID = $scope.editOrgModel.id;
organizationServiceTemplateGroup.serviceTypeID = row.id;
organizationServiceTemplateGroup.templateGroupID = row.selectedTemplate.id;
$scope.editOrgModel.organizationServiceTemplateGroupList.push(organizationServiceTemplateGroup)
}
});
}
// 自定义属性
editModel.dimensionValueOrgList = getSelfDimensionSetValueList();
if ($scope.selfDimensionError) {
$scope.isShowBasic = true;
return;
}
if ($scope.isAdd) {
editModel.isActive = true;
orgService.addOrg(editModel).success(function (orgId) {
......@@ -423,63 +324,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
}
};
// 获取设置的DimensionValue
var getSelfDimensionSetValueList = function () {
$scope.selfDimensionError = false;
var dimensionValueOrgList = [];
if (!$scope.selfDimensionModel) {
return dimensionValueOrgList;
}
if ($scope.selfDimensionModel.leftList && $scope.selfDimensionModel.leftList.length > 0) {
$scope.selfDimensionModel.leftList.forEach(function (row) {
if (row.selectDimensionValueID) {
var dimensionValueOrg = {
dimensionValueID: row.selectDimensionValueID,
dimensionID: row.id,
organizationID: $scope.editOrgModel.id,
};
dimensionValueOrgList.push(dimensionValueOrg);
row.error = '';
} else {
if (row.isMandatory && row.dimensionValueList && row.dimensionValueList.length > 0) {
row.error = $translate.instant('PleaseSelect');
$scope.selfDimensionError = true;
} else {
row.error = '';
}
}
});
}
if ($scope.selfDimensionModel.rightList && $scope.selfDimensionModel.rightList.length > 0) {
$scope.selfDimensionModel.rightList.forEach(function (row) {
if (row.selectDimensionValueID) {
var dimensionValueOrg = {
dimensionValueID: row.selectDimensionValueID,
dimensionID: row.id,
organizationID: $scope.editOrgModel.id,
};
dimensionValueOrgList.push(dimensionValueOrg);
row.error = '';
} else {
if (row.isMandatory && row.dimensionValueList && row.dimensionValueList.length > 0) {
row.error = $translate.instant('PleaseSelect');
$scope.selfDimensionError = true;
} else {
row.error = '';
}
}
});
}
return dimensionValueOrgList;
};
// 加载机构
var loadOrg = function (orgId) {
resetRegion();
......@@ -499,71 +343,13 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$("#selectedOrgName-error").hide();
$scope.isAdd = false;
$scope.orgHasAccountMapping = false;
// enterpriseAccountService.getAccountMappingOrg(orgId).success(function (data) {
// if (data && data.length > 0) {
// $scope.orgHasAccountMapping = true;
// }
//
// });
orgService.getSingleOrg(orgId).success(function (orgData) {
$scope.selectCompany = orgData;
// 设置上级公司
if (orgData.parentName == null || orgData.parentID == null) {
var NoOptions = {
'id': constant.organization.parentIdNull,
'name': $translate.instant('OrgSelectNoOption')
};
orgData.parentName = NoOptions.name;
orgData.parentID = NoOptions.id;
}
$scope.isInternational = $scope.selectCompany.oversea;
$scope.isLocal = !$scope.isInternational;
$scope.selfDimensionError = false;
// 设置层级
$scope.selectLevelType = _.find($scope.levelTypeList, function (num) {
return num.id === orgData.structureID;
});
// 设置行业
$scope.selectProjectIndustry = _.find($scope.projectIndustryList, function (num) {
return num.id === orgData.industryID;
});
$scope.editOrgModel = orgData;
$scope.editOrgModel.foundationDate=($filter('date')(new Date($scope.editOrgModel.foundationDate), "yyyy-MM-dd"));
// 设置地区
loadProvinceList();
loadCityList(orgData.parentRegionID);
//设置事业部
var businessUnitList = $scope.businessUnitList;
$scope.selectBusinessUnit = _.find(businessUnitList, function (num) {
return num.ID === orgData.businessUnitID;
});
if ($scope.selectBusinessUnit === undefined) {
//angular方式控制出现了很多问题，暂时先用这样的解决方案
$scope.selectBusinessUnit = $scope.businessUnitList[0]; //直接选第一个，“请选择”
// $('#selectBusinessUnit').append('<option disabled selected="selected">' + orgData.businessUnitName + '</option>');
}
$scope.orgAccountList = [];
$scope.serviceList = [];
$scope.OrgAccountRowIndex = 1;
$scope.selfDimensionModel = getUpdateOrgSetDimension(orgData.id, orgData.dimensionValueOrgList);
setEnterpriseOrgRowList(orgData);
// setIsCheckedServiceList(orgData);
});
if($scope.isInternational){
......@@ -577,19 +363,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$(selectedModel).modal('show');
};
var populateDDL = function (data) {
if (data) {
var findSelect = _.find(data, function (item) {
return item.id == -1;
});
if (!findSelect) {
data.unshift({ id: -1, name: $scope.pleaseSelect });
}
}
return data;
};
$scope.removeDisabled = function () {
var businessUnitList = $scope.businessUnitList;
$scope.businessUnitList = _.without(businessUnitList, _.findWhere(businessUnitList, {
......@@ -608,173 +381,11 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
$scope.selectRegionID = defaultData;
};
// 获取机构层级
var loadOrganizationStructureService = function () {
organizationStructureService.getOrganizationStructureList().success(function (data) {
var filterData = _.filter(data, function (num) {
return num.isActive;
});
$scope.levelTypeList = filterData;
});
};
// 获取事业部
var loadBusinessUnitList = function () {
businessUnitService.getBusinessUnitList().success(function (data) {
var filterData = _.filter(data, function (item) {
return item.isActive;
});
$scope.businessUnitList = populateDDL(filterData);
});
};
//获取项目客户信息
// var loadprojectClient = function () {
// projectService.getProjectClientList().success(function (data) {
// if (data && data.length > 0) {
// $scope.projectClientName = data[0].name;
// }
// });
// };
// 获取省市
var loadProvinceList = function () {
areaRegionService.getProvinces().success(function (data) {
if (data && data.length > 0) {
$scope.ProvinceList = data;
//根据当前机构的父级（即市的层级）获取对应的省的regionID
//目前情况为省市区三级联动，参数为$scope.editOrgModel.parentRegionID，若为省市两级联动，参数改为$scope.editOrgModel.regionID即可
var cityIDTemp = $scope.editOrgModel.regionID;
if($scope.editOrgModel.levelType == 3){
cityIDTemp = $scope.editOrgModel.parentRegionID;
}
areaRegionService.getProvincesByCityID(cityIDTemp).success(function (resp) {
if(resp){
$scope.selectProvince = _.find($scope.ProvinceList, function (num) {
return num.regionID === resp.regionID;
});
if ($scope.selectProvince) {
loadCityList($scope.selectProvince.regionID);
}
}
});
} else {
data = null;
$scope.ProvinceList = data;
$scope.selectProvince = data;
}
});
};
// 加载城市信息
var loadCityList = function (regionID) {
regionID = $scope.selectProvince.regionID;
if (regionID !== undefined && regionID !== null) {
areaRegionService.getCities(regionID).success(function (data) {
if (data && data.length > 0) {
$scope.CityList = data;
$scope.selectCity = _.find($scope.CityList, function (num) {
if($scope.editOrgModel.levelType == 3){
return num.regionID === $scope.editOrgModel.parentRegionID;
}else if($scope.editOrgModel.levelType == 2){
return num.regionID === $scope.editOrgModel.regionID;
}
});
if ($scope.selectCity) {
loadDistrictList($scope.selectCity.regionID);
}
} else {
data = null;
$scope.CityList = data;
$scope.selectCity = data;
}
});
}
};
// 加载区县信息
var loadDistrictList = function (regionID) {
if (regionID !== undefined && regionID !== null) {
areaRegionService.getDistricts(regionID).success(function (data) {
if (data && data.length > 0) {
$scope.DistrictList = data;
var target = _.find($scope.DistrictList, function (num) {
return num.regionID === $scope.editOrgModel.regionID;
});
if (target) {
$scope.selectRegionID = $scope.editOrgModel.regionID;
}else{
$scope.selectRegionID = "";
}
} else {
data = null;
$scope.DistrictList = data;
$scope.selectRegionID = "";
}
});
}else {
$scope.DistrictList = null;
$scope.selectRegionID = "";
}
};
// 基础数据初始化
var init = function () {
// loadProjectIndustryList();
loadOrganizationStructureService();
loadBusinessUnitList();
loadProvinceList();
// loadEnterpriseAccountSetList();
// getAllDimensionList();
// loadprojectClient();
initDatePicker();
};
// 验证账套
var checkEnterpriseSetOrg = function () {
if ($scope.orgAccountList && $scope.orgAccountList.length > 0) {
$scope.orgAccountList.forEach(function (row) {
$scope.checkEnterpriseAccountSetSelect(row);
$scope.checkStartDate(row);
$scope.checkEndDate(row);
});
}
var errorList = _.filter($scope.orgAccountList, function (num) {
return num.enterpriseAccountSetSelectError || num.startDateError || num.endDateError;
});
if (errorList && errorList.length > 0) {
return true;
} else {
return false;
}
};
$scope.checkEnterpriseAccountSetSelect = function (row) {
if (!row.enterpriseAccountSetSelectID && !row.startDate && !row.endDate) {
row.enterpriseAccountSetSelectError = null;
return;
}
if (!row.enterpriseAccountSetSelectID) {
row.enterpriseAccountSetSelectError = $scope.resources.OrganizationMsgEnterpriseAccountSetRequired;
} else {
row.enterpriseAccountSetSelectError = null;
}
};
// 验证开始时间
$scope.checkStartDate = function (row) {
......@@ -839,147 +450,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
}
};
// 验证模板列表
var checkTemplateList = function () {
var hasError = false;
if ($scope.isCheckedServiceList && $scope.isCheckedServiceList.length > 0) {
$scope.isCheckedServiceList.forEach(function (row) {
$scope.checkTemplate(row);
if (row.selectedTemplateError) {
hasError = true;
}
});
}
return hasError;
};
// 验证模板方法
$scope.checkTemplate = function (row) {
if (row.isChecked) {
if (!row.selectedTemplate) {
row.selectedTemplateError = $scope.resources.OrganizationMsgTemplateRequired;
} else {
row.selectedTemplateError = null;
}
} else {
row.selectedTemplateError = null;
}
};
// 添加一行账套设置
$scope.newOrgAccountRow = function () {
var index = $scope.OrgAccountRowIndex;
// var enterpriseAccountSetList = copyArray($scope.enterpriseAccountSetList);
var d = new Date();
var now = d.formatDateTime('yyyy-MM');
var row = {
// enterpriseAccountSetList: enterpriseAccountSetList,
// enterpriseAccountSetSelect: null,
startDate: null,
endDate: null,
fromID: 'orgFrom' + index,
toID: 'orgTo' + index
};
$scope.OrgAccountRowIndex++;
$scope.orgAccountList.push(row);
$timeout(function () {
setDatepickerRow(row);
}, 200);
};
// 删除一行账套
$scope.deleteAccountModule = function (model) {
if (model) {
$scope.orgAccountList.splice(jQuery.inArray(model, $scope.orgAccountList), 1);
}
};
// 选择自定义属性校验
$scope.checkSelfDimension = function (row) {
if (row.isMandatory && row.dimensionValueList && row.dimensionValueList.length > 0) {
if (!row.selectDimensionValueID) {
row.error = $translate.instant('PleaseSelect');
return;
}
}
row.error = '';
};
// 修改机构时，设置账套设置的值
var setEnterpriseOrgRowList = function (enterpriseAccountSetData) {
$scope.orgAccountList = [];
if (!enterpriseAccountSetData.enterpriseAccountSetOrgList || enterpriseAccountSetData.enterpriseAccountSetOrgList.length === 0) {
return;
}
var enterpriseAccountSetList = copyArray($scope.enterpriseAccountSetList);
enterpriseAccountSetData.enterpriseAccountSetOrgList.forEach(function (row) {
var index = $scope.OrgAccountRowIndex;
var rowData = {
enterpriseAccountSetList: enterpriseAccountSetList,
enterpriseAccountSetSelectID: row.enterpriseAccountSetID,
startDate: row.effectiveDateStr,
endDate: row.expiredDateStr,
fromID: 'orgFrom' + index,
toID: 'orgTo' + index,
id:row.id,
};
$scope.OrgAccountRowIndex++;
$scope.orgAccountList.push(rowData);
$timeout(function () {
setDatepickerRow(rowData);
}, 100);
});
};
// 设置时间控件
var setDatepickerRow = function (rowData) {
$("#" + rowData.fromID).datepicker({
minViewMode: 1,
autoclose: true,
language: "zh-CN",
format: "yyyy-mm"
});
$("#" + rowData.toID).datepicker({
minViewMode: 1,
autoclose: true,
language: "zh-CN",
format: "yyyy-mm"
});
$("#" + rowData.fromID).on('changeDate', function () {
if ($("#" + rowData.fromID).val === '') {
} else {
$("#" + rowData.toID).datepicker('setStartDate', $("#" + rowData.fromID).val());
}
});
// 默认的错误信息先设置为空
rowData.startDateError = null;
rowData.endDateError = null;
};
// 数组复制
var copyArray = function (data) {
var ret = [];
data.forEach(function (row) {
ret.push(row);
});
return ret;
};
// 说明
$scope.resources = {
OrganizationName: $translate.instant('OrganizationName'),
......@@ -1128,69 +598,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// $('.localRequired').attr("required","true"); required="required"
};
// 省改变时联动市
$scope.populateCities = function () {
var regionID = $scope.selectProvince && $scope.selectProvince.regionID;
loadCityList(regionID);
};
// 市改变时联动区
$scope.populateDistricts = function () {
var regionID = $scope.selectCity && $scope.selectCity.regionID;
loadDistrictList(regionID);
};
// 验证是否为时间段
var validateDate = function (from, to) {
var fromDate = new Date(from + '-01');
var toDate = new Date(to + '-01');
toDate.setMonth(toDate.getMonth() + 1);
toDate.setDate(toDate.getDate() - 1);
if (fromDate <= toDate) {
return true;
} else {
return false;
}
};
// 获取添加自定义纬度列表
var getAddOrgSetDimension = function () {
var dimensionList = _.filter($scope.dimensionList, function (data) {
return data.dimensionType === constant.dimensionType.SelfDimension;
});
if (dimensionList && dimensionList.length > 0) {
var rightList = [];
var leftList = [];
for (var i = 0; i < dimensionList.length; i++) {
var row = dimensionList[i];
// 初始化的时候不选择值
row.selectDimensionValueID = '';
if (i % 2 === 1) {
leftList.push(row);
} else {
rightList.push(row);
}
}
var model = {
leftList: leftList,
rightList: rightList
};
return model;
}
return {
leftList: [],
rightList: []
};
};
var initDatePicker = function () {
var ele = $(".startDatepicker");
ele.datepicker({
......@@ -1207,47 +614,6 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
};
// 获取修改机构的时候，自定义维度列表
var getUpdateOrgSetDimension = function (orgid, dimensionValueOrgList) {
var dimensionList = _.filter($scope.dimensionList, function (data) {
return data.dimensionType === constant.dimensionType.SelfDimension;
});
if (dimensionList && dimensionList.length > 0) {
var rightList = [];
var leftList = [];
for (var i = 0; i < dimensionList.length; i++) {
var row = dimensionList[i];
// 设置默认选中值
var selectObj = _.find(dimensionValueOrgList, function (data) {
return data.dimensionID === row.id && data.organizationID === orgid;
});
row.selectDimensionValueID = selectObj ? selectObj.dimensionValueID : '';
if (i % 2 === 1) {
leftList.push(row);
} else {
rightList.push(row);
}
}
var model = {
leftList: leftList,
rightList: rightList
};
return model;
}
return {
leftList: [],
rightList: []
};
};
(function initialize() {
$log.debug('editOrganizationModalController.ctor()...');
$scope.maxdropLength = 20;
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ eb4ff044
......@@ -5,20 +5,8 @@
<div class="modal-content">
<div class="modal-header">
<div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}}
<button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()"
ng-show="isAdd&&!isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
</div>
<div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}}
<button type="button" class="btn btn-in-grid" style="width: 117px;"
ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()"
ng-show="isAdd&&!isLocal"><i
class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
</div>
</div>
<div id="orgControlTab" ng-if="isAdd">
......@@ -35,241 +23,163 @@
<span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowAdvanced"></span>
</a>
</li>
<!--<li>
<a href="#rightControlManagement" data-toggle="tab">
{{'OrganizationRightManagement' | translate}}
<span class="glyphicon glyphicon-exclamation-sign" ng-if="isShowRight"></span>
</a>
</li>-->
</ul>
</div>
<div id="myTabContent" class="tab-content">
<div id="basicdata" class="tab-pane in active">
<form class="form-horizontal" id="orgControlForm" name="orgControlForm">
<div class="local">
<div style="margin-left: 20px;margin-top: 20px">
<span style="font-weight: bold;font-size: large;">{{'entityInfo'|translate}}</span>
</div>
<div class="bottom-row">
<div class="quarter-div leftUp">
<!--机构名称-->
<div class="form-group" ng-show="isLocal">
<label class="col-sm-3 control-label"><span class="must-input">*</span>{{'OrganizationName'
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
<div class="form-group">
<label class="col-sm-3 control-label"><span class="must-input">*</span>{{'OrganizationName' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" id="name"
ng-model="editOrgModel.name" name="name"
placeholder="{{resources.OrganizationName}}" ng-keyup="nameKeyUp()"
maxlength="100">
<p ng-show="orgControlForm.name.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgNameRequired}}
</p>
<p ng-show="editOrgModel.nameError" class="has-error label">
{{editOrgModel.nameError}}</p>
<!--<p ng-show="orgControlForm.name.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">{{resources.OrganizationMsgNameRequired}}-->
<!--</p>-->
<!--<p ng-show="editOrgModel.nameError" class="has-error label">-->
<!--{{editOrgModel.nameError}}</p>-->
</div>
</div>
<!--机构名称(英文)-->
<!--Internal Entity Code-->
<div class="form-group">
<label class="col-sm-3 control-label"></span>{{'OrganizationNameEn' |
translate}}：</label>
<label class="col-sm-3 control-label"></span>{{'EntityCode' | translate}}：</label>
<div class="col-sm-9">
<input class="form-control" id="englishName"
ng-model="editOrgModel.englishName" name="englishName"
placeholder="{{resources.OrganizationNameEn}}"
<input class="form-control" id="entityCode"
ng-model="editOrgModel.code" name="entityCode"
placeholder="{{resources.EntityCode}}"
ng-keyup="nameKeyUp()" maxlength="100">
</div>
</div>
<!--客户代码-->
<div class="form-group" ng-show="isLocal">
<label for="clientCode" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'OrganizationClientCode' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="clientCode"
id="clientCode" ng-model="editOrgModel.clientCode"
placeholder="{{resources.OrganizationClientCode}}" maxlength="50">
<p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgClientCodeRequired}}</p>
</div>
</div>
<!--架构类型-->
<div class="form-group" ng-show="isLocal">
<!--<label for="clientCode" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'ArchitectureType' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.architectureType.$invalid && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="architectureType" id="architectureType"
ng-model="editOrgModel.architectureType"
placeholder="{{resources.ArchitectureType}}" maxlength="50">
</div>-->
<label for="architectureType"
class="col-sm-3 control-label">{{'ArchitectureType' | translate}}：</label>
<!--Legal Form-->
<div class="form-group">
<label for="legalForm" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'OrganizationLegalForm' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.architectureType.$invalid && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='architectureType'
name="architectureType" ng-model="editOrgModel.architectureType"
ng-options="item for item in architectureTypeList">
<option value="">{{resources.ArchitectureType}}</option>
ng-class="{'has-error':orgControlForm.legalForm.$invalid && (orgControlForm.legalForm.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='legalForm'
name="legalForm" ng-model="editOrgModel.legalForm"
ng-options="item for item in legalFormTypeList">
<option value="">{{resources.LegalForm}}</option>
</select>
<p ng-show="orgControlForm.architectureType.$error.required && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgArchitectureTypeRequired}}</p>
<!--<p ng-show="orgControlForm.clientCode.$error.required && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">-->
<!--{{resources.OrganizationMsgClientCodeRequired}}</p>-->
</div>
</div>
<!--注册地-->
<div class="form-group" ng-show="isLocal">
<label for="registerAddress" class="col-sm-3 control-label">{{'RegistrationLocation'
| translate}}：</label>
<!--registerAddress-->
<div class="form-group">
<label for="registerAddress"
class="col-sm-3 control-label">{{'RegistrationLocation' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registerAddress.$invalid && (orgControlForm.registerAddress.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registerAddress" id="registerAddress"
ng-model="editOrgModel.registerAddress"
placeholder="{{resources.registrationLocation}}" maxlength="100">
<!--<p ng-show="orgControlForm.architectureType.$error.required && (orgControlForm.architectureType.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">-->
<!--{{resources.OrganizationMsgArchitectureTypeRequired}}</p>-->
</div>
</div>
<!--注册资本(万元)-->
<!--authorisedCapital-->
<div class="form-group">
<label for="registrationCapital" class="col-sm-3 control-label">{{'RegistrationCapital'
| translate}}：</label>
<!-- <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> -->
<div class="col-sm-9">
<input class="form-control" name="registrationCapital"
id="registrationCapital" ng-model="editOrgModel.registrationCapital"
placeholder="{{resources.RegistrationCapital}}" maxlength="50">
</div>
</div>
<!--所属国民经济行业-->
<div class="form-group" ng-show="isLocal">
<label for="nationalEconomicIndustry" class="col-sm-3 control-label">{{'NationalEconomicIndustry'
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.nationalEconomicIndustry.$invalid && (orgControlForm.nationalEconomicIndustry.$dirty || orgControlForm.$submitted)}">
<!--<input class="form-control" name="nationalEconomicIndustry"
id="nationalEconomicIndustry"
ng-model="editOrgModel.nationalEconomicIndustry"
placeholder="{{resources.NationalEconomicIndustry}}" maxlength="50">-->
<select class="form-control" id='nationalEconomicIndustry'
name="nationalEconomicIndustry"
ng-model="editOrgModel.nationalEconomicIndustry"
ng-options="x.code as x.type for x in nationalEconomicIndustryList">
<option value="">{{resources.NationalEconomicIndustry}}</option>
</select>
<label for="authorisedCapital" class="col-sm-3 control-label">{{'authorisedCapital' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.authorisedCapital.$invalid && (orgControlForm.authorisedCapital.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="authorisedCapital" id="authorisedCapital"
ng-model="editOrgModel.authorisedCapital"
placeholder="{{resources.authorisedCapital}}" maxlength="100">
</div>
</div>
<!--法定代表人/负责人名称-->
<!--issuedCapital-->
<div class="form-group">
<label for="legalPersonName" class="col-sm-3 control-label">{{'LegalPersonName'
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.legalPersonName.$invalid && (orgControlForm.legalPersonName.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="legalPersonName" id="legalPersonName"
ng-model="editOrgModel.legalPersonName"
placeholder="{{resources.LegalPersonName}}" maxlength="50">
</div>
</div>
<!--分公司数量-->
<div class="form-group" ng-show="isLocal">
<label for="numOfBranches" class="col-sm-3 control-label">{{'NumOfBranches'
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.numOfBranches.$invalid && (orgControlForm.numOfBranches.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="numOfBranches" id="numOfBranches"
ng-model="editOrgModel.numOfBranches"
placeholder="{{resources.NumOfBranches}}" maxlength="50">
</div>
</div>
<!--注销时间-->
<div class="form-group" ng-show="isInternational">
<label for="logoutTime" class="col-sm-3 control-label">{{'LogoutTime'
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.logoutTime.$invalid && (orgControlForm.logoutTime.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker">
<input type="text" id="logoutTime" class="input-sm form-control"
name="logoutTime" ng-model="editOrgModel.logoutTime"
placeholder="{{resources.LogoutTime}}" />
</div>
<label for="issuedCapital" class="col-sm-3 control-label">{{'issuedCapital' | translate}}：</label>
<!-- <div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registrationCapital.$invalid && (orgControlForm.registrationCapital.$dirty || orgControlForm.$submitted)}"> -->
<div class="col-sm-9">
<input class="form-control" name="issuedCapital"
id="issuedCapital" ng-model="editOrgModel.issuedCapital"
placeholder="{{resources.issuedCapital}}" maxlength="50">
</div>
</div>
<!--经营范围-->
<!--industry-->
<div class="form-group">
<label for="businessScope" class="col-sm-3 control-label">{{'BusinessScope'
| translate}}：</label>
<label for="industry" class="col-sm-3 control-label">{{'industry' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.businessScope.$invalid && (orgControlForm.businessScope.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="businessScope" id="businessScope"
ng-model="editOrgModel.businessScope"
placeholder="{{resources.BusinessScope}}">
ng-class="{'has-error':orgControlForm.industry.$invalid && (orgControlForm.industry.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="industry"
id="industry" ng-model="editOrgModel.industry"
placeholder="{{resources.industry}}" maxlength="50">
</div>
</div>
</div>
<div class="quarter-div rightUp">
<!--统一社会信用代码-->
<div class="form-group" ng-show="isLocal">
<label for="taxPayerNumber" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'UnifiedSocialCreditCode'
| translate}}：</label>
<!--businessLicense-->
<div class="form-group">
<label for="businessLicense" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'businessLicense' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.taxPayerNumber.$invalid && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="taxPayerNumber"
id="taxPayerNumber" ng-model="editOrgModel.taxPayerNumber"
maxlength="50" placeholder="{{resources.UnifiedSocialCreditCode}}"
tax-payer-number-unique>
<p ng-show="orgControlForm.taxPayerNumber.$error.taxPayerNumberUnique && (orgControlForm.taxPayerNumber.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgTaxPayerNumberUnique}}</p>
ng-class="{'has-error':orgControlForm.businessLicense.$invalid && (orgControlForm.businessLicense.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="businessLicense"
id="businessLicense" ng-model="editOrgModel.businessLicense"
maxlength="50" placeholder="{{resources.businessLicense}}">
<!--<p ng-show="orgControlForm.businessLicense.$error.taxPayerNumberUnique && (orgControlForm.businessLicense.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label">-->
<!--{{resources.OrganizationMsgTaxPayerNumberUnique}}</p>-->
</div>
</div>
<!--公司简称-->
<div class="form-group" ng-show="isLocal">
<label for="abbreviation" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'Abbreviation' | translate}}：</label>
<!--entityLevel-->
<div class="form-group">
<label for="entityLevel" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'entityLevel' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.clientCode.$invalid && (orgControlForm.clientCode.$dirty || orgControlForm.$submitted)}">
<input class="form-control localRequired" name="abbreviation"
id="abbreviation" ng-model="editOrgModel.abbreviation"
placeholder="{{resources.Abbreviation}}" maxlength="50">
ng-class="{'has-error':orgControlForm.entityLevel.$invalid && (orgControlForm.entityLevel.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='entityLevel'
name="entityLevel" ng-model="editOrgModel.entityLevel"
ng-options="item for item in entityLevelTypeList">
<option value="">{{resources.entityLevel}}</option>
</select>
</div>
</div>
<!--工商登记状态-->
<!--dateOfIncorporation-->
<div class="form-group">
<label for="regStatus"
class="col-sm-3 control-label">{{'RegStatus' | translate}}：</label>
<label for="dateOfIncorporation" class="col-sm-3 control-label">{{'dateOfIncorporation' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.regStatus.$invalid && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='regStatus' name="regStatus"
ng-model="editOrgModel.regStatus"
ng-options="x.type as x.type for x in regStatusList ">
</select>
ng-class="{'has-error':orgControlForm.dateOfIncorporation.$invalid && (orgControlForm.dateOfIncorporation.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker">
<input type="text" id="dateOfIncorporation" class="input-sm form-control" name="dateOfIncorporation" ng-model="editOrgModel.dateOfIncorporation"
required="required" placeholder="{{resources.dateOfIncorporation}}"/>
</div>
<!-- <p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgRegStatusRequired}}</p> -->
</div>
</div>
<!--公司代码-->
<div class="form-group" ng-show="isLocal">
<label for="code" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'OrganizationCode' |
translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.code.$invalid && (orgControlForm.code.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="code" id="code"
ng-model="editOrgModel.code"
placeholder="{{resources.OrganizationCode}}" maxlength="50"
ng-pattern="/^[A-Za-z0-9]+$/" code-unique>
<!--jurisdictionOfFormation-->
<div class="form-group">
<label for="jurisdictionOfFormation" class="col-sm-3 control-label"><span class="must-input">*</span>{{'jurisdictionOfFormation' | translate}}：</label>
<div class="col-sm-9" ng-class="{'has-error':orgControlForm.jurisdictionOfFormation.$invalid && (orgControlForm.jurisdictionOfFormation.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='jurisdictionOfFormation'
name="jurisdictionOfFormation" ng-model="editOrgModel.jurisdictionOfFormation"
ng-options="item for item in jurisdictionOfFormationTypeList">
<option value="">{{resources.jurisdictionOfFormation}}</option>
</select>
<!-- <p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgCodeRequired}}</p>
<p ng-show="orgControlForm.code.$error.maxlength"
......@@ -282,42 +192,36 @@
</div>
</div>
<!--注册地(英文)-->
<!--financialYearEnd-->
<div class="form-group">
<label for="registrationLocationEn" class="col-sm-3 control-label">{{'RegistrationLocationEn'
| translate}}：</label>
<label for="financialYearEnd" class="col-sm-3 control-label">{{'financialYearEnd' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.registrationLocationEn.$invalid && (orgControlForm.registrationLocationEn.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registrationLocationEn"
id="registrationLocationEn"
ng-model="editOrgModel.registrationLocationEn"
placeholder="{{resources.RegistrationLocationEn}}" maxlength="50">
ng-class="{'has-error':orgControlForm.financialYearEnd.$invalid && (orgControlForm.financialYearEnd.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="financialYearEnd" id="financialYearEnd" ng-model="editOrgModel.financialYearEnd"
placeholder="{{resources.financialYearEnd}}" maxlength="50">
</div>
</div>
<!--实缴资本-->
<!--registeredAgent-->
<div class="form-group">
<label for="paidInCapital" class="col-sm-3 control-label">{{'PaidInCapital'
| translate}}：</label>
<label for="registeredAgent" class="col-sm-3 control-label">{{'registeredAgent' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.paidInCapital.$invalid && (orgControlForm.paidInCapital.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="paidInCapital" id="paidInCapital"
ng-model="editOrgModel.paidInCapital"
placeholder="{{resources.PaidInCapital}}" maxlength="50">
ng-class="{'has-error':orgControlForm.registeredAgent.$invalid && (orgControlForm.registeredAgent.$dirty || orgControlForm.$submitted)}">
<input class="form-control" name="registeredAgent" id="registeredAgent" ng-model="editOrgModel.registeredAgent" placeholder="{{resources.registeredAgent}}" maxlength="50">
</div>
</div>
<!--从事国家限制或禁止行业-->
<div class="form-group" ng-show="isLocal">
<label for="engageNationalProhibitIndustry"
class="col-sm-3 control-label">{{'EngageNationalProhibitIndustry' | translate}}：</label>
<!--ownershipForm-->
<div class="form-group">
<label for="ownershipForm"
class="col-sm-3 control-label">{{'ownershipForm' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.engageNationalProhibitIndustry.$invalid && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='engageNationalProhibitIndustry'
name="engageNationalProhibitIndustry"
ng-model="editOrgModel.engageNationalProhibitIndustry"
ng-options="x.code as x.type for x in trueFalse">
<option value="">{{resources.EngageNationalProhibitIndustry}}
ng-class="{'has-error':orgControlForm.ownershipForm.$invalid && (orgControlForm.ownershipForm.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='ownershipForm'
name="ownershipForm"
ng-model="editOrgModel.ownershipForm"
ng-options="item for item in ownershipFormTypeList">
<option value="">{{resources.ownershipForm}}
</option>
</select>
<!-- <p ng-show="orgControlForm.engageNationalProhibitIndustry.$error.required && (orgControlForm.engageNationalProhibitIndustry.$dirty || orgControlForm.$submitted)"
......@@ -326,313 +230,53 @@
</p> -->
</div>
</div>
<!--成立日期-->
<div class="form-group">
<label for="foundationDate" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'FoundationDate'
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.foundationDate.$invalid && (orgControlForm.foundationDate.$dirty || orgControlForm.$submitted)}">
<div class="input-daterange startDatepicker">
<input type="text" id="foundationDate" class="input-sm form-control"
name="foundationDate" ng-model="editOrgModel.foundationDate"
required="required"
placeholder="{{resources.FoundationDate}}" />
</div>
</div>
</div>
<!--国家-->
<div class="form-group" ng-show="isInternational">
<label for="country" class="col-sm-3 control-label">{{'Country'
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.country.$invalid && (orgControlForm.country.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='country' name="country"
ng-model="editOrgModel.country"
ng-options="x for x in countryCNList">
<option value="">{{resources.Country}}</option>
</select>
<p ng-show="orgControlForm.country.$error.required && (orgControlForm.country.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgcountryRequired}}</p>
</div>
</div>
</div>
</div>
<div style="clear: both;"></div>
<div class="row-line"></div>
<div class="bottom-row">
<div class="quarter-div leftDown">
<!--上级公司-->
<div class="form-group" ng-show="isLocal">
<label for="OrgParent" class="col-sm-3 control-label">{{'OrganizationParent'
| translate}}：</label>
<div class="col-sm-9">
<org-selector id="OrgParent" selected-org-name="editOrgModel.parentName"
selected-org-id="editOrgModel.parentID"
component-selected-org="editOrgModel.componentSelectedOrg"
is-show-all=false select-no-option="true" item-max-length="22"
is-require="false">
</org-selector>
</div>
</div>
<!--所属业务线-->
<div class="form-group">
<label for="selectBusinessUnit" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'BusinessUnit'
| translate}}：</label>
<div class="col-sm-9">
<select class="form-control localRequired" id='selectBusinessUnit'
ng-model="selectBusinessUnit"
ng-options="item as item.name disable when item.disabled for item in businessUnitList"
name='selectBusinessUnit'>
<!--<option value="">{{pleaseSelect}}</option>-->
</select>
</div>
</div>
<!--行业-->
<div class="form-group" ng-show="isLocal">
<label for="selectProjectIndustry" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'StandardAccountIndustry' |
translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.selectProjectIndustry.$invalid && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" id='selectProjectIndustry'
ng-model="selectProjectIndustry"
ng-options="x.name for x in projectIndustryList"
name='selectProjectIndustry' ng-change="ProjectIndustryChanged()">
<option value="">{{pleaseSelect}}</option>
</select>
<p ng-show="orgControlForm.selectProjectIndustry.$error.required && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgProjectIndustryRequired}}</p>
</div>
</div>
<!--自定义属性左边-->
<div class="form-group" ng-repeat="x in selfDimensionModel.leftList">
<label class="col-sm-3 control-label"><span class="must-input"
ng-if="x.isMandatory">*</span><span
title="{{x.name}}">{{x.name|limitString:maxTitleLength}}：</span></label>
<div class="col-sm-9" ng-class="{'has-error':x.error}">
<select class="form-control account-set-select"
ng-model="x.selectDimensionValueID"
ng-change="checkSelfDimension(x)">
<option value="" id="">{{pleaseSelect}}</option>
<option ng-repeat="y in x.dimensionValueList" value="{{y.id}}"
title="{{y.name}}">{{y.name | limitString:maxdropLength}}
</option>
</select>
<p ng-show="x.error" class="has-error label">{{x.error}}</p>
</div>
</div>
</div>
<div class="quarter-div rightDown">
<!--地区-->
<div class="form-group" ng-show="isLocal">
<label class="col-sm-3 control-label"><span
class="must-input">*</span>{{'AdministrativeRegion' | translate}}：</label>
<div class="col-sm-9" style="width: 69%;left: -3%;">
<div class="col-sm-3" style="width: 31%"
ng-class="{'has-error':orgControlForm.selectProvince.$invalid && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" style="width: 90px;" name="selectProvince"
ng-change="populateCities()"
ng-model="selectProvince"
ng-options="x.regionName for x in ProvinceList">
<option value="">{{pleaseSelect}}</option>
</select>
<!--<p ng-show="orgControlForm.selectProvince.$error.required && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label" style="margin-left: -16px">-->
<!--{{resources.OrganizationMsgProvinceRequired}}</p>-->
</div>
<div class="col-sm-3" style="width: 31%"
ng-class="{'has-error':orgControlForm.selectCity.$invalid && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" name="selectCity"
ng-change="populateDistricts()" style="width: 90px;"
ng-model="selectCity"
ng-options="x.regionName for x in CityList">
<option value="">{{pleaseSelect}}</option>
</select>
<!--<p ng-show="orgControlForm.selectCity.$error.required && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label" style="margin-left: 30px">-->
<!--{{resources.OrganizationMsgCityRequired}}</p>-->
</div>
<div class="col-sm-3" style="width: 31%"
ng-class="{'has-error':orgControlForm.selectDistrict.$invalid && (orgControlForm.selectDistrict.$dirty || orgControlForm.$submitted)}">
<select class="form-control" name="selectDistrict" style="width: 90px;"
id="selectDistrict"
ng-model="selectRegionID">
<option value="">{{pleaseSelect}}</option>
<option ng-repeat="x in DistrictList" value="{{x.regionID}}"
title="{{x.regionName}}">{{x.regionName |
limitString:10}}
</option>
</select>
<!--<p ng-show="orgControlForm.selectDistrict.$error.required && (orgControlForm.selectDistrict.$dirty || orgControlForm.$submitted)"-->
<!--class="has-error label" style="margin-left: 30px">-->
<!--{{resources.OrganizationMsgCityRequired}}</p>-->
</div>
</div>
</div>
<!--层级-->
<div class="form-group" ng-show="isLocal">
<label for="selectLevelType" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'OrganizationLevelType' | translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.selectLevelType.$invalid && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)}">
<select class="form-control localRequired" id='selectLevelType'
name="selectLevelType" ng-model="selectLevelType"
ng-options="(x.name | limitString:25) for x in levelTypeList">
<option value="">{{pleaseSelect}}</option>
</select>
<p ng-show="orgControlForm.selectLevelType.$error.required && (orgControlForm.selectLevelType.$dirty || orgControlForm.$submitted)"
class="has-error label">
{{resources.OrganizationMsgLevelTypeRequired}}</p>
</div>
</div>
<!--区域-->
<div class="form-group">
<label for="AreaParent" class="col-sm-3 control-label"><span
class="must-input">*</span>{{'AreaTabTitle' |
translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.AreaName.$invalid && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)}">
<area-selector id="AreaParent" name="AreaName" class="orgAreaRequired"
selected-area-name="editOrgModel.areaName"
selected-area-id="editOrgModel.areaID"
component-selected-area="editOrgModel.componentSelectedArea"
is-show-all=false>
</area-selector>
<p ng-show="orgControlForm.AreaName.$error.required && (orgControlForm.AreaName.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgAreaRequired}}
</p>
</div>
</form>
</div>
<!--自定义属性右边-->
<div class="form-group" ng-repeat="x in selfDimensionModel.rightList">
<label class="col-sm-3 control-label"><span class="must-input"
ng-if="x.isMandatory">*</span><span
title="{{x.name}}">{{x.name|limitString:maxTitleLength}}：</span></label>
<div class="col-sm-9" ng-class="{'has-error':x.error}">
<select class="form-control account-set-select"
ng-model="x.selectDimensionValueID"
ng-change="checkSelfDimension(x)">
<option value="" id="">{{pleaseSelect}}</option>
<option ng-repeat="y in x.dimensionValueList" value="{{y.id}}"
title="{{y.name}}">{{y.name | limitString:maxdropLength}}
</option>
</select>
<p ng-show="x.error" class="has-error label">{{x.error}}</p>
</div>
</div>
<div id="advancedOptions" class="tab-pane fade">
<!--Equity information-->
<div class="label-current-holding">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'ShareHolder' | translate}}</label>
</div>
<div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="addEquity()">
<i class="material-icons middle">create</i>{{'Create' | translate}}
</button>
</div>
<div class="current-holding-info">
<span class="control-label"><strong
class="label label-default"
title="{{EquitySumInfo.orgTotal}}"></strong>
</span>
</div>
<div style="clear: both;"></div>
<div class="dx-viewport grid-container">
<div id="equityGridContainer" dx-data-grid="equityGridOptions" style="margin-top: 10px;">
</div>
</form>
</div>
<div class="tab-pane fade" id="advancedOptions">
<form class="form-horizontal" id="advancedControlForm" name="advancedControlForm">
<div class="level-title">
<span>{{'EnterpriseAccountManage'|translate}}</span>
</div>
<div class="account-modal-table">
<div ng-repeat="accountModule in orgAccountList track by $index">
<div class="row box-right">
<div class="col-sm-1 box"><span>{{$index + 1}}</span></div>
<div class="col-sm-10 box">
<span
class="col-sm-2 AccountName-span">{{'EnterpriseAccountNameShort'|translate}}：</span>
<div class="col-sm-4"
ng-class="{'has-error':accountModule.enterpriseAccountSetSelectError}">
<select style="width:200px;" class=" form-control account-set-select"
id='enterpriseAccountSetSelect'
ng-change="checkEnterpriseAccountSetSelect(accountModule)"
name="enterpriseAccountSetSelect"
ng-model="accountModule.enterpriseAccountSetSelectID" required>
<option value="">{{pleaseSelect}}</option>
<option ng-repeat="x in enterpriseAccountSetList" value="{{x.id}}"
title="{{x.name}}">{{x.name | limitString:maxdropLength}}
</option>
</select>
<p ng-show="accountModule.enterpriseAccountSetSelectError"
class="has-error label">
{{accountModule.enterpriseAccountSetSelectError}}</p>
</div>
<span class="col-sm-2 StartTime-span">{{'EffectiveDate' | translate}}</span>
<div class="col-sm-5" ng-class="{'has-error':accountModule.startDateError}">
<input type="text" class="form_datetime form-control"
ng-model="accountModule.startDate" id="{{accountModule.fromID}}"
ng-change="checkStartDate(accountModule)" required />
<p ng-show="accountModule.startDateError" class="has-error label">
{{accountModule.startDateError}}</p>
</div>
<span class="col-sm-2 To-span">{{'ExpiredDateTo'|translate}}</span>
<div class="col-sm-5" ng-class="{'has-error':accountModule.endDateError}">
<input type="text" class="form_datetime form-control"
ng-model="accountModule.endDate" id="{{accountModule.toID}}"
ng-change="checkEndDate(accountModule)" required />
<p ng-show="accountModule.endDateError" class="has-error label">
{{accountModule.endDateError}}</p>
</div>
</div>
<div class="col-sm-1 box"><span ng-click="deleteAccountModule(accountModule)"><i
class="material-icons button-icons middle delete">delete</i></span>
</div>
</div>
</div>
<div class="row box-right box-bottom">
<div class="col-sm-1 box"><span ng-click="newOrgAccountRow()">
<i
class="material-icons button-icons middle add">add_circle_outline</i></span>
</div>
<div class="col-sm-10 box">
</div>
<div class="col-sm-1 box"></div>
</div>
</div>
<div class="level-title">
<span>{{'OrganizationServiceTemplateGroup'|translate}}</span>
</div>
<div class="server-modal-table">
<div ng-repeat="serviceModule in isCheckedServiceList track by $index">
<div class="row box-right">
<div class="col-sm-10 box">
<div class="col-sm-2 serviceCheckBox"><input class="checkService"
type="checkbox" ng-model="serviceModule.isChecked"></div>
<span class="col-sm-2 ServiceName-span">{{serviceModule.name}}</span>
<span
class="col-sm-2 ReportTemplate-span">{{'ReportTemplate'|translate}}:</span>
<div class="col-sm-5"
ng-class="{'has-error':serviceModule.selectedTemplateError}">
<select class="form-control" style="display: inline-block;"
ng-change="checkTemplate(serviceModule)"
ng-model="serviceModule.selectedTemplate"
ng-options="template.name for template in serviceModule.templateGroupList"
name="selectedModule">
<option value="">{{pleaseSelect}}</option>
</select>
<p ng-show="serviceModule.selectedTemplateError"
class="has-error label">{{serviceModule.selectedTemplateError}}</p>
<!--Direcotr information-->
<div class="label-director">
<label class="basic-label" style="font-weight: bold;font-size: large;">{{'DirectorInfo' | translate}}</label>
</div>
<div class="right-option">
<button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="addDirector()">
<i class="material-icons middle">create</i>{{'Create' | translate}}
</button>
</div>
<div class="current-holding-info">
<span class="control-label"><strong
class="label label-default"
title="{{DirectorList.length}}"></strong>
</span>
</div>
<div class="dx-viewport grid-container">
<div id="DirectorGridContainer" dx-data-grid="directorGridOptions" style="margin-top: 10px;">
</div>
</div>
</form>
</div>
<!--<div class="tab-pane fade" id="rightControlManagement">
<p>权限设置待开发，敬请期待！</p>
</div>-->
</div>
<div class="modal-footer" id="orgModalFooter" style="padding-left:139px;">
<button type="submit" class="btn btn-primary" ng-click="saveOrg()">
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.less
View file @ eb4ff044
......@@ -409,5 +409,55 @@
height: 16px;
}
}
#advancedOptions {
max-height: 100%;
margin:10px 20px 0px 20px;
.right-option {
height: 30px;
display: inline-block;
vertical-align: middle;
float: right;
}
#equityGridContainer {
/*height: 600px;*/
margin-bottom: 15px;
}
.label-current-holding {
padding-top: 10px;
}
.current-holding-info {
padding-top: 10px;
}
.label {
padding-bottom: 2px;
}
.page-footer {
display: inline-block;
float: right;
/*padding-right: 20px;*/
}
.page-form-group {
float: right;
margin-top: 20px;
.page-size {
margin: 0;
}
.pagination {
margin: 0;
}
}
}
}
}
\ No newline at end of file
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