merge 档案管理

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

@@ -924,5 +924,6 @@
     "false": "否",
     "ConditionColumnNum": "条件列",
     "Condition": "查询条件",
+    "Cancel4Tax": "取消",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }

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

@@ -185,7 +185,7 @@
                     <!--<div class="modal-footer">
                         <button type="submit" class="btn btn-primary" translate="Confirm"
                                 ></button>&lt;!&ndash;ng-disabled="newDocFileTypeForm.roleName.$invalid || newDocFileTypeForm.service_id.$invalid"&ndash;&gt;
-                        <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" translate="Cancel"></button>
+                        <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()" translate="Cancel4Tax"></button>
                     </div>-->
                     <div style="margin-bottom: 20px;">
                         <center>
@@ -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="Cancel"></button>
+                                    ng-click="cancelDocFileType()" translate="Cancel4Tax"></button>
                         </center>
                     </div>
                 </form>

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

@@ -897,7 +897,7 @@
                     <div class="modal-footer">
                         <button type="submit" class="btn btn-primary" translate="Confirm"></button>
                         <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
-                                translate="Cancel"></button>
+                                translate="Cancel4Tax"></button>
                     </div>
                 </form>
             </div>
@@ -1146,7 +1146,7 @@
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit_handmade()"></button>
                         <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="closeUploadReview()"
-                                translate="Cancel"></button>
+                                translate="Cancel4Tax"></button>
                     </div>
                 </form>
             </div>
@@ -1391,7 +1391,7 @@
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" translate="Confirm" ng-click="multiUploadSubmit()"></button>
                         <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
-                                translate="Cancel"></button>
+                                translate="Cancel4Tax"></button>
                     </div>
                 </form>
             </div>
@@ -1444,7 +1444,7 @@
                 </div>
                 <div class="modal-footer">
                     <button class="btn btn-primary" translate="Confirm" ng-click="confirmUploadResult()"></button>
-                    <button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel"></button>
+                    <button type="button" class="btn btn-third" ng-if="multiUploadErrorItems.length" data-dismiss="modal" translate="Cancel4Tax"></button>
                 </div>
             </div>
         </div>
@@ -1465,7 +1465,7 @@
                 <div class="modal-footer">
                     <button type="button" class="btn btn-primary" translate="Confirm" ng-click="sniffHelpPopRadio()"></button>
                     <button type="button" class="btn btn-third" data-dismiss="modal" ng-click="cancelDocFileType()"
-                            translate="Cancel"></button>
+                            translate="Cancel4Tax"></button>
                 </div>
             </div>
         </div>