Skip to content

T
traffic-front
Commit 1ded7713 authored by chase's avatar chase
Browse files
Options

merge 档案管理

parent e8c23e36
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 1ded7713
...@@ -927,7 +927,7 @@ ...@@ -927,7 +927,7 @@
"false": "否", "false": "否",
"ConditionColumnNum": "条件列", "ConditionColumnNum": "条件列",
"Condition": "查询条件", "Condition": "查询条件",
"Cancel4Tax": "取消", "Cancel": "取消",
"FinancialStatementsType": "财务报表", "FinancialStatementsType": "财务报表",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!"
} }
atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html
View file @ 1ded7713
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
></button> ></button>
<!--ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"--> <!--ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"-->
<button type="button" class="btn btn-third" data-dismiss="modal" <button type="button" class="btn btn-third" data-dismiss="modal"
ng-click="cancelDocFileType()" translate="Cancel4Tax"></button> ng-click="cancelDocFileType()" translate="Cancel"></button>
</center> </center>
</div> </div>
</form> </form>
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 1ded7713
...@@ -537,7 +537,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -537,7 +537,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
showCancelButton: true, showCancelButton: true,
confirmButtonColor: "#DD6B55", confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'), confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel4Tax'), cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: true, closeOnConfirm: true,
closeOnCancel: true closeOnCancel: true
}, },
...@@ -616,7 +616,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -616,7 +616,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
showCancelButton: true, showCancelButton: true,
confirmButtonColor: "#DD6B55", confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'), confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel4Tax'), cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: true, closeOnConfirm: true,
closeOnCancel: true closeOnCancel: true
}, },
...@@ -721,7 +721,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -721,7 +721,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
showCancelButton: true, showCancelButton: true,
confirmButtonColor: "#DD6B55", confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant('Confirm'), confirmButtonText: $translate.instant('Confirm'),
cancelButtonText: $translate.instant('Cancel4Tax'), cancelButtonText: $translate.instant('Cancel'),
closeOnConfirm: true, closeOnConfirm: true,
closeOnCancel: true closeOnCancel: true
}, },
...@@ -1631,6 +1631,7 @@ taxDocumentManageModule.directive('pdfPreview', function () { ...@@ -1631,6 +1631,7 @@ taxDocumentManageModule.directive('pdfPreview', function () {
if(typeof dataURL =="string"){ if(typeof dataURL =="string"){
pdfData = convertDataURIToBinary(dataURL); pdfData = convertDataURIToBinary(dataURL);
} }
pdfPromise=window.PDFJS.getDocument({data:pdfData});
return window.PDFJS.getDocument({data:pdfData}); return window.PDFJS.getDocument({data:pdfData});
}).then(function(data) { }).then(function(data) {
pdfSumPages = data.numPages; pdfSumPages = data.numPages;
......
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