merge 档案管理

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -927,7 +927,7 @@
     "false": "否",
     "ConditionColumnNum": "条件列",
     "Condition": "查询条件",
-    "Cancel4Tax": "取消",
+    "Cancel": "取消",
     "FinancialStatementsType": "财务报表",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }

atms-web/src/main/webapp/app/admin/infrastructure/docManage/doc-manage.html

@@ -193,7 +193,7 @@
                             ></button>
                             <!--ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"-->
                             <button type="button" class="btn btn-third" data-dismiss="modal"
-                                    ng-click="cancelDocFileType()" translate="Cancel4Tax"></button>
+                                    ng-click="cancelDocFileType()" translate="Cancel"></button>
                         </center>
                     </div>
                 </form>

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js

@@ -537,7 +537,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                                 showCancelButton: true,
                                 confirmButtonColor: "#DD6B55",
                                 confirmButtonText: $translate.instant('Confirm'),
-                                cancelButtonText: $translate.instant('Cancel4Tax'),
+                                cancelButtonText: $translate.instant('Cancel'),
                                 closeOnConfirm: true,
                                 closeOnCancel: true
                             },
@@ -616,7 +616,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                                 showCancelButton: true,
                                 confirmButtonColor: "#DD6B55",
                                 confirmButtonText: $translate.instant('Confirm'),
-                                cancelButtonText: $translate.instant('Cancel4Tax'),
+                                cancelButtonText: $translate.instant('Cancel'),
                                 closeOnConfirm: true,
                                 closeOnCancel: true
                             },
@@ -721,7 +721,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                             showCancelButton: true,
                             confirmButtonColor: "#DD6B55",
                             confirmButtonText: $translate.instant('Confirm'),
-                            cancelButtonText: $translate.instant('Cancel4Tax'),
+                            cancelButtonText: $translate.instant('Cancel'),
                             closeOnConfirm: true,
                             closeOnCancel: true
                         },
@@ -1631,6 +1631,7 @@ taxDocumentManageModule.directive('pdfPreview', function () {
                     if(typeof dataURL =="string"){
                         pdfData = convertDataURIToBinary(dataURL);
                     }
+                    pdfPromise=window.PDFJS.getDocument({data:pdfData});
                     return  window.PDFJS.getDocument({data:pdfData});
                 }).then(function(data) {
                     pdfSumPages = data.numPages;