Skip to content

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

1、报表模板配置修改；2、卡片及CIT页面显示问题

parent 7fc4b237
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 142 deletions
atms-web/src/main/webapp/app/cit/cit-layout/cit-layout.ctrl.js
View file @ 8f252d0a
......@@ -340,26 +340,26 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
});
}
if (data[constant.citPermission.dataAnalysis.modelAnalysisCode]) {
$scope.menus.push({
name: 'analyzeReport', state: 'analyzeLayout', num: 5,
permission: constant.citPermission.dataAnalysis.dataAnalysisCode, url: '#/cit/citAnalyzeLayout'
});
subMenus.push({
name: 'analyzeLayout.analyzeReport', state: 'analyzeLayout.analyzeReport', num: 5,
permission: constant.citPermission.dataAnalysis.modelAnalysisCode, url: '#/cit/citAnalyzeLayout/citAnalyzeReport'
});
}
else if (data[constant.citPermission.dataAnalysis.dashboard.dashboardCode]) {
$scope.menus.push({
name: 'analyzeReport', state: 'analyzeLayout', num: 5,
permission: constant.citPermission.dataAnalysis.dataAnalysisCode, url: '#/cit/citAnalyzeLayout'
});
subMenus.push({
name: 'analyzeLayout.analyzeOrganizeDashboard', state: 'analyzeLayout.analyzeOrganizeDashboard', num: 5,
permission: constant.citPermission.dataAnalysis.dashboard.dashboardCode, url: '#/cit/citAnalyzeLayout/citOrganizeDashboard'
});
}
// if (data[constant.citPermission.dataAnalysis.modelAnalysisCode]) {
// $scope.menus.push({
// name: 'analyzeReport', state: 'analyzeLayout', num: 5,
// permission: constant.citPermission.dataAnalysis.dataAnalysisCode, url: '#/cit/citAnalyzeLayout'
// });
// subMenus.push({
// name: 'analyzeLayout.analyzeReport', state: 'analyzeLayout.analyzeReport', num: 5,
// permission: constant.citPermission.dataAnalysis.modelAnalysisCode, url: '#/cit/citAnalyzeLayout/citAnalyzeReport'
// });
// }
// else if (data[constant.citPermission.dataAnalysis.dashboard.dashboardCode]) {
// $scope.menus.push({
// name: 'analyzeReport', state: 'analyzeLayout', num: 5,
// permission: constant.citPermission.dataAnalysis.dataAnalysisCode, url: '#/cit/citAnalyzeLayout'
// });
// subMenus.push({
// name: 'analyzeLayout.analyzeOrganizeDashboard', state: 'analyzeLayout.analyzeOrganizeDashboard', num: 5,
// permission: constant.citPermission.dataAnalysis.dashboard.dashboardCode, url: '#/cit/citAnalyzeLayout/citOrganizeDashboard'
// });
// }
}
});
......@@ -562,7 +562,8 @@ function ($scope, $rootScope, $location, $q, $log, $timeout, $state, $translate,
}
$rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams, options) {
var mainMenu = ['cit.importData', 'cit.previewData', 'cit.reductionData', 'cit.citAnalyzeLayout'];
// var mainMenu = ['cit.importData', 'cit.previewData', 'cit.reductionData', 'cit.citAnalyzeLayout'];
var mainMenu = ['cit.importData', 'cit.previewData', 'cit.reductionData'];
if (citSessionService.dataChanged) {
event.preventDefault();
SweetAlert.swal(msgboxOptions, function (isConfirm) {
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list-search.html
View file @ 8f252d0a
......@@ -12,110 +12,26 @@
</div>
</div>
</td>
</tr>
<tr>
<td><span translate="AccountCode"></span></td>
<td>
<div class="input-group">
<input class="form-control " type="text" id="accountCode" placeholder=""
ng-model="filterData.accountCode">
<a class="input-group-addon btn btn-sm" ng-click="popTheParentCode()"><i
class="fa fa-columns" aria-hidden="true"></i></a>
</div>
</td>
</tr>
<tr>
<td><span translate="AccountName"></span></td>
<td><input class="form-control " type="text" id="accountName" placeholder=""
ng-model="filterData.accountName"></td>
</tr>
<tr>
<td><span translate="DebitOpeningBalance"></span></td>
<td>
<div>
<input class="form-control input-width-small" style="width: 115px; text-align: right;"
type="text" id="debitOpeningBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.debitOpeningBalanceFrom">
-
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="debitOpeningBalanceTo" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.debitOpeningBalanceTo">
</div>
</td>
<td><span translate="AssetGroupName"></span></td>
<td><input class="form-control " type="text" id="assetGroupName" placeholder=""
ng-model="filterData.assetGroupName"></td>
</tr>
<tr>
<td><span translate="CreditOpeningBalance"></span></td>
<td><span translate="DepreciationPeriod"></span></td>
<td>
<div>
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="creditOpeningBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.creditOpeningBalanceFrom">
-
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="creditOpeningBalanceTo" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.creditOpeningBalanceTo">
</div>
</td>
</tr>
<tr>
<td><span translate="AccumulatedDebitAmount"></span></td>
<td>
<div>
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="accumulatedDebitAmountFrom" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.accumulatedDebitAmountFrom">
-
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="accumulatedDebitAmountTo" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.accumulatedDebitAmountTo">
</div>
</td>
</tr>
<tr>
<td><span translate="AccumulatedCreditAmount"></span></td>
<td>
<div>
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="accumulatedCreditAmountFrom" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.accumulatedCreditAmountFrom">
-
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="accumulatedCreditAmountTo" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.accumulatedCreditAmountTo">
</div>
</td>
</tr>
<tr>
<td><span translate="DebitClosingBalance"></span></td>
<td>
<div>
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="debitClosingBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.debitClosingBalanceFrom">
-
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="debitClosingBalanceTo" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.debitClosingBalanceTo">
<div class="input-group">
<input class="form-control " type="text" id="depreciationPeriod" placeholder=""
ng-model="filterData.depreciationPeriod">
</div>
</td>
</tr>
<tr>
<td><span translate="CreditClosingBalance"></span></td>
<td>
<div>
<input class="form-control input-width-small" style="width: 115px; text-align: right;"
type="text" id="creditClosingBalanceFrom" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.creditClosingBalanceFrom">
-
<input class="form-control input-width-small" style="width: 115px; text-align: right; "
type="text" id="creditClosingBalanceTo" ng-keyup="PWC.inputNumberFormat(this);"
placeholder="" ng-model="filterData.creditClosingBalanceTo">
</div>
</td>
<td><span translate="TaxGroupType"></span></td>
<td><input class="form-control " type="text" id="taxGroupType" placeholder=""
ng-model="filterData.taxGroupType"></td>
</tr>
</table>
......
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.ctrl.js
View file @ 8f252d0a
......@@ -78,10 +78,10 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
name: 'caculateData', permission: constant.citPermission.dataManage.caculateDataCode,
text: $translate.instant('caculateData'), icon: 'fa fa-random'
},
{
name: 'accountMapping', permission: constant.citPermission.dataManage.accountMappingCode,
text: $translate.instant('accountMapping'), icon: 'fa fa-map'
},
// {
// name: 'accountMapping', permission: constant.citPermission.dataManage.accountMappingCode,
// text: $translate.instant('accountMapping'), icon: 'fa fa-map'
// },
{
name: 'assetEamMapping', permission: constant.citPermission.dataManage.assetEamMapping,
text: $translate.instant('AssetEamMapping'), icon: 'fa fa-map'
......
atms-web/src/main/webapp/app/cit/reduction/cit-calculate-data/cit-calculate-data.ctrl.js
View file @ 8f252d0a
......@@ -597,7 +597,7 @@ debugger;
if($scope.timer){
$interval.cancel($scope.timer);
vatCommonService.setProjectStatus(vatSessionService.project.id, vatSessionService.month, constant.ProjectStatusEnum.Generated
vatCommonService.setProjectStatus(vatSessionService.project.id, -1, constant.ProjectStatusEnum.Generated
, constant.DictionaryDictKey.WFDataProcess, enums.FinishStatusEnum.Finished);
}
}else if(job.jobStatus=='Running'|| job.jobStatus=='Error'){
......
atms-web/src/main/webapp/app/common/controls/edit-templategroup-modal/edit-templategroup-modal.ctrl.js
View file @ 8f252d0a
......@@ -59,6 +59,7 @@ controller('editTemplategroupModalController', ['$scope', '$log', '$translate',
// 获取sheet列表
getSheetList: function() {
debugger;
if (!$scope.editModel || !$scope.editModel.file) {
return;
}
......@@ -544,12 +545,26 @@ controller('editTemplategroupModalController', ['$scope', '$log', '$translate',
// 修改报表名称
$scope.saveUpdateTemplateGroupName = function () {
debugger;
$scope.validateName();
if ($scope.editModel.nameError) {
return;
}
templateGroupService.addTemplateGroupWithoutTemplate($scope.editModel).success(function (ret) {
//此处报错（Converting circular structure to JSON），因时间关系采取快捷方案
var addTemplateGroupModel = {
groupType: $scope.editModel.groupType,
industryIds: $scope.editModel.industryIDs,
name: $scope.editModel.name,
nameError: $scope.editModel.nameError,
reportType: $scope.editModel.reportType,
serviceTypeId: $scope.editModel.serviceTypeID,
title:$scope.editModel.title
};
templateGroupService.addTemplateGroupWithoutTemplate(addTemplateGroupModel).success(function (ret) {
debugger;
if (ret.result) {
// 添加成功
modalInstance.close($scope.editModel);
......@@ -607,7 +622,7 @@ controller('editTemplategroupModalController', ['$scope', '$log', '$translate',
// 修改TemplateGroupName
var updateTemplateName = function(model) {
debugger;
$scope.validateName();
if ($scope.editModel.nameError) {
return;
......@@ -635,7 +650,7 @@ controller('editTemplategroupModalController', ['$scope', '$log', '$translate',
// 修改报表名称
$scope.saveUpdateTemplateGroupName = function() {
// thisDataService.saveFindAdd(modalInstance)
debugger;
var model = {
id: $scope.editModel.id,
name: $scope.editModel.name,
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 8f252d0a
......@@ -695,19 +695,19 @@ constant.citPermission = {
reviewCode: '03.004.005.004',
},
},
dataAnalysis: {
dataAnalysisCode: '03.005',
modelAnalysisCode: '03.005.001',
modelAnalysis: {
queryCode: '03.005.001.001',
filterCode: '03.005.001.005'
},
dashboard: {
dashboardCode: '03.005.002',
querySummaryDashboardCode: '03.005.002.001',
singleOrgIndexDashboardCode: '03.005.002.002',
}
},
// dataAnalysis: {
// dataAnalysisCode: '03.005',
// modelAnalysisCode: '03.005.001',
// modelAnalysis: {
// queryCode: '03.005.001.001',
// filterCode: '03.005.001.005'
// },
// dashboard: {
// dashboardCode: '03.005.002',
// querySummaryDashboardCode: '03.005.002.001',
// singleOrgIndexDashboardCode: '03.005.002.002',
// }
// },
};
// 权限代码
......@@ -929,7 +929,7 @@ constant.citMenuList = [
constant.citPermission.dataPreview.assetsList.queryCode,
constant.citPermission.dataPreview.salaryAdvance.queryCode,
constant.citPermission.dataPreview.eamDisposal.queryCode,
constant.citPermission.dataManage.accountMappingCode,
// constant.citPermission.dataManage.accountMappingCode,
constant.citPermission.dataManage.caculateDataCode,
constant.citPermission.reportView.bsplCode,
......@@ -937,8 +937,8 @@ constant.citMenuList = [
constant.citPermission.reportView.workingPaperTypeCode,
constant.citPermission.reportView.taxReturnCode,
constant.citPermission.reportView.otherReportCode,
constant.citPermission.dataAnalysis.modelAnalysisCode,
constant.citPermission.dataAnalysis.dashboard.dashboardCode,
// constant.citPermission.dataAnalysis.modelAnalysisCode,
// constant.citPermission.dataAnalysis.dashboard.dashboardCode,
];
constant.basicDataUrl = {
......
atms-web/src/main/webapp/app/framework/app-overview/app-overview.html
View file @ 8f252d0a
......@@ -205,9 +205,9 @@
<img src="{{result.finalStatus}}" />
</div>
<div class="body-name">
<div class="org-name"><span>{{'TaxBurdenRatio' | translate}}: </span><span>{{result.taxRate}}%</span></div>
<!--<div class="org-name"><span>{{'TaxBurdenRatio' | translate}}: </span><span>{{result.taxRate}}%</span></div>-->
<!--<div class="org-name" ng-show="serviceTypeId ==='6'"><span>预缴额: </span><span>{{result.prepadidTaxAmount | number}}元</span></div>-->
<div class="org-name"><span>{{'TaxPayment' | translate}}: </span><span>{{result.taxAmount | number}}{{'Yuan' | translate}}</span></div>
<!--<div class="org-name"><span>{{'TaxPayment' | translate}}: </span><span>{{result.taxAmount | number}}{{'Yuan' | translate}}</span></div>-->
<div class="org-name"><span>{{'ProjectPeriod' | translate}}: </span><span> {{result.periodDate}}</span></div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment