Skip to content

T
traffic-front
Commit 2caf2528 authored by chase's avatar chase
Browse files
Options

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

parents ea289174 31e382e2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 698 additions and 150 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessageCN.java
View file @ 2caf2528
......@@ -5,6 +5,7 @@ public class ErrorMessageCN {
public static final String NoCompanyError = "未映射到主体";
public static final String ExistDataPeriodsError = "存在非选择期间数据";
public static final String InconsistentPeriod = "单表中期间不一致";
public static final String DONOTSELECTPERIOD = "未选择期间";
public static final String DoNotSelectPeriod = "未选择期间";
public static final String DoNotSelectCompany = "非选定主体";
}
atms-api/src/main/java/pwc/taxtech/atms/controller/DataImportController.java
View file @ 2caf2528
package pwc.taxtech.atms.controller;
import com.alibaba.fastjson.JSONArray;
import org.springframework.web.bind.annotation.*;
import com.google.common.collect.Lists;
import org.springframework.web.multipart.MultipartFile;
......@@ -82,12 +83,13 @@ public class DataImportController extends BaseController {
@ResponseBody
@RequestMapping(value = "RLITExcelFile", method = RequestMethod.POST)
public OperationResultDto importRLITExcelFile(@RequestParam MultipartFile file,@RequestParam String periodDate,@RequestParam Integer importType) {
public OperationResultDto importRLITExcelFile(@RequestParam MultipartFile file,@RequestParam String orgIds,@RequestParam String periodDate,@RequestParam Integer importType) {
try {
if (null == file) {
return OperationResultDto.error(ErrorMessage.NoFile);
}
return dataImportService.importRLITExcelFile(file, periodDate,importType);
List<String> orgList = (List<String>)JSONArray.parse(orgIds);
return dataImportService.importRLITExcelFile(file,orgList, periodDate,importType);
} catch (ServiceException e) {
return OperationResultDto.error(e.getMessage());
} catch (Exception e) {
......@@ -98,12 +100,13 @@ public class DataImportController extends BaseController {
@ResponseBody
@RequestMapping(value = "ATExcelFile", method = RequestMethod.POST)
public OperationResultDto importATExcelFile(@RequestParam MultipartFile file,@RequestParam String periodDate,@RequestParam Integer importType) {
public OperationResultDto importATExcelFile(@RequestParam MultipartFile file,@RequestParam String orgIds,@RequestParam String periodDate,@RequestParam Integer importType) {
try {
if (null == file) {
return OperationResultDto.error(ErrorMessage.NoFile);
}
return dataImportService.importATExcelFile(file, periodDate,importType);
List<String> orgList = (List<String>)JSONArray.parse(orgIds);
return dataImportService.importATExcelFile(file, orgList,periodDate,importType);
} catch (ServiceException e) {
return OperationResultDto.error(e.getMessage());
} catch (Exception e) {
......@@ -130,12 +133,13 @@ public class DataImportController extends BaseController {
@ResponseBody
@RequestMapping(value = "CPRExcelFile", method = RequestMethod.POST)
public OperationResultDto importCPRExcelFile(@RequestParam MultipartFile file,@RequestParam String periodDate,@RequestParam Integer importType) {
public OperationResultDto importCPRExcelFile(@RequestParam MultipartFile file,@RequestParam String orgIds,@RequestParam String periodDate,@RequestParam Integer importType) {
try {
if (null == file) {
return OperationResultDto.error(ErrorMessage.NoFile);
}
return dataImportService.importCPRExcelFile(file, periodDate,importType);
List<String> orgList = (List<String>)JSONArray.parse(orgIds);
return dataImportService.importCPRExcelFile(file,orgList, periodDate,importType);
} catch (ServiceException e) {
return OperationResultDto.error(e.getMessage());
} catch (Exception e) {
......
atms-api/src/main/java/pwc/taxtech/atms/controller/FileUploadController.java
View file @ 2caf2528
package pwc.taxtech.atms.controller;
import org.apache.commons.io.FileUtils;
import org.nutz.lang.Files;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import pwc.taxtech.atms.common.CommonConstants;
import pwc.taxtech.atms.common.CommonUtils;
import pwc.taxtech.atms.constant.enums.EnumModule;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.service.impl.FileService;
import pwc.taxtech.atms.vat.service.impl.FileUploadAdapter;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import static pwc.taxtech.atms.constant.Constant.USER_Id_FOR_UPLOAD;
@RestController
......@@ -17,9 +30,29 @@ import static pwc.taxtech.atms.constant.Constant.USER_Id_FOR_UPLOAD;
public class FileUploadController {
@Autowired
private FileUploadAdapter fileUploadAdapter;
@Autowired
private FileService fileService;
@RequestMapping(value = "NewFile", method = RequestMethod.POST, produces = MediaType.MULTIPART_FORM_DATA_VALUE)
public ResponseEntity getInputInvoiceTreeViewData(MultipartHttpServletRequest request) {
return fileUploadAdapter.upload(request);
}
public static void main(String[] args){
try{
String templatePath = "C:\\Users\\Gary J Li\\Documents\\PwcDoc\\DD2018\\vat notes\\导入数据模板-报表&科目余额表&日记账\\导入数据模板-报表&科目余额表&日记账\\Adjustmnet_template.xlsx";
File templateFile = new File(templatePath);
String netFilePath =FileUtils.getTempDirectory().getAbsolutePath() + File.separator + "didiTemplate" + File.separator
+ "Adjustmnet_template.xlsx";
InputStream inputStream = new FileInputStream(templateFile);
System.out.println(String.format("保存输入流到指定的路径, filePath:{}", templateFile));
Files.write(netFilePath, inputStream);
}catch (Exception e){
e.printStackTrace();
}
}
}
atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationController.java
View file @ 2caf2528
......@@ -8,6 +8,7 @@ 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.OrgSimpleDto;
import pwc.taxtech.atms.dpo.OrganizationDto;
import pwc.taxtech.atms.dto.organization.OrganizationExtraDto;
import pwc.taxtech.atms.dto.AreaOrganizationStatistics;
......@@ -95,6 +96,13 @@ public class OrganizationController {
return organizationService.getOrgInfo();
}
@RequestMapping(value = "getOrgListByUserId", method = RequestMethod.GET)
public @ResponseBody
List<OrgSimpleDto> getOrgSimpleList() {
logger.info("GET /api/v1/org/getOrgListByUserId");
return organizationService.getOrgSimpleList();
}
// @ApiOperation(value = "纳税人识别号唯一性验证")
@RequestMapping(value = "taxPayerNumberUniqueValidate", method = RequestMethod.POST)
public @ResponseBody
......
atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrganizationExtraDto.java
View file @ 2caf2528
......@@ -1348,10 +1348,26 @@ public class OrganizationExtraDto implements Serializable {
this.otherFacts = otherFacts == null ? null : otherFacts.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization_extra.tax_return_business_type
*
* @return the value of organization_extra.tax_return_business_type
*
* @mbg.generated
*/
public Integer getTaxReturnBusinessType() {
return taxReturnBusinessType;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column organization_extra.tax_return_business_type
*
* @param taxReturnBusinessType the value for organization_extra.tax_return_business_type
*
* @mbg.generated
*/
public void setTaxReturnBusinessType(Integer taxReturnBusinessType) {
this.taxReturnBusinessType = taxReturnBusinessType;
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OperationLogServiceImpl.java
View file @ 2caf2528
package pwc.taxtech.atms.service.impl;
import com.google.common.collect.Lists;
import org.apache.ibatis.session.RowBounds;
import org.nutz.lang.Lang;
import org.nutz.lang.Strings;
......@@ -495,9 +496,10 @@ public class OperationLogServiceImpl extends AbstractService {
*/
public List<OperationLogBasicData> getEquityChangeLogByOrgName(String orgName) {
OperationLogBasicDataExample example = new OperationLogBasicDataExample();
example.createCriteria().andOperationObjectEqualTo(orgName).andOperationActionEqualTo(OperationAction.ChangeEquity.name());
Criteria criteria = example.createCriteria().andOperationActionEqualTo(OperationAction.NewEquity.name());
example.or(criteria);
List<String> opeActions = Lists.newArrayList();
opeActions.add(OperationAction.ChangeEquity.name());
opeActions.add(OperationAction.NewEquity.name());
example.createCriteria().andOperationObjectEqualTo(orgName).andOperationActionIn(opeActions);
example.setOrderByClause("create_time desc");
return operationLogBasicDataMapper.selectEquityLogByExample(example);
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java
View file @ 2caf2528
......@@ -67,8 +67,7 @@ import java.util.stream.Collectors;
import static java.util.Comparator.*;
import static java.util.stream.Collectors.toList;
import static pwc.taxtech.atms.common.CommonConstants.Comma;
import static pwc.taxtech.atms.common.CommonConstants.CommonFail;
import static pwc.taxtech.atms.common.CommonConstants.*;
import static pwc.taxtech.atms.common.CommonUtils.copyProperties;
import static pwc.taxtech.atms.common.OperateLogType.OperationLogOrganization;
import static pwc.taxtech.atms.common.OperationModule.Organization;
......@@ -1999,6 +1998,15 @@ public class OrganizationServiceImpl extends BaseService{
Organization org = copyProperties(orgDto, new Organization());
org.setpLevel(orgDto.getpLevel());
if (StringUtils.isEmpty(org.getClientCode())) {
org.setClientCode("null");
}
if (StringUtils.isEmpty(org.getName())) {
org.setName(org.getEnglishName());
}
if (StringUtils.isEmpty(org.getStructureId())) {
org.setStructureId("null");
}
organizationMapper.insert(org);
OperationResultDto<Object> validateSetRet = validateEnterpriseAccountSetDateTimeOverlap(
orgDto.getEnterpriseAccountSetOrgList());
......@@ -2082,7 +2090,7 @@ public class OrganizationServiceImpl extends BaseService{
logger.error("addOrg出错:" + e, e);
logger.error("标记回滚, ready to call setRollbackOnly");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return new OperationResultDto(false, CommonFail + e.getMessage());
return new OperationResultDto(false, SystemError);
}
}
......@@ -2156,7 +2164,7 @@ public class OrganizationServiceImpl extends BaseService{
private OperationResultDto checkExist(OrganizationDto orgDto) {
Assert.notNull(orgDto, "orgDto null point error");
Organization queryRoot = null;
if (orgDto.getParentId() != null) {
if ((null==orgDto.getOversea()||!orgDto.getOversea()) && orgDto.getParentId() != null) {
OrganizationExample example = new OrganizationExample();
Criteria criteria = example.createCriteria();
criteria.andClientCodeEqualTo(orgDto.getClientCode());
......@@ -2169,7 +2177,7 @@ public class OrganizationServiceImpl extends BaseService{
return new OperationResultDto(false, OrganizationMessage.ClientCodeIsExist);
}
OperationResultDto operationResult = checkOrgNameOrOrgCode(orgDto);
if (operationResult.getResult()) {
if (operationResult.getResult() && (null==orgDto.getOversea()||!orgDto.getOversea())) {
operationResult = checkCodeTaxPaymentNo(orgDto);
}
return operationResult;
......@@ -2305,7 +2313,9 @@ public class OrganizationServiceImpl extends BaseService{
@SuppressWarnings("rawtypes")
private OperationResultDto checkOrgNameOrOrgCode(OrganizationDto orgDto) {
OrganizationExample example = new OrganizationExample();
if (orgDto.getId() == null) {
if (null!=orgDto.getOversea()&&orgDto.getOversea()) {
example.or().andEnglishNameEqualTo(orgDto.getEnglishName());
} else if (orgDto.getId() == null) {
example.or().andClientCodeEqualTo(orgDto.getClientCode()).andNameEqualTo(orgDto.getName());
example.or().andClientCodeEqualTo(orgDto.getClientCode()).andCodeEqualTo(orgDto.getCode());
} else {
......@@ -2756,6 +2766,30 @@ public class OrganizationServiceImpl extends BaseService{
}
}
/**
* 19/02/2019 19:26
*
* [userId]
* @author Gary J Li
* @return
*/
public List<OrgSimpleDto> getOrgSimpleList() {
String userId = authUserHelper.getCurrentUserId();
List<OrgSimpleDto> orgSimpleDtos = Lists.newArrayList();
UserOrganizationExample userOrganizationExample = new UserOrganizationExample();
userOrganizationExample.createCriteria().andUserIdEqualTo(userId);
List<UserOrganization> userOrganizations = userOrganizationMapper.selectByExample(userOrganizationExample);
List<String> orgIds = userOrganizations.stream().map(UserOrganization::getOrganizationId).collect(Collectors.toList());
OrganizationExample organizationExample = new OrganizationExample();
organizationExample.createCriteria().andIdIn(orgIds);
List<Organization> organizations = organizationMapper.selectByExample(organizationExample);
organizations.forEach(o -> {
OrgSimpleDto orgSimpleDto = beanUtil.copyProperties(o,new OrgSimpleDto());
orgSimpleDtos.add(orgSimpleDto);
});
return orgSimpleDtos;
}
/**
* 修改自定义纬度的值
*/
......
atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrgSimpleDto.java 0 → 100644
View file @ 2caf2528
package pwc.taxtech.atms.dpo;
public class OrgSimpleDto {
private String id;
private String name;
private Boolean checked = false ;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Boolean getChecked() {
return checked;
}
public void setChecked(Boolean checked) {
this.checked = checked;
}
}
atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrganizationDto.java
View file @ 2caf2528
......@@ -651,6 +651,9 @@ public class OrganizationDto {
}
public Boolean getOversea() {
if(null == oversea){
return false;
}
return oversea;
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/OrganizationExtraMapper.xml
View file @ 2caf2528
......@@ -36,7 +36,7 @@
<result column="tax_agent" jdbcType="VARCHAR" property="taxAgent" />
<result column="tax_agent_contact" jdbcType="VARCHAR" property="taxAgentContact" />
<result column="other_facts" jdbcType="VARCHAR" property="otherFacts" />
<result column="tax_return_business_type" jdbcType="TINYINT" property="taxReturnBusinessType" />
<result column="tax_return_business_type" jdbcType="INTEGER" property="taxReturnBusinessType" />
<result column="small_meager_profit" jdbcType="BIT" property="smallMeagerProfit" />
<result column="listed_company" jdbcType="BIT" property="listedCompany" />
<result column="applicable_accounting_standards_or_accounting_systems" jdbcType="INTEGER" property="applicableAccountingStandardsOrAccountingSystems" />
......@@ -237,7 +237,7 @@
#{etaWebsite,jdbcType=VARCHAR}, #{signTripartiteAgreement,jdbcType=BIT}, #{reportingCurrency,jdbcType=VARCHAR},
#{consolidationTime,jdbcType=TIMESTAMP}, #{fiscalYearDeadline,jdbcType=TIMESTAMP},
#{taxAgent,jdbcType=VARCHAR}, #{taxAgentContact,jdbcType=VARCHAR}, #{otherFacts,jdbcType=VARCHAR},
#{taxReturnBusinessType,jdbcType=TINYINT}, #{smallMeagerProfit,jdbcType=BIT}, #{listedCompany,jdbcType=BIT},
#{taxReturnBusinessType,jdbcType=INTEGER}, #{smallMeagerProfit,jdbcType=BIT}, #{listedCompany,jdbcType=BIT},
#{applicableAccountingStandardsOrAccountingSystems,jdbcType=INTEGER}, #{taxPayerNumberVat,jdbcType=VARCHAR},
#{taxPayerNumberCit,jdbcType=VARCHAR}, #{taxClientPersonEmailAddress,jdbcType=VARCHAR},
#{bankAccountName,jdbcType=VARCHAR}, #{bankAccountNumber,jdbcType=VARCHAR}, #{legalPersonName,jdbcType=VARCHAR},
......@@ -514,7 +514,7 @@
#{otherFacts,jdbcType=VARCHAR},
</if>
<if test="taxReturnBusinessType != null">
#{taxReturnBusinessType,jdbcType=TINYINT},
#{taxReturnBusinessType,jdbcType=INTEGER},
</if>
<if test="smallMeagerProfit != null">
#{smallMeagerProfit,jdbcType=BIT},
......@@ -698,7 +698,7 @@
other_facts = #{record.otherFacts,jdbcType=VARCHAR},
</if>
<if test="record.taxReturnBusinessType != null">
tax_return_business_type = #{record.taxReturnBusinessType,jdbcType=TINYINT},
tax_return_business_type = #{record.taxReturnBusinessType,jdbcType=INTEGER},
</if>
<if test="record.smallMeagerProfit != null">
small_meager_profit = #{record.smallMeagerProfit,jdbcType=BIT},
......@@ -813,7 +813,7 @@
tax_agent = #{record.taxAgent,jdbcType=VARCHAR},
tax_agent_contact = #{record.taxAgentContact,jdbcType=VARCHAR},
other_facts = #{record.otherFacts,jdbcType=VARCHAR},
tax_return_business_type = #{record.taxReturnBusinessType,jdbcType=TINYINT},
tax_return_business_type = #{record.taxReturnBusinessType,jdbcType=INTEGER},
small_meager_profit = #{record.smallMeagerProfit,jdbcType=BIT},
listed_company = #{record.listedCompany,jdbcType=BIT},
applicable_accounting_standards_or_accounting_systems = #{record.applicableAccountingStandardsOrAccountingSystems,jdbcType=INTEGER},
......@@ -937,7 +937,7 @@
other_facts = #{otherFacts,jdbcType=VARCHAR},
</if>
<if test="taxReturnBusinessType != null">
tax_return_business_type = #{taxReturnBusinessType,jdbcType=TINYINT},
tax_return_business_type = #{taxReturnBusinessType,jdbcType=INTEGER},
</if>
<if test="smallMeagerProfit != null">
small_meager_profit = #{smallMeagerProfit,jdbcType=BIT},
......@@ -1049,7 +1049,7 @@
tax_agent = #{taxAgent,jdbcType=VARCHAR},
tax_agent_contact = #{taxAgentContact,jdbcType=VARCHAR},
other_facts = #{otherFacts,jdbcType=VARCHAR},
tax_return_business_type = #{taxReturnBusinessType,jdbcType=TINYINT},
tax_return_business_type = #{taxReturnBusinessType,jdbcType=INTEGER},
small_meager_profit = #{smallMeagerProfit,jdbcType=BIT},
listed_company = #{listedCompany,jdbcType=BIT},
applicable_accounting_standards_or_accounting_systems = #{applicableAccountingStandardsOrAccountingSystems,jdbcType=INTEGER},
......
atms-web/src/main/webapp/app-resources/i18n/en-us/vat.json
View file @ 2caf2528
......@@ -1829,11 +1829,12 @@
"EnterpriseAccountSetName": "Enterprise Account Set Name",
"EnterpriseAccountSetCurrency": "Enterprise Account Set Currency",
"IsAssociation": "Is Association",
"IsCloseAccount": "Is Close Account",
"ImportTime": "Import Time",
"DataImportLog": "Data Import Log",
"DataImportLogTitle": "Data Import Log",
"SelectedOrganization": "Selected Organization",
"~MustBeEndOneApp": "I Must be the End One, please!"
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/adminHomePage.json
View file @ 2caf2528
{
"WelcomeATMS-Longi":"欢迎使用Longi申报系统管理"
"WelcomeATMS-Longi":"欢迎使用ATMS申报系统管理"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json
View file @ 2caf2528
......@@ -2072,13 +2072,13 @@
"EnterpriseAccountSetName": "账套名称",
"EnterpriseAccountSetCurrency": "账套币种",
"IsAssociation": "是否关联",
"IsCloseAccount": "是否关账",
"ImportTime": "导入时间",
"DataImportLog": "数据导入记录",
"DataImportLogTitle": "数据导入记录",
"SelectedOrganization": "选择机构",
"~MustBeEndOneApp": "我必须是最后一个！"
}
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 2caf2528
......@@ -2148,6 +2148,7 @@
// 取消编辑机构其他信息
$scope.updateOrgExtraCancel = function () {
$scope.selectCompanyExtra=$scope.comExtraOldData;
generalSelectCompanyExtraText();
$('.extra-org-info .control-label span').removeAttr("hidden");
$('.extra-org-info .right-option .button2position').attr("hidden","hidden");
$('.extra-org-info .right-option .updOrgBtn').removeAttr("hidden");
......@@ -2174,6 +2175,7 @@
},
function (isConfirm) {
if (isConfirm) {
// 选中
updateOrgExtraInfo($scope.selectCompany.id);
}
......@@ -2194,13 +2196,29 @@
return;
}
$scope.selectCompanyExtra = data;
$scope.editOrgExtraModel = data;
$scope.editOrgExtraModel = angular.copy(data);
generalSelectCompanyExtraText();
$scope.updateOrgExtraCancel();
SweetAlert.success($translate.instant('OrganizationExtraInfoEditSuccess'));
});
});
};
var generalSelectCompanyExtraText = function(){
$scope.regFinancialAccountingTypeList.map(function(value,index){
if (value.code === $scope.selectCompanyExtra.regFinancialAccountingType) {
$scope.selectCompanyExtra.regFinancialAccountingType = value.type;
return;
}
});
$scope.selectCompanyExtra.smallMeagerProfit = $scope.selectCompanyExtra.smallMeagerProfit?"是":"否";
$scope.selectCompanyExtra.listedCompany = $scope.selectCompanyExtra.listedCompany?"是":"否";
$scope.selectCompanyExtra.signTripartiteAgreement =
$scope.selectCompanyExtra.signTripartiteAgreement?"是":"否";
$scope.selectCompanyExtra.completeRecordTotalInstitutions =
$scope.selectCompanyExtra.completeRecordTotalInstitutions?"是":"否";
};
// 添加或者编辑机构成功之后，刷新当前页面的数据
$scope.$watch('isOrgUpdate', function (newValue, oldValue) {
if (newValue) {
......@@ -2379,9 +2397,9 @@
orgService.getSingleOrgExtra(org.id).success(function (data) {
if(data){
$scope.selectCompanyExtra = data;
$scope.editOrgExtraModel = data;
$scope.editOrgExtraModel = angular.copy(data);
generalSelectCompanyExtraText();
}
//$log.debug("org.regionID: " + org.regionID);
});
getEquityListByOrgId(org.id);
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js
View file @ 2caf2528
......@@ -953,6 +953,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
// $('.local').removeAttr('hidden');
$scope.isLocal = true;
$scope.isInternational = false;
$('.localRequired').attr("required");
};
// 强制刷新机构控件里的机构
......
atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html
View file @ 2caf2528
......@@ -47,9 +47,9 @@
| translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.name.$invalid && (orgControlForm.name.$dirty || orgControlForm.$submitted)}">
<input class="form-control" id="name" ng-model="editOrgModel.name"
<input class="form-control localRequired" id="name" ng-model="editOrgModel.name"
name="name" placeholder="{{resources.OrganizationName}}"
ng-keyup="nameKeyUp()" maxlength="100" required>
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">
......@@ -79,7 +79,7 @@
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" name="clientCode" id="clientCode"
<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)"
......@@ -237,8 +237,7 @@
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="item for item in regStatusList">
<option value="">{{resources.RegStatus}}</option>
ng-options="x.type as x.type for x in regStatusList ">
</select>
<p ng-show="orgControlForm.regStatus.$error.required && (orgControlForm.regStatus.$dirty || orgControlForm.$submitted)"
class="has-error label">
......@@ -253,9 +252,9 @@
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" ng-disabled="!isAdd" id="code"
<input class="form-control localRequired" name="code" ng-disabled="!isAdd" id="code"
ng-model="editOrgModel.code"
placeholder="{{resources.OrganizationCode}}" required
placeholder="{{resources.OrganizationCode}}"
maxlength="50" ng-pattern="/^[A-Za-z0-9]+$/" code-unique>
<p ng-show="orgControlForm.code.$error.required && (orgControlForm.name.$dirty || orgControlForm.$submitted)"
class="has-error label">{{resources.OrganizationMsgCodeRequired}}</p>
......@@ -364,11 +363,11 @@
translate}}：</label>
<div class="col-sm-9"
ng-class="{'has-error':orgControlForm.selectProjectIndustry.$invalid && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)}">
<select class="form-control" id='selectProjectIndustry'
<select class="form-control localRequired" id='selectProjectIndustry'
ng-model="selectProjectIndustry"
ng-options="x.name for x in projectIndustryList"
name='selectProjectIndustry'
ng-change="ProjectIndustryChanged()" required>
ng-change="ProjectIndustryChanged()" >
<option value="">{{pleaseSelect}}</option>
</select>
<p ng-show="orgControlForm.selectProjectIndustry.$error.required && (orgControlForm.selectProjectIndustry.$dirty || orgControlForm.$submitted)"
......@@ -402,10 +401,10 @@
<div class="col-sm-9 row">
<div class="col-sm-6" style="padding-left: 0px;"
ng-class="{'has-error':orgControlForm.selectProvince.$invalid && (orgControlForm.selectProvince.$dirty || orgControlForm.$submitted)}">
<select class="form-control" name="selectProvince"
<select class="form-control localRequired" name="selectProvince"
style="width: 120px; " ng-change="populateCities()"
ng-model="selectProvince"
ng-options="x.regionName for x in ProvinceList" required>
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)"
......@@ -414,8 +413,8 @@
</div>
<div class="col-sm-6" style="padding-left: 2px;"
ng-class="{'has-error':orgControlForm.selectCity.$invalid && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)}">
<select class="form-control" name="selectCity" id="selectCity"
style="width: 120px; " ng-model="selectRegionID" required>
<select class="form-control localRequired" name="selectCity" id="selectCity"
style="width: 120px; " ng-model="selectRegionID" >
<option value="">{{pleaseSelect}}</option>
<option ng-repeat="x in CityList" value="{{x.regionID}}"
title="{{x.regionName}}">{{x.regionName |
......@@ -434,10 +433,9 @@
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" id='selectLevelType' name="selectLevelType"
<select class="form-control localRequired" id='selectLevelType' name="selectLevelType"
ng-model="selectLevelType"
ng-options="(x.name | limitString:25) for x in levelTypeList"
required>
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)"
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.ctrl.js
View file @ 2caf2528
commonModule.controller('importATController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService',
, 'projectService', 'vatCommonService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService) {
, projectService, vatCommonService , orgService) {
'use strict';
var successCount = 0;
......@@ -32,6 +32,9 @@
$scope.importEnum = { Import: 0, CoverImport: 1, AddImport: 2 }; //导入方式
$scope.selectedPeriod = null;
$scope.showTotalSecondRow = false;
$scope.checkedCompanyList = [];
$scope.companyList = [];
$scope.m = [];
$scope.importATExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/ATExcelFile';
......@@ -705,10 +708,13 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyList);
// var orgIds = $scope.checkedCompanyList;
Upload.upload({
url: $scope.importATExcelFile,
data: {
orgIds : orgIds,
periodDate : period,
importType : importType
},
......@@ -1037,56 +1043,6 @@
}
};
//显示期间选择弹出框
var showPeriodDrapDown = function () {
$scope.modalInstance = $uibModal.open({
animation: false,
ariaLabelledBy: 'modal-title',
ariaDescribedBy: 'modal-body',
templateUrl: 'tb-model-period-dropdown.html',
scope: $scope,
windowClass: "tb-model-period-dropdow-popup"
});
$scope.closePeriodSelectModal = function () {
$scope.modalInstance.dismiss('cancel');
};
$scope.selectBox = {
simple: {
dataSource: $scope.tbPeriods,
displayExpr: "Period",
valueExpr: "ID",
searchEnabled: false,
placeholder: $translate.instant('PleaseSelectPeriod'),
noDataText: $translate.instant('NoDataToDispaly'),
maxLength: 2,
onSelectionChanged: function (e) {
$scope.selectedPeriod = e.selectedItem.Period;
}
}
};
vatImportService.getTBImportedPeriods($scope.projectID, $scope.serviceTypeId).success(function (data) {
if (data) {
$scope.tbPeriods = [];
var id = 1;
$.each(data, function (index, item) {
var periodDto = { ID: -1, Period: -1 };
periodDto.ID = id++;
periodDto.Period = item;
$scope.tbPeriods.push(periodDto);
});
$("#tbPeriodSelectBox").dxSelectBox("instance").option("dataSource", $scope.tbPeriods);
}
}).error(function () {
SweetAlert.error($translate.instant('PleaseContactAdministrator'));
});
};
var setGridStyle = function () {
if ($scope.showTotalSecondRow) {
return { 'margin-top': '60px' }
......@@ -1202,6 +1158,50 @@
ele1.datepicker("setDate", $scope.selectedDate);
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
$scope.selectOne = function () {
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i.id);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
if ($scope.companyList.length === $scope.checkedCompanyList.length) {
$scope.selectedAll = true;
} else {
$scope.selectedAll = false;
}
console.log($scope.checkedCompanyList);
};
$scope.selectAll = function () {
if($scope.selectedAll) {
$scope.selectedOne = true;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
$scope.checkedCompanyList.push(i.id);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
console.log($scope.checkedCompanyList);
};
//开始
(function initialize() {
$log.debug('ImportTBController.ctor()...');
......@@ -1219,6 +1219,7 @@
$scope.setGridStyle = setGridStyle;
getUserPermission();
initCompanyList();
loadImportATStatusInfoDatagrid();
initDatePicker();
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.html
View file @ 2caf2528
......@@ -11,6 +11,29 @@
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="import-wrapper">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
{{'PleaseSelect' | translate}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in companyList">
<div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.name}}</span>
</div>
</li>
</ul>
</div>
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
......
atms-web/src/main/webapp/app/common/controls/import/import-adjust-table/import-adjust-table.less
View file @ 2caf2528
......@@ -117,6 +117,64 @@
font-weight: bold;
}
.checkbox-custom {
float: left;
position: relative;
margin-top: 0;
display: inline-block;
}
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
.checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
}
.period-picker {
width: 150px;
border: 1px solid #c7c5c0;
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js
View file @ 2caf2528
......@@ -672,7 +672,6 @@
//导入事件
var doUploadPL = function (importType) {
debugger;
var impExl = $scope.importExcelFile;
var deferred = $q.defer();
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js
View file @ 2caf2528
commonModule.controller('importCPRController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService',
, 'projectService', 'vatCommonService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService) {
, projectService, vatCommonService,orgService) {
'use strict';
var successCount = 0;
......@@ -33,6 +33,10 @@
$scope.selectedPeriod = null;
$scope.showTotalSecondRow = false;
$scope.checkedCompanyList = [];
$scope.companyList = [];
$scope.m = [];
$scope.importCPRExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/CPRExcelFile';
......@@ -702,10 +706,12 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyList);
Upload.upload({
url: $scope.importCPRExcelFile,
data: {
orgIds : orgIds,
periodDate : period,
importType : importType
},
......@@ -1198,6 +1204,50 @@
ele1.datepicker("setDate", $scope.selectedDate);
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
$scope.selectOne = function () {
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i.id);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
if ($scope.companyList.length === $scope.checkedCompanyList.length) {
$scope.selectedAll = true;
} else {
$scope.selectedAll = false;
}
console.log($scope.checkedCompanyList);
};
$scope.selectAll = function () {
if($scope.selectedAll) {
$scope.selectedOne = true;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
$scope.checkedCompanyList.push(i.id);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
console.log($scope.checkedCompanyList);
};
//开始
(function initialize() {
$log.debug('ImportTBController.ctor()...');
......@@ -1216,6 +1266,8 @@
getUserPermission();
initCompanyList();
loadImportCPRStatusInfoDatagrid();
initDatePicker();
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.html
View file @ 2caf2528
......@@ -11,6 +11,29 @@
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="import-wrapper">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
{{'PleaseSelect' | translate}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in companyList">
<div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.name}}</span>
</div>
</li>
</ul>
</div>
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
......
atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.less
View file @ 2caf2528
......@@ -117,6 +117,64 @@
font-weight: bold;
}
.checkbox-custom {
float: left;
position: relative;
margin-top: 0;
display: inline-block;
}
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
.checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
}
.period-picker {
width: 150px;
border: 1px solid #c7c5c0;
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js
View file @ 2caf2528
commonModule.controller('importRLITController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService',
, 'projectService', 'vatCommonService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService) {
, projectService, vatCommonService,orgService) {
'use strict';
var successCount = 0;
......@@ -33,6 +33,10 @@
$scope.selectedPeriod = null;
$scope.showTotalSecondRow = false;
$scope.checkedCompanyList = [];
$scope.companyList = [];
$scope.m = [];
$scope.importRLITExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/RLITExcelFile';
......@@ -705,10 +709,12 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyList);
Upload.upload({
url: $scope.importRLITExcelFile,
data: {
orgIds: orgIds,
periodDate : period,
importType : importType
},
......@@ -1202,6 +1208,50 @@
ele1.datepicker("setDate", $scope.selectedDate);
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
$scope.selectOne = function () {
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i.id);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
if ($scope.companyList.length === $scope.checkedCompanyList.length) {
$scope.selectedAll = true;
} else {
$scope.selectedAll = false;
}
console.log($scope.checkedCompanyList);
};
$scope.selectAll = function () {
if($scope.selectedAll) {
$scope.selectedOne = true;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
$scope.checkedCompanyList.push(i.id);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
console.log($scope.checkedCompanyList);
};
//开始
(function initialize() {
$log.debug('ImportTBController.ctor()...');
......@@ -1219,6 +1269,7 @@
$scope.setGridStyle = setGridStyle;
getUserPermission();
initCompanyList();
loadImportRLITStatusInfoDatagrid();
initDatePicker();
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.html
View file @ 2caf2528
......@@ -11,6 +11,29 @@
<form class="form-inline" id="navigationForm" name="navigationForm">
<div class="form-group" ng-style="setButtonWrapStyle()">
<div class="import-wrapper">
<span class="text-bold" translate="SelectedOrganization"></span>:
<div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 250px;">
{{'PleaseSelect' | translate}}
<span class="caret" style="float: right "></span>
</button>
<ul class="dropdown-menu" style="width: 250px;" aria-labelledby="dropdownMenu1">
<li><input type="checkbox" ng-model="selectedAll" ng-change="selectAll()"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px" checked>
<span style="margin-left:5px;float: left;">全选</span></li>
<li role="separator" class="divider" style="height: 1px;margin: 9px 0;
overflow: hidden;background-color: #e5e5e5;"></li>
<li ng-repeat="i in companyList">
<div class="checkbox-custom checkbox-default">
<input type="checkbox" ng-model="i.checked" ng-change="selectOne()"
ng-checked="selectedOne"
style="float: left;margin-left: 10px; margin-top: 7px; width: 15px">
<span style="margin-left:5px;">{{i.name}}</span>
</div>
</li>
</ul>
</div>
<span class="text-bold" translate="InvoiceQJ"></span>:
<div class="period-picker" style="margin-left:10px">
<input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
......
atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.less
View file @ 2caf2528
......@@ -117,6 +117,64 @@
font-weight: bold;
}
.checkbox-custom {
float: left;
position: relative;
margin-top: 0;
display: inline-block;
}
.divider{
height: 1px;
margin: 9px 0;
overflow: hidden;
background-color: #e5e5e5;
}
.checkbox-custom input[type="checkbox"] {
cursor: pointer;
z-index: 2;
margin: -6px 0 0 0;
top: 50%;
left: 3px;
}
.checkbox-custom label:before {
content: '';
position: absolute;
top: 50%;
left: 0;
margin-top: -9px;
width: 19px;
height: 18px;
display: inline-block;
border-radius: 2px;
border: 1px solid #bbb;
background: #fff;
}
.checkbox-custom input[type="checkbox"]:checked +label:after {
position: absolute;
display: inline-block;
font-family: 'Glyphicons Halflings';
content: "\e013";
top: 42%;
left: 3px;
margin-top: -5px;
font-size: 11px;
line-height: 1;
width: 16px;
height: 16px;
color: #333;
}
.checkbox-custom label {
cursor: pointer;
line-height: 1.2;
font-weight: normal;
margin-bottom: 0;
text-align: left;
}
.period-picker {
width: 150px;
border: 1px solid #c7c5c0;
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 2caf2528
......@@ -1351,13 +1351,17 @@ constant.TaxpayerQualificationTypeList = [
{code:1,type:"小规模纳税人"}
];
constant.RegStatusList = ["存续","存续中","已注销"];
constant.RegStatusList = [
{code:0,type:"存续"},
{code:1,type:"存续中"},
{code:2,type:"已注销"}
];
constant.ArchitectureTypeList = ["DE","WFOE","VIE","JV","有限合伙","Branch","其他"];
constant.trueFalse = [
{code:0,type:"否"},
{code:1,type:"是"}
{code:false,type:"否"},
{code:true,type:"是"}
];
constant.TaxReturnBusinessTypeList = [
{code:100,type:"非跨地区经营企业"},
......@@ -1369,8 +1373,8 @@ constant.TaxReturnBusinessTypeList = [
];
constant.RegFinancialAccountingTypeList = [
{code:0,type:"非独立核算"},
{code:1,type:"独立核算"}
{code:false,type:"非独立核算"},
{code:true,type:"独立核算"}
];
constant.ApplicableAccountingRuleList = [
......
atms-web/src/main/webapp/app/common/webservices/organization.svc.js
View file @ 2caf2528
......@@ -110,6 +110,9 @@ webservices.factory('orgService', ['$http', 'apiConfig', function ($http, apiCon
getOrgInfoList: function () {
return $http.get('/org/getOrgInfoList', apiConfig.create());
},
getOrgListByUserId: function (userId) {
return $http.get('/org/getOrgListByUserId?userId=' + userId, apiConfig.create());
},
updateOrgToDimension: function (dimensionValueID, parentDimensionID, orgList) {
return $http.post('/org/updateOrgToDimension', { dimensionValueID: dimensionValueID, dimensionID: parentDimensionID, orgDtoList: orgList }, apiConfig.create());
},
......
atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.html
View file @ 2caf2528
<div id="app-data-import" class="app-data-import ">
<nav class="navbar navbar-custom" role="navigation"
style="margin-bottom: 0; background-image:url(../../../app-resources/images/leftbarbg.png); height:100%;width: 260px">
style="margin-bottom: 0; border-radius: 0px; background-image:url(../../../app-resources/images/leftbarbg.png); height:100%;width: 260px">
<div class="sidebar navbarfix" role="navigation">
<div class="sidebar-nav navbar-collapse" id="sidebar-area" style="height:100%;width: 260px">
<div class="app-data-import-side-bar" style="height: 100%">
......
atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.js
View file @ 2caf2528
......@@ -11,7 +11,10 @@
},
controller: 'appDataImportController',
link: function (scope, element, attr) {
$('.main-contents')[0].style.width = "260px";
$('.main-contents')[0].style.float = "left";
$('.main-contents')[0].style.styleFloat = "left";
$('.main-contents')[0].style.cssFloat = "left";
scope.isMenuClosed = false;
var superiorMenuActiveClass = 'superior-menu-active';
//Top Toggler
......
atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.less
View file @ 2caf2528
......@@ -85,7 +85,7 @@
}
.app-data-import {
height: 100%;
height: 101%;
width: 100%;
background-color: #ffffff;
//padding: 0px 15% 0px 5%;
......
atms-web/src/main/webapp/app/framework/app-side-bar/app-side-bar.html
View file @ 2caf2528
......@@ -17,7 +17,7 @@
wheel-propagation="true"
wheel-speed="1"
min-scrollbar-length="20"
style="position: relative;height: calc(100% - 250px)!important;margin-top:15px;">
style="overflow-y: hidden;position: relative;height: calc(100% - 250px)!important;margin-top:15px;">
<ul class="nav" id="sidebar">
<li ng-repeat="menuItem in menuData" ng-include="'menuTree'">
</li>
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.ctrl.js
View file @ 2caf2528
vatModule.controller('VatPreviewJournalController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
vatModule.controller('VatPreviewJournalController', ['$rootScope','$scope', '$log', '$filter','$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
......@@ -77,6 +77,10 @@
$scope.gridOptions.data = data.list;
$scope.queryJournalEntryResult.pageInfo = data;
computeJournalEntryPage();
$scope.ledgerName = data.list[0].ledgerName;
$scope.currencyCode = data.list[0].currencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
}
});
};
......@@ -364,8 +368,12 @@
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.orgId = vatSessionService.project.organizationID;
if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
$('.periodInput')[0].style.left = "280px";
}else{
$('.periodInput')[0].style.left = "150px";
}
loadJournalEntryDataFromDB(1);
})();
}
]);
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.html
View file @ 2caf2528
......@@ -9,15 +9,16 @@
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
<input type="text" class="form-control input-width-middle" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
<span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
<!--<div style="margin-bottom: 8px;margin-left: 30px">
&nbsp;单体/合并<span class="numAmount">{{totalMoneyAmount}}</span>&nbsp;&nbsp;&nbsp;
账套<span class="numAmount">{{totalTaxAmount}}</span>&nbsp;&nbsp;&nbsp;
币种<span class="numAmount">{{totalTaxAmount}}</span>
</div>-->
<div style="margin-bottom: 8px;margin-left: 30px">
{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
</div>
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.ctrl.js
View file @ 2caf2528
vatModule.controller('VatPreviewOffBalanceSheetController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
vatModule.controller('VatPreviewOffBalanceSheetController', ['$rootScope','$scope', '$log','$filter', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
......@@ -98,6 +98,10 @@
$scope.gridOptions.data = data.list;
$scope.queryBalanceSheetResult.pageInfo = data;
computeBalanceSheetPage();
$scope.ledgerName = data.list[0].ledgerName;
$scope.currencyCode = data.list[0].ledgerCurrencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
}
});
};
......@@ -548,6 +552,11 @@
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.orgId = vatSessionService.project.organizationID;
if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
$('.periodInput')[0].style.left = "260px";
}else{
$('.periodInput')[0].style.left = "150px";
}
loadBalanceSheetDataFromDB(1);
})();
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.html
View file @ 2caf2528
<div class="vat-preview-off-balance-sheet" id="mainPreviewDiv">
<div class="top-area-wrapper" style="margin-top: 10px">
<div class="top-area-wrapper" style="margin-top: 30px">
<!--<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
......@@ -9,15 +9,16 @@
<i class="fa fa-filter" aria-hidden="true"></i>
</button>-->
<span translate="OffBalanceSheetTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
<input type="text" class="form-control input-width-middle" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
<span ng-click="downloadBS()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
<!--<div style="margin-bottom: 8px;margin-left: 30px">
&nbsp;单体/合并<span class="numAmount">{{totalMoneyAmount}}</span>&nbsp;&nbsp;&nbsp;
账套<span class="numAmount">{{totalTaxAmount}}</span>&nbsp;&nbsp;&nbsp;
币种<span class="numAmount">{{totalTaxAmount}}</span>
</div>-->
<div style="margin-bottom: 8px;margin-left: 30px">
{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
</div>
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.less
View file @ 2caf2528
......@@ -20,7 +20,7 @@
}
.top-area-wrapper {
height: 60px;
height: 45px;
width: 98%;
margin: 0 20px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.ctrl.js
View file @ 2caf2528
vatModule.controller('VatPreviewProfitLossController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
vatModule.controller('VatPreviewProfitLossController', ['$rootScope','$scope', '$log','$filter', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope,$scope, $log,$filter, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
......@@ -97,6 +97,10 @@
$scope.gridOptions.data = data.list;
$scope.queryProfitLossResult.pageInfo = data;
computeProfitLossPage();
$scope.ledgerName = data.list[0].ledgerName;
$scope.currencyCode = data.list[0].ledgerCurrencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
}
});
};
......@@ -566,6 +570,11 @@
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.orgId = vatSessionService.project.organizationID;
if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
$('.periodInput')[0].style.left = "250px";
}else{
$('.periodInput')[0].style.left = "120px";
}
loadProfitLossDataFromDB(1);
})();
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.html
View file @ 2caf2528
<div class="vat-preview-profit-loss" id="mainPreviewDiv">
<div class="top-area-wrapper" style="margin-top: 10px">
<div class="top-area-wrapper" style="margin-top: 30px">
<!--<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
......@@ -9,15 +9,17 @@
<i class="fa fa-filter" aria-hidden="true"></i>
</button>-->
<span translate="ProfitLossTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
<input type="text" class="form-control input-width-middle" style="position: relative; top: -30px; left: 130px;" id="input-invoice-period-picker" />
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 130px;" id="input-invoice-period-picker" />
<span ng-click="downloadPL()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
<!--<div style="margin-bottom: 8px;margin-left: 30px">
<span class="text-bold">&nbsp;&nbsp;&nbsp;合&nbsp;计&nbsp;：</span>&nbsp;
金额<span class="numAmount">{{totalMoneyAmount}}</span>&nbsp;&nbsp;&nbsp;
税额<span class="numAmount">{{totalTaxAmount}}</span>
</div>-->
<div style="margin-bottom: 8px;margin-left: 30px">
{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
</div>
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
<span class="text-bold margin-left20" translate="FilterCriteriaTags"></span>:
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss/vat-preview-profit-loss.less
View file @ 2caf2528
......@@ -20,7 +20,7 @@
}
.top-area-wrapper {
height: 60px;
height: 45px;
width: 98%;
margin: 0 20px;
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js
View file @ 2caf2528
vatModule.controller('VatPreviewTrialBalanceController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
vatModule.controller('VatPreviewTrialBalanceController', ['$rootScope','$scope','$filter','$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($rootScope,$scope,$filter, $log,$translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
......@@ -77,6 +77,10 @@
$scope.gridOptions.data = data.list;
$scope.queryTrialBalanceResult.pageInfo = data;
computeTrialBalancePage();
$scope.ledgerName = data.list[0].ledgerName;
$scope.currencyCode = data.list[0].currencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
}
});
};
......@@ -342,10 +346,13 @@
//初始化查询条件-期间范围
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + vatSessionService.month;
if($rootScope.currentLanguageDesc = $rootScope.currentLanguage === 'en-us'){
$('.periodInput')[0].style.left = "280px";
}else{
$('.periodInput')[0].style.left = "180px";
}
$scope.queryParams.orgId = vatSessionService.project.organizationID;
loadTrialBalanceDataFromDB(1);
})();
}
]);
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.html
View file @ 2caf2528
......@@ -9,15 +9,15 @@
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="TrialBalanceDDTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
<input type="text" class="form-control input-width-middle" style="position: relative; top: -30px; left: 180px;" id="input-trial-balance-period-picker" />
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 280px;" id="input-trial-balance-period-picker" />
<span ng-click="downloadTB()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
</div>
<div style="margin-bottom: 8px;margin-left: 30px">
{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{totalMoneyAmount}}</span>&nbsp;&nbsp;&nbsp;
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{totalTaxAmount}}</span>&nbsp;&nbsp;&nbsp;
{{'IsAssociation' | translate}}<span class="numAmount">{{totalTaxAmount}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{totalTaxAmount}}</span>
{{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
{{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
{{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
{{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
</div>
<div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
......
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