Skip to content

T
traffic-front
Commit b5602edb authored by zhkwei's avatar zhkwei
Browse files
Options

Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql 

# Conflicts:
#	atms-web/src/main/webapp/app/common/utils/constant.js
parents 017b4e17 81d221b7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1163 additions and 45 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java
View file @ b5602edb
......@@ -5,6 +5,8 @@ public class ErrorMessage {
public static final String SaveFileError = "SaveFileError";
public static final String SystemError = "SystemError";
public static final String NoFile = "NoFile";
public static final String DidntSelectedCompany = "Didn't Selected Company";
public static final String DidntSelectedPeriod = "Didn't Selected period";
public static final String NoSelectSheet = "NoSelectSheet";
public static final String DIDNOTSELECTPERIOD = "You should select period!";
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ b5602edb
......@@ -218,7 +218,7 @@ public class DataImportService extends BaseService {
* 1、存在非选择期间数据
* 2、未映射到主体
*/
public OperationResultDto importPLExcelFile(MultipartFile file, String periodDate, Integer importType) throws ServiceException {
public OperationResultDto importPLExcelFile(MultipartFile file,List<String> orgIds, String periodDate, Integer importType) throws ServiceException {
try {
InputStream inputStream = file.getInputStream();
Workbook workbook = WorkbookFactory.create(inputStream);
......@@ -259,6 +259,12 @@ public class DataImportService extends BaseService {
dataImportLogs.add(dataImportLog);
continue;
}
if (!orgIds.contains(orgId)) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.DoNotSelectCompany);
dataImportLogs.add(dataImportLog);
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
......@@ -372,7 +378,7 @@ public class DataImportService extends BaseService {
* 2、未映射到主体
* @author Gary J Li
*/
public OperationResultDto importBSExcelFile(MultipartFile file, String periodDate, Integer importType) throws ServiceException {
public OperationResultDto importBSExcelFile(MultipartFile file,List<String> orgIds, String periodDate, Integer importType) throws ServiceException {
try {
InputStream inputStream = file.getInputStream();
Workbook workbook = WorkbookFactory.create(inputStream);
......@@ -414,6 +420,13 @@ public class DataImportService extends BaseService {
dataImportLogs.add(dataImportLog);
continue;
}
if (!orgIds.contains(orgId)) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.DoNotSelectCompany);
dataImportLogs.add(dataImportLog);
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
......@@ -501,7 +514,7 @@ public class DataImportService extends BaseService {
* @author Gary J Li
* @return
*/
public OperationResultDto importCFExcelFile(MultipartFile file, String periodDate, Integer importType) throws ServiceException {
public OperationResultDto importCFExcelFile(MultipartFile file,List<String> orgIds, String periodDate, Integer importType) throws ServiceException {
try {
InputStream inputStream = file.getInputStream();
Workbook workbook = WorkbookFactory.create(inputStream);
......@@ -544,6 +557,12 @@ public class DataImportService extends BaseService {
dataImportLogs.add(dataImportLog);
continue;
}
if (!orgIds.contains(orgId)) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.DoNotSelectCompany);
dataImportLogs.add(dataImportLog);
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
......@@ -628,7 +647,7 @@ public class DataImportService extends BaseService {
* @author Gary J Li
* @return OperationResultDto
*/
public OperationResultDto importIDExcelFile(MultipartFile file, String periodDate, Integer importType) throws ServiceException{
public OperationResultDto importIDExcelFile(MultipartFile file,List<String> orgIds ,String periodDate, Integer importType) throws ServiceException{
try {
InputStream inputStream = file.getInputStream();
Workbook workbook = WorkbookFactory.create(inputStream);
......@@ -674,6 +693,12 @@ public class DataImportService extends BaseService {
dataImportLogs.add(dataImportLog);
continue;
}
if (!orgIds.contains(orgId)) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.DoNotSelectCompany);
dataImportLogs.add(dataImportLog);
continue;
}
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period / 1000 != 13 && tmsPeriod != 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) {
......@@ -1095,7 +1120,7 @@ public class DataImportService extends BaseService {
* @author Gary J Li
* @return
*/
public OperationResultDto importCILExcelFile(MultipartFile file, String periodDate, Integer importType) throws ServiceException {
public OperationResultDto importCILExcelFile(MultipartFile file,List<String> orgIds, String periodDate, Integer importType) throws ServiceException {
try {
InputStream inputStream = file.getInputStream();
......@@ -1136,6 +1161,12 @@ public class DataImportService extends BaseService {
dataImportLogs.add(dataImportLog);
continue;
}
if (!orgIds.contains(orgId)) {
dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.DoNotSelectCompany);
dataImportLogs.add(dataImportLog);
continue;
}
String companyName = organizations.get(0).getName();
dataImportLog.setCompanyName(companyName);
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
......
atms-api/src/test/java/pwc/taxtech/atms/service/impl/DataInitTest.java
View file @ b5602edb
......@@ -68,8 +68,8 @@ public class DataInitTest extends CommonIT {
JSONObject object = JSONObject.parseObject(input);
Map<String, Object> orgs = object.getInnerMap();
Map<String, Object> failList = new HashMap<>();
StringBuilder failMsg = new StringBuilder();
orgs.forEach((orgK, orgV) -> {
try {
......@@ -317,17 +317,19 @@ public class DataInitTest extends CommonIT {
if (organizationExtraMapper.insertSelective(orgEx) < 0) {
failList.putIfAbsent(orgK, orgV);
}
if (orgEmp.getEmployeesNumEnd() > 0 && organizationEmployeeMapper.insertSelective(orgEmp) < 0) {
if (organizationEmployeeMapper.insertSelective(orgEmp) < 0) {
failList.putIfAbsent(orgK, orgV);
}
}
});
} catch (Exception e) {
failMsg.append(e.getMessage()+"\n");
failList.putIfAbsent(orgK, orgV);
}
});
String failedStr = JSON.toJSONString(failList);
FileWriter writer;
FileWriter writer1;
try {
writer = new FileWriter("C:\\Users\\Gary J Li\\Documents\\PwcDoc\\DD2018\\admin文档\\初始化\\company_info_failed.json");
writer.write(failedStr);
......@@ -336,6 +338,14 @@ public class DataInitTest extends CommonIT {
} catch (IOException e) {
e.printStackTrace();
}
try {
writer1 = new FileWriter("C:\\Users\\Gary J Li\\Documents\\PwcDoc\\DD2018\\admin文档\\初始化\\company_info_msg.txt");
writer1.write(failMsg.toString());
writer1.flush();
writer1.close();
} catch (IOException e) {
e.printStackTrace();
}
System.out.println(String.format("失败条数[%s]", failList.size()));
}
......
atms-dao/etc/db_sql/tax_admin_didi20190227.sql 0 → 100644
View file @ b5602edb
This diff is collapsed.
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ b5602edb
......@@ -2234,6 +2234,15 @@
if($scope.selectCompany.engageNationalProhibitIndustry!=null){
$scope.selectCompany.engageNationalProhibitIndustry = $scope.selectCompany.engageNationalProhibitIndustry?"是":"否";
}
if($scope.selectCompany.nationalEconomicIndustry!=null){
$scope.nationalEconomicIndustryList.map(function(value,index){
if (value.code === $scope.selectCompany.nationalEconomicIndustry) {
$scope.selectCompany.nationalEconomicIndustry = value.code+"-"+value.type;
return;
}
});
}
};
// 添加或者编辑机构成功之后，刷新当前页面的数据
......@@ -3156,6 +3165,7 @@
$scope.taxReturnBusinessTypeList = constant.TaxReturnBusinessTypeList;
$scope.trueFalse = constant.trueFalse;
$scope.regFinancialAccountingTypeList = constant.RegFinancialAccountingTypeList;
$scope.nationalEconomicIndustryList = constant.NationalEconomicIndustryList;
$scope.applicableAccountingRuleList = constant.ApplicableAccountingRuleList;
$scope.regStatusList = constant.RegStatusList;
$scope.lowValueConsumablesAmortizationMethodList = constant.LowValueConsumablesAmortizationMethodList;
......
atms-web/src/main/webapp/app/common/controls/check-list/check-list-filled-tooltip.html 0 → 100644
View file @ b5602edb
<div class="title-container">
<!-- 暂时只测试实现"尚有待填报项"提示 -->
<span><span ng-bind="尚有待填报项"></span>(<span ng-bind="item.cellAlerts[1].length"></span>)</span>
</div>
<div class="tooltip-list-container">
<div class="tooltip-item" ng-repeat="tooltipItem in item.cellAlerts[1]">
<p>{{tooltipItem.cell + " : " +tooltipItem.alert}}</p>
</div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/check-list/check-list-model-analysis-modal.html 0 → 100644
View file @ b5602edb
<div class="modal-header">
<div class="modal-title flex-row-start-center">
<span ng-bind="modelExcptionModal.title" class="flex-1-1-auto"></span>
<div class="data-count flex-0-0-auto flex-row-start-center">
<span class="flex-row-start-center">
<i class="fa fa-exclamation-circle"></i>
异常综述:
<span ng-bind="modelExcptionModal.dataSource.length" style="color: #B83000;"></span>
</span>
<span class="flex-row-start-center">
已处理:
<span ng-bind="(modelExcptionModal.dataSource | filter:{handled:true}).length"></span>
</span>
<button type="button" class="btn close " ng-click="modelExcptionModal.close()">
<span aria-hidden="true">&times;</span>
</button>
</div>
</div>
</div>
<div class="modal-body">
<div dx-data-grid="modelExcptionModal.dxDataGridOptions"></div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/check-list/check-list-report-comments-modal.html 0 → 100644
View file @ b5602edb
<div class="modal-header">
<div class="modal-title">
<span class="flex-1-1-auto">备注</span>
<button type="button" class="btn close " ng-click="reportCommentsModal.close()">
<span aria-hidden="true">&times;</span>
</button>
</div>
</div>
<div class="modal-body">
<div dx-data-grid="reportCommentsModal.dxDataGridOptions"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" ng-click="reportCommentsModal.popEditForm()" style="float:left;">添加
</button>
<button type="button" class="btn btn-primary" ng-click="reportCommentsModal.close()">确定</button>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/check-list/check-list-risk-warning-modal.html 0 → 100644
View file @ b5602edb
<div class="modal-header">
<div class="modal-title">
<span ng-bind="modelExcptionModal.title" class="flex-1-1-auto"></span>
<button type="button" class="btn close " ng-click="modelExcptionModal.close()">
<span aria-hidden="true">&times;</span>
</button>
</div>
</div>
<div class="modal-body">
<div dx-data-grid="modelExcptionModal.dxDataGridOptions"></div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/check-list/check-list.html 0 → 100644
View file @ b5602edb
<div class="modal-header">
<div class="modal-title">
<span ng-bind="modalTitel"></span>
<button type="button" class="btn close " aria-label="Close" aria-hidden="true" ng-click="close()">
<span aria-hidden="true">&times;</span>
</button>
</div>
</div>
<div class="modal-body">
<div class="summary flex-row-start-stretch">
<div>
<button ng-click="filter($event,null)" class="activated">{{'CheckListOTAll' | translate}}</button>
<span class="badge"
ng-bind="listDataSource.length"
ng-style="{'background-color':stagesColors['1'].color}">
</span>
</div>
<div>
<button ng-click="filter($event,'5')">{{'CheckListOTCompleted' | translate}}</button>
<span class="badge"
ng-bind="(listDataSource | filter:{reportStatus:'5'}).length"
ng-style="{'background-color':stagesColors['1'].color}">
</span>
</div>
<div>
<button ng-click="filter($event,'4')">{{'CheckListOTSubmitted' | translate}}</button>
<span class="badge"
ng-bind="(listDataSource | filter:{reportStatus:'4'}).length"
ng-style="{'background-color':stagesColors['1'].color}">
</span>
</div>
<div>
<button ng-click="filter($event,'3')">{{'CheckListOTDraft' | translate}}</button>
<span class="badge"
ng-bind="(listDataSource | filter:{reportStatus:'3'}).length"
ng-style="{'background-color':stagesColors['1'].color}">
</span>
</div>
<div>
<button ng-click="filter($event,'2')">{{'CheckListOTBlank' | translate}}</button>
<span class="badge"
ng-bind="(listDataSource | filter:{reportStatus:'2'}).length"
ng-style="{'background-color':stagesColors['1'].color}">
</span>
</div>
<div>
<button ng-click="filter($event,'1')">{{'CheckListOTNotRequired' | translate}}</button>
<span class="badge"
ng-bind="(listDataSource | filter:{reportStatus:'1'}).length"
ng-style="{'background-color':stagesColors['1'].color}">
</span>
</div>
<div class="search-for-text flex-1-1-auto">
<input type="text" style="width: calc(100% - 40px);">
<button class="fa fa-search font-color-gray" type="button"></button>
</div>
</div>
<div class="sheet-list">
<div class="list-header">
<div class="sequence-error" style="text-align: left;">{{'CheckListFNException' | translate}}</div>
<div class="sheet-name" style="text-align: left;">{{'CheckListFNFormName' | translate}}</div>
<div class="report-status">{{'CheckListFNStatus' | translate}}</div>
<div class="operations">{{'CheckListFNAction' | translate}}</div>
<div class="comments">{{'CheckListFNRemark' | translate}}</div>
<div class="update-operator" style="text-align: left;">{{'CheckListFNLastUpdatedBy' | translate}}</div>
</div>
<div class="list-body">
<div ng-repeat="item in sheetList track by item.reportCode" class="list-item">
<div class="sequence-error">
<i class="fa fa-question-circle"
ng-if="false && item.hasError" title="预警详情"
ng-click="modelExceptionModal.open(item)"></i>
<i class="fa fa-exclamation-circle" title="模型异常"
ng-if="item.hasError && !item.hasErrorFixed"
ng-click="modelExceptionModal.open(item)"></i>
<i class="fa fa-check-circle" title="异常模型已处理"
ng-if="item.hasError && item.hasErrorFixed"
ng-click="modelExceptionModal.open(item)"></i>
<span ng-bind="$index + 1" class="flex-0-0-auto"></span>
</div>
<div class="sheet-name limit-length-ellipsis">
<span title="{{item.reportDisplayName}}}" ng-bind="item.reportDisplayName"></span>
</div>
<div class="report-status">
<div class="icon-container">
<i class="fa" ng-class="item.statusIcon" ng-style="item.statusColor"></i>
</div>
<span ng-bind="item.statusText"></span>
<span class="badge" ng-if="item.reportStatus == '3' && item.alertNumber > 0"
ng-bind="item.alertNumber"
uib-tooltip-template="'/app/common/controls/check-list/check-list-filled-tooltip.html'"
tooltip-placement="bottom"
tooltip-class="check-list-filled-tooltip">
</span>
</div>
<div class="operations">
<div ng-if="item.reportStatus == '4'">
<button style="border-color: limegreen;color: limegreen;" class="flex-0-0-auto">
<i class="fa fa-check"></i>
<span>{{'CheckListOPApprove' | translate}}</span>
</button>
<button style="border-color: #cc0000;color: #cc0000;" class="flex-0-0-auto">
<i class="fa fa-close"></i>
<span>{{'CheckListOPReject' | translate}}</span>
</button>
</div>
</div>
<div class="comments">
<span ng-click="reportCommentsModal.open(item)" style="cursor: pointer;">
<i class="fa fa-pencil"></i>
<span class="">（<span ng-bind="item.reportComments.length"></span>）</span>
</span>
</div>
<div class="update-operator">
<div class="last-update flex-row-start-center font-color-gray" ng-if="item.lastModifiedTime">
<span ng-bind="item.lastModifiedTime | date:'yyyy-MM-dd HH:mm'"></span>
<div ng-if="item.lastModifiedBy" class="flex-row-start-center font-color-gray limit-length-ellipsis">
<div class="fa-container">
<i class="fa fa-user-circle-o"></i>
</div>
<span title="{{item.lastModifiedBy}}" ng-bind="item.lastModifiedBy"></span>
</div>
</div>
<div ng-if="!item.lastModifiedTime && !item.lastModifiedBy" style="text-align: center;width: 100%;">
<span>无</span>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/check-list/check-list.js 0 → 100644
View file @ b5602edb
commonModule.directive('reportCheckListModal', ['$log', function ($log) {
'use strict';
return {
restrict: 'A',
replace: false,
controller: 'reportCheckListModalController',
scope:
{
modalTitel: '=',
listDataSource: '=',
isOpen: '='
}
};
}
]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/check-list/check-list.less 0 → 100644
View file @ b5602edb

.report-check-list-modal .modal-dialog {
width: 1180px;
background-color: white;
font-size: 14px;
.modal-content {
border: none;
.modal-header {
border-bottom: none;
padding-bottom: 5px;
background-color: white;
.modal-title > span {
font-size: 17px;
}
}
.modal-body {
padding: 0;
}
}
button {
outline: none;
}
.summary {
padding: 15px;
border-bottom: 1px solid lightgrey;
}
.summary > div {
margin: 0 20px;
}
.summary button {
background: transparent;
border: none;
padding: 1px 3px;
vertical-align: middle;
}
.summary .badge {
font-size: 0.857em;
}
.summary button:hover, .summary button:active, .summary button.activated {
color: #c63;
}
.search-for-text button {
font-size: 1.15em;
}
.search-for-text > * {
border: none;
outline: none;
}
.flex-row-start-center {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-align: stretch;
-ms-flex-align: stretch;
align-items: stretch;
}
.sheet-list {
font-family: 'Microsoft YaHei', serif;
color: #000000;
span, i {
line-height: 28px;
}
.list-header {
.flex-row-start-center;
background-color: gainsboro;
padding: 15px 30px 15px 15px;
> div {
margin: 0 10px;
flex: 0 0 auto;
text-align: center;
}
}
.sequence-error {
width: 50px;
}
.sheet-name {
width: 250px;
flex: 1 1 auto !important;
}
.report-status {
width: 90px;
}
.comments {
width: 130px;
}
.operations {
width: 200px;
}
.update-operator {
width: 255px;
}
.sequence-error, .comments, .update-operator, .operations {
margin: 0 !important;
}
.list-body {
max-height: calc(~"100vh - 210px");
overflow-x: auto;
.list-item {
.flex-row-start-center;
padding: 15px;
border-bottom: 1px solid lightgrey;
height: 60px;
width: 1160px;
> div {
.flex-row-start-center;
margin: 0 10px;
flex: 0 0 auto;
}
.sequence-error {
justify-content: flex-end;
.fa {
font-size: 17px;
cursor: pointer;
}
.fa-exclamation-circle, .fa-question-circle {
color: red;
}
.fa-check-circle {
color: #FFB600;
}
span {
width: 2em;
text-align: end;
}
}
.sheet-name {
}
.report-status {
.badge {
position: relative;
top: -0.675em;
line-height: 13px;
background-color: #B83000;
cursor: pointer;
height: 20px;
}
.icon-container {
width: 25px;
i {
line-height: 16px;
height: 16px;
width: 16px;
position: relative;
top: 4px;
}
}
}
.comments {
padding: 0 10px;
}
.operations {
padding: 0 15px;
> div {
.flex-row-start-center;
}
button {
height: 28px;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
border-radius: 14px;
border: 1px solid transparent;
padding: 0 10px;
background-color: transparent;
margin: 0 5px;
i {
margin: 0 2px 0 -3px;
}
}
}
.update-operator {
.fa-container {
padding: 0 5px;
font-size: 16px;
line-height: 19px;
}
.last-update {
min-width: 80px;
margin: 0 10px;
}
}
.comments, .update-operator, .operations {
border-left: 1px solid lightgrey;
}
.comments > *, .operations > * {
margin: 0 auto;
}
}
}
}
.limit-length-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.font-color-gray {
color: rgba(0, 0, 0, 0.65);
}
.font-color-red {
color: #cc0000;
}
}
.check-list-model-analysis-modal {
.modal-dialog {
width: 900px;
margin-top: calc(~"100vh * 0.25");
.modal-title {
.data-count {
> span {
margin-right: 30px;
.fa-exclamation-circle {
font-size: 16px;
color: #cc0000;
margin: 0 5px;
}
> span {
font-weight: 700;
font-size: 1.15em;
}
}
}
}
}
}
.check-list-risk-warning-modal {
.modal-dialog {
width: 850px;
td > button {
border: none;
background-color: transparent;
outline: none !important;
color: #B83000;
}
}
}
.check-list-filled-tooltip {
opacity: 1 !important;
border-radius: 4px;
border: 1px solid #B83000;
margin: 0 !important;
padding: 0 !important;
.tooltip-arrow {
display: none;
}
.tooltip-inner {
text-align: left;
background-color: white;
max-width: 50em;
padding: 5px;
color: black !important;
.title-container > span {
span {
font-weight: 700;
font-size: 1.125em;
}
span:last-child {
color: #B83000;
}
}
.tooltip-list-container {
.tooltip-item {
padding: 5px;
border: 1px solid gainsboro;
&:not(:first-child) {
border-top-style: hidden;
}
}
}
}
}
.check-list-report-comments-modal {
.operation {
border: none;
background-color: transparent;
color: darkblue;
}
}
\ No newline at end of file
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.ctrl.js
View file @ b5602edb
commonModule.controller('importBSController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService','templateService',
, 'projectService', 'vatCommonService','templateService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService,templateService) {
, projectService, vatCommonService,templateService,orgService) {
'use strict';
var successCount = 0;
......@@ -33,6 +33,12 @@
$scope.selectedPeriod = null;
$scope.showTotalSecondRow = false;
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = [];
$scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
$scope.importBSExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/BSExcelFile';
......@@ -59,7 +65,6 @@
OperationType: '',
OperationContent: '',
OriginalState: '',
UpdateState: '',
CreatorID: vatSessionService.logUser.ID,
Comment: comment,
......@@ -708,10 +713,12 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importBSExcelFile,
data: {
orgIds : orgIds,
periodDate : period,
importType : importType
},
......@@ -1153,6 +1160,60 @@
$scope.setGridStyle = setGridStyle;
};
$scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
$scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
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);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList);
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
//开始
(function initialize() {
$log.debug('ImportTBController.ctor()...');
......@@ -1161,6 +1222,7 @@
initParam();
loadImportBSStatusInfoDatagrid();
initDatePicker();
initCompanyList();
$scope.$watch('importExcelFile', function (newValue, oldValue) {
if (newValue !== null && newValue !== oldValue) {
......
atms-web/src/main/webapp/app/common/controls/import/import-balance-sheet/import-balance-sheet.html
View file @ b5602edb
......@@ -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;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('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;text-align: left;float: left;">{{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-cash-flow/import-cash-flow.ctrl.js
View file @ b5602edb
commonModule.controller('importCFController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService','templateService',
, 'projectService', 'vatCommonService','templateService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService,templateService) {
, projectService, vatCommonService,templateService,orgService) {
'use strict';
var comment = vatSessionService.project.name + " " + vatSessionService.project.year + "年" + vatSessionService.month + "月";
......@@ -31,6 +31,11 @@
$scope.importCFExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/CFExcelFile';
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = [];
$scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
var date = new Date();
var year = date.getFullYear();
......@@ -712,10 +717,12 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importCFExcelFile,
data: {
orgIds : orgIds,
periodDate : period,
importType : importType
},
......@@ -900,6 +907,51 @@
$scope.pagingOptions.totalItems = totalItemsCount;
};
$scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
$scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
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);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList);
};
// 检查用户机构权限
var checkUserOrganizationPermissionList = function () {
......@@ -956,6 +1008,14 @@
ele1.datepicker("setDate", $scope.selectedDate);
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
var initParam = function () {
$scope.doUploadCF = doUploadCF;
$scope.downloadTemplate = downloadTemplate;
......@@ -973,6 +1033,7 @@
checkUserOrganizationPermissionList();
getUserPermission();
loadImportCFStatusInfoDatagrid();
initCompanyList();
initDatePicker();
$scope.$watch('importExcelFile', function (newValue, oldValue) {
......
atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.html
View file @ b5602edb
......@@ -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;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('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;text-align: left;float: left;">{{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-certified-invoices-list/import-certified-invoices-list.ctrl.js
View file @ b5602edb
commonModule.controller('importCILController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService','templateService',
, 'projectService', 'vatCommonService','templateService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService,templateService) {
, projectService, vatCommonService,templateService,orgService) {
'use strict';
var comment = vatSessionService.project.name + " " + vatSessionService.project.year + "年" + vatSessionService.month + "月";
......@@ -31,6 +31,12 @@
$scope.importCILExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/CILExcelFile';
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = [];
$scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth();
......@@ -159,10 +165,12 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importCILExcelFile,
data: {
orgIds : orgIds,
periodDate : period,
importType : importType
},
......@@ -346,6 +354,51 @@
$scope.pagingOptions.totalItems = totalItemsCount;
};
$scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
$scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
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);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList);
};
// 检查用户机构权限
var checkUserOrganizationPermissionList = function () {
......@@ -403,6 +456,14 @@
ele1.datepicker("setDate", $scope.selectedDate);
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
var initParam = function () {
$scope.doUploadCIL = doUploadCIL;
$scope.downloadTemplate = downloadTemplate;
......@@ -425,6 +486,7 @@
initParam();
getUserPermission();
loadImportCILStatusInfoDatagrid();
initCompanyList();
initDatePicker();
$scope.$watch('importExcelFile', function (newValue, oldValue) {
......
atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.html
View file @ b5602edb
......@@ -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;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('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;text-align: left;float: left;">{{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-invoice-data/import-invoice-data.ctrl.js
View file @ b5602edb
commonModule.controller('importInvoiceDataController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService','templateService',
, 'projectService', 'vatCommonService','templateService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService,templateService) {
, projectService, vatCommonService,templateService,orgService) {
'use strict';
var comment = vatSessionService.project.name + " " + vatSessionService.project.year + "年" + vatSessionService.month + "月";
......@@ -31,6 +31,11 @@
$scope.importIDExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/IDExcelFile';
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = [];
$scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
var date = new Date();
var year = date.getFullYear();
......@@ -133,10 +138,12 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importIDExcelFile,
data: {
orgIds : orgIds,
periodDate : period,
importType : importType
},
......@@ -355,6 +362,51 @@
$scope.pagingOptions.totalItems = totalItemsCount;
};
$scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
$scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
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);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList);
};
// 检查用户机构权限
var checkUserOrganizationPermissionList = function () {
......@@ -410,6 +462,14 @@
ele1.datepicker("setDate", $scope.selectedDate);
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
var initParam =function () {
$scope.doUploadID = doUploadID;
$scope.downloadTemplate = downloadTemplate;
......@@ -427,6 +487,7 @@
initParam();
getUserPermission();
loadImportIDStatusInfoDatagrid();
initCompanyList();
initDatePicker();
$scope.$watch('importExcelFile', function (newValue, oldValue) {
......
atms-web/src/main/webapp/app/common/controls/import/import-invoice-data/import-invoice-data.html
View file @ b5602edb
......@@ -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;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('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;text-align: left;float: left;">{{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-profit-loss/import-profit-loss.ctrl.js
View file @ b5602edb
commonModule.controller('importPLController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'vatImportService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService'
, 'projectService', 'vatCommonService','templateService',
, 'projectService', 'vatCommonService','templateService','orgService',
function ($scope, $log, $translate, $timeout, $q, $interval
, apiInterceptor, Upload, vatImportService, SweetAlert, uiGridConstants, $uibModal
, vatSessionService, enums, vatOperationLogService
, projectService, vatCommonService,templateService) {
, projectService, vatCommonService,templateService,orgService) {
'use strict';
var comment = vatSessionService.project.name + " " + vatSessionService.project.year + "年" + vatSessionService.month + "月";
......@@ -31,6 +31,11 @@
$scope.importPLExcelFile = apiInterceptor.webApiHostUrl + '/DataImport/PLExcelFile';
$scope.maxTitleLength = constant.maxButtonTitleLength;
$scope.companyList = [];
$scope.checkedCompanyList = [];
$scope.checkedCompanyCodeList = [];
$scope.checkedCompanyTypeList = "";
var date = new Date();
var year = date.getFullYear();
......@@ -162,10 +167,12 @@
}
var period = $scope.UploadPeriodTime;
var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
Upload.upload({
url: $scope.importPLExcelFile,
data: {
orgIds : orgIds,
periodDate : period,
importType : importType
},
......@@ -422,6 +429,61 @@
$scope.setGridStyle = setGridStyle;
};
var initCompanyList = function () {
orgService.getOrgListByUserId().success(function (data) {
if (data) {
$scope.companyList = data;
}
});
};
$scope.selectOne = function () {
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList , function (i) {
var index = $scope.checkedCompanyList.indexOf(i.id);
if(i.checked && index === -1) {
$scope.checkedCompanyList.push(i);
} else if (!i.checked && index !== -1){
$scope.checkedCompanyList.splice(index, 1);
}
});
$scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name+";";
$scope.checkedCompanyCodeList.push(i.id);
});
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);
i.checked = true;
})
}else {
$scope.selectedOne = false;
$scope.checkedCompanyList = [];
angular.forEach($scope.companyList, function (i, index) {
i.checked = false;
})
}
$scope.checkedCompanyTypeList = "";
$scope.checkedCompanyCodeList = [];
angular.forEach($scope.checkedCompanyList,function (i) {
$scope.checkedCompanyTypeList += i.name;
$scope.checkedCompanyCodeList.push(i.id);
});
console.log($scope.checkedCompanyList);
};
//开始
(function initialize() {
$log.debug('ImportTBController.ctor()...');
......@@ -430,6 +492,8 @@
getUserPermission();
loadImportPLStatusInfoDatagrid();
initDatePicker();
initCompanyList();
$scope.$watch('importExcelFile', function (newValue, oldValue) {
if (newValue !== null && newValue !== oldValue) {
......
atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.html
View file @ b5602edb
......@@ -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;">
{{checkedCompanyTypeList ? ((checkedCompanyTypeList)|limitString:maxTitleLength):('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;text-align: left;float: left;">{{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/utils/constant.js
View file @ b5602edb
......@@ -151,7 +151,8 @@ constant.OperateLogType = {
}
constant.page = {
pageSize: 10
pageSize: 10,
logPageSize : 20
}
constant.page.pageSizeArrary = [10, 20, 50, 100, 5];
......@@ -500,8 +501,9 @@ constant.vatPermission = {
saveCode: '02.003.002.002'
},
revenueDetailCode:'02.003.004',
caculateDataCode: '02.003.003',
unbilledInvoiceCode: '02.003.004',
},
reportView: {
......@@ -1421,30 +1423,44 @@ constant.importFileType = {
coupaPurchasingReport: 6,
invoiceData: 7,
certifiedInvoicesList: 8,
invoiceRecord: 9
invoiceRecord: 9,
ExtractFinancialData: 10,
ExtractInvoiceData: 11
};
constant.fileTypeList = [
{code:0,type:"月度科目余额表"},
{code:1,type:"日记账"},
{code:2,type:"资产负债表PRC"},
{code:2,type:"利润表PRC"},
{code:2,type:"资产负债表"},
{code:2,type:"利润表"},
{code:2,type:"直接法现金流量表"},
{code:2,type:"所有者权益变动表和汇率表"}
{code:3,type:"利润表PRC"},
{code:4,type:"资产负债表"},
{code:5,type:"利润表"},
{code:6,type:"直接法现金流量表"},
{code:7,type:"所有者权益变动表和汇率表"}
];
constant.citImportFileType = {
undefined: 0,
JournalAdjust: 1,
TrialBalance: 2,
DraftAccountMapping: 3,
BalanceSheetPrcAdjust: 4,
ProfitPrcAdjust: 5,
EAMAssetsDisposal: 6,
SalaryAdvance: 7
};
constant.NationalEconomicIndustryList =[
{code:"A",type:"农、林、牧、渔业"},
{code:"B",type:"采矿业"},
{code:"C",type:"制造业"},
{code:"D",type:"电力、热力、燃气及水生产和供应业"},
{code:"E",type:"建筑业"},
{code:"F",type:"批发和零售业"},
{code:"G",type:"交通运输、仓储和邮政业"},
{code:"H",type:"住宿和餐饮业"},
{code:"I",type:"信息传输、软件和信息技术服务业"},
{code:"J",type:"金融业"},
{code:"K",type:"房地产业"},
{code:"L",type:"租赁和商务服务业"},
{code:"M",type:"科学研究和技术服务业"},
{code:"N",type:"水利、环境和公共设施管理业"},
{code:"O",type:"居民服务、修理和其他服务业"},
{code:"P",type:"教育"},
{code:"Q",type:"卫生和社会工作"},
{code:"R",type:"文化、体育和娱乐业"},
{code:"S",type:"公共管理、社会保障和社会组织"},
{code:"T",type:"国际组织"}
];
constant.maxButtonTitleLength = 20;
......@@ -1457,4 +1473,6 @@ constant.maxButtonTitleLength = 20;
/************************************************cit constant end*************************************************/
\ No newline at end of file
atms-web/src/main/webapp/app/common/vatservices/checkList.svc.js 0 → 100644
View file @ b5602edb
webservices.factory('checkListService', ['$http', 'apiConfig', function ($http, apiConfig) {
'use strict';
return {
getCheckListViewData: function (serviceTypeID, reportType, period) {
var data = {
"serviceTypeID": serviceTypeID,
"reportType": reportType,
"period": period
};
data = _.pairs(data).map(function (x) { return x.join("="); }).join("&");
return $http.get('/checkList/getCheckListViewData?' + data, apiConfig.createVat());
},
addReportComment: function (reportId, content) {
var data = {
"reportId": reportId,
"content": content
};
return $http.post('/checkList/addReportComment', data, apiConfig.createVat());
},
addReportModifyLog: function (reportId, content) {
var data = {
"reportId": reportId,
"content": content
};
return $http.post('/checkList/addReportModifyLog', data, apiConfig.createVat());
},
removeReportComment: function (commentId) {
return $http.delete('/checkList/removeReportComment?commentId=' + commentId, apiConfig.createVat());
}
};
}]);
\ No newline at end of file
atms-web/src/main/webapp/app/common/vatservices/vatReportService.js
View file @ b5602edb
......@@ -159,13 +159,19 @@
return $http.post('/Report/citUpdateConfig/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
},
citGeneratePrepay: function (projectId, ifDeleteManualDataSource, period, generator) {
return $http.post('/Report/citGenerate/byTotal/' + projectId + '/' + ifDeleteManualDataSource + '/' + 0
// 暂时将生成预缴表的period设置为0，等待完成新的预缴表生成逻辑 + period
+ '/' + enums.reportType.prepay
+ '?generator=' + generator, {}, apiConfig.createVat({ ignoreLoadingBar: true }));
},
citGenerateByType: function (projectId, ifDeleteManualDataSource, reportType, generator) {
var paramStr = '';
if (_.isNumber(reportType)) {
paramStr = '/' + reportType;
}
return $http.post('/Report/citGenerate/byTotal/' + projectId + '/' + ifDeleteManualDataSource + '/0' + paramStr + '?generator=' + generator, {}, apiConfig.createVat({ignoreLoadingBar: true}));
return $http.post('/Report/citGenerate/byTotal/' + projectId + '/' + ifDeleteManualDataSource + '/0' + paramStr + '?generator=' + generator, {}, apiConfig.createVat({ ignoreLoadingBar: true }));
},
citGetTemplate: function (projectId, period) {
if (!_.isNumber(period)) {
......@@ -174,13 +180,19 @@
return $http.get('/Report/citTemplate/' + projectId + '/' + period, apiConfig.createVat());
},
citGetTemplateTree: function (projectId) {
return $http.get('/Report/citTemplateTree/' + projectId, apiConfig.createVat());
},
vatGetTemplateTree: function (projectId, period, serviceType) {
return $http.get('/Report/vatTemplateTree/' + projectId + '/' + period + '/' + serviceType, apiConfig.createVat());
},
citCalculateKeyValue: function (projectId, reportType) {
var reportTypeParam = '';
if (_.isNumber(reportType)) {
reportTypeParam = '/' + reportType;
}
return $http.post('/Report/citCalculateKeyValue/' + projectId + '/0' + reportTypeParam, {}, apiConfig.createVat({ignoreLoadingBar: true}));
return $http.post('/Report/citCalculateKeyValue/' + projectId + '/0' + reportTypeParam, {}, apiConfig.createVat({ ignoreLoadingBar: true }));
},
getReportByTemplateId: function (templateId, period) {
if (!_.isNumber(period)) {
......
atms-web/src/main/webapp/app/common/webservices/organization.svc.js
View file @ b5602edb
......@@ -42,7 +42,7 @@ webservices.factory('orgService', ['$http', 'apiConfig', function ($http, apiCon
return $http.get('/org/getProjectIndustrys', apiConfig.create());
},
enableOrgs: function (id) {
return $http.get('/org/enableOrgs?orgID=' + id, apiConfig.create());
return $http.get('/org/enableOrgs?orgId=' + id, apiConfig.create());
},
getOrgIvhTreeList: function (useType, orgSetID) {
return $http.get('/org/getOrgIvhTreeList?useType=' + useType + '&orgSetID=' + orgSetID, apiConfig.create());
......@@ -84,7 +84,7 @@ webservices.factory('orgService', ['$http', 'apiConfig', function ($http, apiCon
return $http.get('/org/getOrgCityAreaUserCountList?orgID=' + orgID, apiConfig.create({ ignoreLoadingBar: true }));
},
getGeneralInfo: function (orgID) {
return $http.get('/org/getGeneralInfo?orgID=' + orgID, apiConfig.create({ ignoreLoadingBar: true }));
return $http.get('/org/getGeneralInfo?orgId=' + orgID, apiConfig.create({ ignoreLoadingBar: true }));
},
getOrgBuAreaIndustryUser: function (userID) {
return $http.get('/org/getOrgBuAreaIndustryUser?userID=' + userID, apiConfig.create());
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @ b5602edb
......@@ -1172,7 +1172,8 @@
},
getOrgData: function () {
orgService.getOrgListLevel().success(function (data) {
var data = vatSessionService.orgTree;
if (!data) {
data = [];
......@@ -1185,11 +1186,9 @@
result = _.filter(data, function (item) {
return item.industryID == '10';
});
}
else {
} else {
for (var i = 0; i < data.length; i++) {
var item = data[i];
if (thisDataService.isHaveOrganizationPermission(item.id)) {
result.push(item);
}
......@@ -1200,7 +1199,7 @@
//$scope.dimensionOrgShow('', 'orgName');
$scope.dimensionOrgShow(vatSessionService.queryDto.fieldId, vatSessionService.queryDto.filedName);
});
// orgDisplay.orgList = testOrgList;
},
......@@ -1727,6 +1726,12 @@
initDatePickers();
$scope.updateStatus = false;
if($.isEmptyObject(vatSessionService.orgTree)){
orgService.getOrgListLevel().success(function (data) {
vatSessionService.orgTree=data;
});
}
userService.getUserPermission(loginContext.userName).success(function (userPermission) {
thisData.userPermission = userPermission;
userPermission.permissionList.forEach(function (p) {
......@@ -1752,6 +1757,8 @@
}
});
$scope.$watch('productFileName', function (newValue, oldValue) {
if (newValue && newValue !== oldValue) {
doUploadProductFileName(newValue);
......
atms-web/src/main/webapp/app/framework/utils/vatSessionService.js
View file @ b5602edb
......@@ -16,6 +16,8 @@ webservices.factory('vatSessionService', ['$log', 'localStorageService', functio
var userPermission = {};
var orgTree = {};
var queryDto = {
searchKeyword: '',
fieldId: '',
......@@ -73,6 +75,7 @@ webservices.factory('vatSessionService', ['$log', 'localStorageService', functio
logUser: logUser,
reset: reset,
userPermission: userPermission,
orgTree:orgTree,
queryDto: queryDto,
setProperty: setProperty,
getProperty: getProperty,
......
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