Skip to content

T
traffic-front
Commit 8c1745f2 authored by chase's avatar chase
Browse files
Options

merge 档案管理

parent aec702fb
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 37 deletions
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
View file @ 8c1745f2
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
when tbf.segment3 like '4001%' and rc.id is null then 1 when tbf.segment3 like '4001%' and rc.id is null then 1
when tbf.segment3 like '4002%' and rc.id is null then 1 when tbf.segment3 like '4002%' and rc.id is null then 1
when tbf.segment3 like '4010%' and rc.id is null then 1 when tbf.segment3 like '4010%' and rc.id is null then 1
when tbf.segment3 like '8002%' and rc.id is null then 1 when tbf.segment3 like '800201%' and rc.id is null then 1
when tbf.segment3 like '800209%' and rc.id is null then 1
<![CDATA[WHEN rc.id IS NOT NULL and (rc.start_date > #{queryDate} or rc.end_date < #{queryDate}) then 1]]> <![CDATA[WHEN rc.id IS NOT NULL and (rc.start_date > #{queryDate} or rc.end_date < #{queryDate}) then 1]]>
<![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]> <![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]>
else 3 end as emptyCode else 3 end as emptyCode
......
atms-web/src/main/webapp/Scripts/bootstrp-confirm/bootstrap-confirm.js
View file @ 8c1745f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
window.Ewin = function () { window.Ewin = function () {
var html = '<div id="[Id]" class="modal fade" role="dialog" aria-labelledby="modalLabel">' + var html = '<div id="[Id]" class="modal fade" role="dialog" aria-labelledby="modalLabel">' +
'<div class="modal-dialog modal-sm">' + '<div class="modal-dialog modal-lg">' +
'<div class="modal-content">' + '<div class="modal-content">' +
'<div class="modal-header">' + '<div class="modal-header">' +
'<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>' + '<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>' +
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 8c1745f2
...@@ -1102,26 +1102,21 @@ taxDocumentManageModule.directive('multiFileUploader', function () { ...@@ -1102,26 +1102,21 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
_multiUploader.uploadItem(_i); _multiUploader.uploadItem(_i);
} else { } else {
//覆盖行为-需上传参数 //覆盖行为-需上传参数
_fileItem.formData.push({id: data.id}); _fileItem.formData.push({id:data.id});
var Cover_Confirm = "'" + data.fileName + "' 记录已经存在，是否进行覆盖？"; var Cover_Confirm="'"+data.fileName+"' 记录已经存在，是否进行覆盖？";
SweetAlert.swal({ Ewin.confirm({ message: Cover_Confirm }).on(function (e) {
title: '提示', if (!e) {
text: $translate.instant(Cover_Confirm), return;
type: "warning", }
showCancelButton: true, setTimeout(function () {
confirmButtonColor: "#DD6B55", try {
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel4Tax'),
closeOnConfirm: true,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit"; _fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit";
_multiUploader.uploadItem(_i); _multiUploader.uploadItem(_i);
} catch (e) {
SweetAlert.warning(e.message);
} }
}) }, 1000);
});
} }
}); });
})(i, fileItem, editFieldModel, taxDocumentListService, $scope.multiUploader); })(i, fileItem, editFieldModel, taxDocumentListService, $scope.multiUploader);
...@@ -1297,25 +1292,22 @@ taxDocumentManageModule.directive('multiFileUploader', function () { ...@@ -1297,25 +1292,22 @@ taxDocumentManageModule.directive('multiFileUploader', function () {
_multiUploader.uploadItem(_i); _multiUploader.uploadItem(_i);
} else { } else {
//覆盖行为-需上传参数 //覆盖行为-需上传参数
_fileItem.formData.push({id: data.id}); _fileItem.formData.push({id:data.id});
var Cover_Confirm = "'" + data.fileName + "' 记录已经存在，是否进行覆盖？"; var Cover_Confirm="'"+data.fileName+"' 记录已经存在，是否进行覆盖？";
SweetAlert.swal({ Ewin.confirm({ message: Cover_Confirm }).on(function (e) {
title: '提示', if (!e) {
text: $translate.instant(Cover_Confirm), return;
type: "warning", }
showCancelButton: true, setTimeout(function () {
confirmButtonColor: "#DD6B55", try {
confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel4Tax'),
closeOnConfirm: true,
closeOnCancel: true
},
function (isConfirm) {
if (isConfirm) {
_fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit"; _fileItem.url = apiInterceptor.webApiHostUrl + "/taxDoc/edit";
_multiUploader.uploadItem(_i); _multiUploader.uploadItem(_i);
} catch (e) {
SweetAlert.warning(e.message);
} }
}) }, 1000);
});
} }
}); });
...@@ -1600,6 +1592,8 @@ taxDocumentManageModule.directive('pdfPreview', function () { ...@@ -1600,6 +1592,8 @@ taxDocumentManageModule.directive('pdfPreview', function () {
var container = document.getElementById("pdfLayoutDialog"); var container = document.getElementById("pdfLayoutDialog");
var pdfPromise = null; var pdfPromise = null;
var cacheUrl = null; var cacheUrl = null;
var pageInfo=null;//pdf页面信息
var angle=0;//旋转角度
$scope.openPdfPreviewPop_bak = function (url) { $scope.openPdfPreviewPop_bak = function (url) {
container.style.display = "block"; container.style.display = "block";
if (cacheUrl !== url) { if (cacheUrl !== url) {
...@@ -1629,6 +1623,7 @@ taxDocumentManageModule.directive('pdfPreview', function () { ...@@ -1629,6 +1623,7 @@ taxDocumentManageModule.directive('pdfPreview', function () {
pdfSumPages = data.numPages; pdfSumPages = data.numPages;
return data.getPage(pdfCurPageIndex); return data.getPage(pdfCurPageIndex);
}).then(function(page){ }).then(function(page){
pageInfo=page;
var scale = 1.5; var scale = 1.5;
var viewport = page.getViewport(scale); var viewport = page.getViewport(scale);
canvas.height = viewport.height; canvas.height = viewport.height;
...@@ -1667,6 +1662,18 @@ taxDocumentManageModule.directive('pdfPreview', function () { ...@@ -1667,6 +1662,18 @@ taxDocumentManageModule.directive('pdfPreview', function () {
renderPdf(pdf) renderPdf(pdf)
}) })
}; };
$scope.webViewerRotateCw =function(){
angle+=90;
var scale = 1.5;
var viewport = pageInfo.getViewport(1.5,angle);
canvas.height = viewport.height;
canvas.width = viewport.width;
var renderContext = {
canvasContext: context,
viewport: viewport
};
pageInfo.render(renderContext);
};
function getPdf(url) { function getPdf(url) {
// var url = 'http://47.94.233.173:11007/static/erp_tax_system/61063D1D-8C9E-47C1-B106-AFF696CF5D98?expire=1552466477&signiture=5IaoVIHX_pzmQgyaxdzYC2NsNOz_R0eyRUhQU1BJjiE='; // var url = 'http://47.94.233.173:11007/static/erp_tax_system/61063D1D-8C9E-47C1-B106-AFF696CF5D98?expire=1552466477&signiture=5IaoVIHX_pzmQgyaxdzYC2NsNOz_R0eyRUhQU1BJjiE=';
return window.PDFJS.getDocument(url); return window.PDFJS.getDocument(url);
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 8c1745f2
...@@ -305,6 +305,26 @@ ...@@ -305,6 +305,26 @@
color: #fff; color: #fff;
} }
.TDL-pdf-preview-pop-rotateCw-btn {
position: fixed;
top: 12rem;
right: 6rem;
width: 4rem;
height: 4rem;
background: rgba(254, 66, 66, 0.5);
color: #333;
border-radius: 100%;
text-align: center;
line-height: 100%;
cursor: pointer;
padding: 0;
z-index: 1502;
border: 0;
}
.TDL-pdf-preview-pop-rotateCw-btn:hover{
background: rgba(254, 66, 66, 0.8);
color: #fff;
}
.TDL-pdf-layout-dialog { .TDL-pdf-layout-dialog {
display: none; display: none;
} }
...@@ -1485,8 +1505,10 @@ ...@@ -1485,8 +1505,10 @@
<div class="wrapper TDL-pdf-preview-pop" id="pdfContainer"> <div class="wrapper TDL-pdf-preview-pop" id="pdfContainer">
<canvas id="the-canvas"></canvas> <canvas id="the-canvas"></canvas>
</div> </div>
<button class="TDL-pdf-preview-pop-close-btn" ng-click="closePdfPop()">×</button> <button class="TDL-pdf-preview-pop-close-btn" title="关闭" ng-click="closePdfPop()">×</button>
<button class="TDL-pdf-preview-pop-rotateCw-btn" title="顺时针旋转" ng-click="webViewerRotateCw()">
<span class="glyphicon glyphicon-repeat"></span>
</button>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging()" title="上一页">&lt;</button> <button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging()" title="上一页">&lt;</button>
<button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging()" title="下一页">&gt;</button> <button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging()" title="下一页">&gt;</button>
</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