Commit 64c3bbd1 authored by ZeGang Z Si's avatar ZeGang Z Si

修改js

parent e200f4c5
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<artifactId>atms-dao</artifactId> <artifactId>atms-dao</artifactId>
<version>0.1.1</version> <version>0.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
......
...@@ -142,7 +142,6 @@ public class ReportServiceImpl extends BaseService { ...@@ -142,7 +142,6 @@ public class ReportServiceImpl extends BaseService {
operationResult.setResultMsg("NoOrganization"); operationResult.setResultMsg("NoOrganization");
return operationResult; return operationResult;
} }
Long templateGroupId; Long templateGroupId;
/* /*
...@@ -484,15 +483,12 @@ public class ReportServiceImpl extends BaseService { ...@@ -484,15 +483,12 @@ public class ReportServiceImpl extends BaseService {
MyAsserts.assertNull(periodJobMapper.getRunningJob(projectId,periodParam), Exceptions.TASK_HAS_BEGINNING); MyAsserts.assertNull(periodJobMapper.getRunningJob(projectId,periodParam), Exceptions.TASK_HAS_BEGINNING);
String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, periodParam); String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, periodParam);
MyAsserts.assertTrue(status == null || !status.equals(Constant.APPROVAL_COMMITTED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION); MyAsserts.assertTrue(status == null || !status.equals(Constant.APPROVAL_COMMITTED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);
try { try {
if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null || periodParam <= 0)) { if (serviceType.equals(EnumServiceType.VAT) && (periodParam == null || periodParam <= 0)) {
operationResultDto.setResultMsg("PeriodRequiredForVAT"); operationResultDto.setResultMsg("PeriodRequiredForVAT");
return operationResultDto; return operationResultDto;
} }
List<Template> templates = getTemplatesByProjectId(projectId); List<Template> templates = getTemplatesByProjectId(projectId);
PeriodJob genJob = WrapPeriodJobDto.createReportGenJob(projectId, periodParam, templates); PeriodJob genJob = WrapPeriodJobDto.createReportGenJob(projectId, periodParam, templates);
periodJobMapper.insert(genJob); periodJobMapper.insert(genJob);
new Thread(new Runnable() { new Thread(new Runnable() {
......
...@@ -17,6 +17,11 @@ ...@@ -17,6 +17,11 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
</dependency> </dependency>
<dependency>
<groupId>pwc.taxtech.atms</groupId>
<artifactId>atms-api</artifactId>
<version>0.1.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
......
...@@ -659,8 +659,7 @@ ...@@ -659,8 +659,7 @@
$scope.closeUserCard(); $scope.closeUserCard();
$scope.areaORGGridList.data = []; $scope.areaORGGridList.data = [];
$scope. $scope.commonCountDataSource= [];
= [];
if ($scope.panelArea.organizationList && $scope.panelArea.organizationList.length > 0) { if ($scope.panelArea.organizationList && $scope.panelArea.organizationList.length > 0) {
parseDataGridOnlyOrg(); parseDataGridOnlyOrg();
} else { } else {
......
...@@ -79,7 +79,6 @@ function ($scope, $log, $timeout, $q, $http, $sce, $translate, loginContext, api ...@@ -79,7 +79,6 @@ function ($scope, $log, $timeout, $q, $http, $sce, $translate, loginContext, api
item.text = $translate.instant(statusTmp); item.text = $translate.instant(statusTmp);
calcProgress(item.name); calcProgress(item.name);
} }
} }
}; };
...@@ -489,8 +488,8 @@ function ($scope, $log, $timeout, $q, $http, $sce, $translate, loginContext, api ...@@ -489,8 +488,8 @@ function ($scope, $log, $timeout, $q, $http, $sce, $translate, loginContext, api
// break; // break;
// default: // default:
// item.isSelected = false; // item.isSelected = false;
//} //}
var newTask = new task(item.id, constant.DataProccessStatus.Unstarted, item.name, item.tasklevel, item.parentId, item.hasButton, item.seqNo); var newTask = new task(item.id, constant.DataProccessStatus.Unstarted, item.name, item.tasklevel, item.parentId, item.hasButton, item.seqNo);
newTask.btTitle = $translate.instant('DataProcessData_Generate');// item.btTitle; newTask.btTitle = $translate.instant('DataProcessData_Generate');// item.btTitle;
newTask.isSelected = true;//item.isSelected; newTask.isSelected = true;//item.isSelected;
......
<div id="vat-caculate-data"> <div id="vat-caculate-data">
<div style="font-family:'Microsoft YaHei';font-size:18px;margin-top:10px">{{'vatCaculateDataDesc' | translate}}</div> <div style="font-family:'Microsoft YaHei';font-size:18px;margin-top:10px">{{'vatCaculateDataDesc' | translate}}</div>
<div class="vat-caculate-data-title"> <div class="vat-caculate-data-title">
<button id="calAll" class="btn btn-vat-primary" style="background-color: #B4122A;" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate($event)"></button> <button id="calAll" class="btn btn-vat-primary" style="background-color: #B4122A;" translate="startCaculateData" ng-disabled="readonly" ng-click="startCaculate($event)"></button>
<span ng-click="showOperateLogPop()" class="right"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'Remarks' | translate}}</span> <span ng-click="showOperateLogPop()" class="right"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'Remarks' | translate}}</span>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</form> </form>
</div> </div>
</perfect-scrollbar> </perfect-scrollbar>
</div> </div>
<vat-operate-log period="period" module-type="moduleid" is-show="isShowLog" service-type="serviceType"></vat-operate-log> <vat-operate-log period="period" module-type="moduleid" is-show="isShowLog" service-type="serviceType"></vat-operate-log>
......
...@@ -2333,11 +2333,22 @@ ...@@ -2333,11 +2333,22 @@
}); });
var dataGrid ={} $scope._gridData =[];
$scope.cellAttachmentDataGirdOptions = { $scope.cellAttachmentDataGirdOptions = {
dataSource: [],
columns: [{caption: '序号', dataField: "xh"}, columns: [{caption: '序号', dataField: "xh"},
{caption: '文件名', dataField: "fileName"}, {caption: '文件名', dataField: "fileName",cellTemplate: function (container, options) {
try {
$('<i class="fa fa-pencil-square-o" style="cursor: pointer"></i>&nbsp;&nbsp;')
.on('click', function () {
location.href = options.data.fileUrl;
});
}
catch (e) {
$log.error(e);
}
}
},
{caption: '文件大小', dataField: "size"}, {caption: '文件大小', dataField: "size"},
{caption: '备注信息', dataField: "remarks"}, {caption: '备注信息', dataField: "remarks"},
{caption: '用户', dataField: "uploadUser"}, {caption: '用户', dataField: "uploadUser"},
...@@ -2351,12 +2362,15 @@ ...@@ -2351,12 +2362,15 @@
allowDeleting: true allowDeleting: true
}, },
onInitialized : function(e){ onInitialized : function(e){
dataGrid = e.component; $scope.dataGrid = e.component;
},
bindingOptions : {
dataSource: '_gridData'
} }
}; };
//加载附件信息列表 //加载附件信息列表
$scope.loadAttach = function () { $scope.loadAttach = function () {
$scope.cellAttachmentDataGirdOptions.dataSource = []; $scope._gridData = [];
if ($scope.activeSheet.activeRow && $scope.activeSheet.activeCol && $scope.activeSheet.activeTemplateId) { if ($scope.activeSheet.activeRow && $scope.activeSheet.activeCol && $scope.activeSheet.activeTemplateId) {
//获取附件信息 //获取附件信息
vatReportService.loadAttachList($scope.activeSheet).success(function (data) { vatReportService.loadAttachList($scope.activeSheet).success(function (data) {
...@@ -2371,13 +2385,12 @@ ...@@ -2371,13 +2385,12 @@
createTime : data[i].createTime createTime : data[i].createTime
} }
$scope.cellAttachmentDataGirdOptions.dataSource.push(_data); $scope._gridData.push(_data);
_xh = i+1; _xh = i+1;
} }
$scope.xh = _xh; $scope.xh = _xh;
//刷新附件列表 //刷新附件列表
dataGrid.refresh(); // $scope.dataGrid.refresh();
// dataGrid.refresh(); // dataGrid.refresh();
}).error(function(error){ }).error(function(error){
SweetAlert.error("附件列表数据加载失败") SweetAlert.error("附件列表数据加载失败")
...@@ -2431,8 +2444,8 @@ ...@@ -2431,8 +2444,8 @@
createTime : dataSource.data.createTime createTime : dataSource.data.createTime
} }
$scope.cellAttachmentDataGirdOptions.dataSource.push(_data); $scope._gridData.push(_data);
dataGrid.refresh(); // $scope.dataGrid.refresh();
} }
//上传附件 //上传附件
var uploadfile = function (file) { var uploadfile = function (file) {
......
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
showClearButton: true, showClearButton: true,
searchEnabled: true, searchEnabled: true,
noDataText: $translate.instant('RevenueNoOrgData'), noDataText: $translate.instant('RevenueNoOrgData'),
showSelectionControls: true, showSelectionControls: true
}; };
//税率下拉框 //税率下拉框
......
...@@ -239,7 +239,6 @@ ...@@ -239,7 +239,6 @@
taskList = taskList.concat(item.items); taskList = taskList.concat(item.items);
}); });
$scope.tasks = result;
getInitTaskStatus(); getInitTaskStatus();
}); });
}; };
...@@ -370,7 +369,7 @@ ...@@ -370,7 +369,7 @@
text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}), text: $translate.instant('IsConfirmReCalcuate').formatObj({status: vatCommonService.getProjectStautsEnumDesc(vatSessionService.project.projectStatusList[vatSessionService.month])}),
type: "warning", type: "warning",
showCancelButton: true, showCancelButton: true,
confirmButtonColor: "#DD6B55", confirmButtonColor: "#dd6b55",
confirmButtonText: $translate.instant('Yes'), confirmButtonText: $translate.instant('Yes'),
cancelButtonText: $translate.instant('No'), cancelButtonText: $translate.instant('No'),
closeOnConfirm: true, closeOnConfirm: true,
...@@ -582,9 +581,7 @@ ...@@ -582,9 +581,7 @@
}else if(updateConfig.status == 'Begin'){ }else if(updateConfig.status == 'Begin'){
$scope.tasks[0].items[0].status = 'processing'; $scope.tasks[0].items[0].status = 'processing';
} }
$scope.tasks[0].items[0].text= $translate.instant($scope.tasks[0].items[0].status); $scope.tasks[0].items[0].text= $translate.instant($scope.tasks[0].items[0].status);
items.forEach(function(item,index){ items.forEach(function(item,index){
tasks.forEach(function(task){ tasks.forEach(function(task){
if(task.code==item.code){ if(task.code==item.code){
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
<ul ng-if="group.items.length > 1" ng-repeat="task in group.items track by $index"> <ul ng-if="group.items.length > 1" ng-repeat="task in group.items track by $index">
<li ng-include="'task_template'" /> <li ng-include="'task_template'" />
</ul> </ul>
<div ng-if="group.items.length == 1" ng-repeat="task in group.items track by $index" style="height:42px;" ng-include="'task_template'" /> <div ng-if="group.items.length == 1" ng-repeat="task in group.items track by $index" style="height:42px;" ng-include="'task_template'" />
</script> </script>
......
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