Commit d154a365 authored by neo's avatar neo

[Bugfix] fixed js qout misss

parent 1e994fc1
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
// citUpdateConfig: function (projectId, period?) // citUpdateConfig: function (projectId, period?)
// citGetTemplate: function (projectId, period?) // citGetTemplate: function (projectId, period?)
updateConfig: function (projectId, ifDeleteManualDataSource, period, generator,isMergeManualDataSource) { updateConfig: function (projectId, ifDeleteManualDataSource, period, generator, isMergeManualDataSource) {
return $http.post('/Report/updateConfig/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator+ '&mergeManual='+isMergeManualDataSource, {}, apiConfig.createVat({ignoreLoadingBar: true})); return $http.post('/Report/updateConfig/' + projectId + '/' + ifDeleteManualDataSource + '/' + period + '?generator=' + generator+ '&mergeManual='+isMergeManualDataSource, {}, apiConfig.createVat({ignoreLoadingBar: true}));
}, },
generate: function (projectId, templateId, ifDeleteManualDataSource, period, generator) { generate: function (projectId, templateId, ifDeleteManualDataSource, period, generator) {
......
...@@ -291,7 +291,6 @@ ...@@ -291,7 +291,6 @@
}, },
function (isConfirm) { function (isConfirm) {
if (isConfirm) { if (isConfirm) {
vatReportService.hasManualDataSource(vatSessionService.project.id,vatSessionService.month).then(function (hasManual) { vatReportService.hasManualDataSource(vatSessionService.project.id,vatSessionService.month).then(function (hasManual) {
if(hasManual){ if(hasManual){
swal({ swal({
...@@ -311,16 +310,16 @@ ...@@ -311,16 +310,16 @@
}else{ }else{
doStartCaculate(false); doStartCaculate(false);
} }
}); });
}else{ }else{
doStartCaculate(false); doStartCaculate(false);
} }
} });
} }
else { else {
swal.close(); swal.close();
} }
}); });
} }
else { else {
doStartCaculate(false); doStartCaculate(false);
......
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