Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-web/src/main/webapp/Scripts/module-part1.js

@@ -562,9 +562,10 @@ var vatModule = angular.module('app.vat', ['ui.grid', 'ui.grid.selection', 'ui.g
 		        url: '/previewData',
 		        views: {
 		            '@vat': {
-		                controller: ['$scope', '$stateParams', 'appTranslation',
-													function ($scope, $stateParams, appTranslation) {
+		                controller: ['$scope', '$stateParams', 'appTranslation','$state',
+													function ($scope, $stateParams, appTranslation,$state) {
 													    appTranslation.load([appTranslation.vat]);
+													    $state.go('vat.previewData.trialBalance');
 													}],
 		                template: '<vat-import-layout></vat-import-layout>',
 		            }

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

 {
-	"WelcomeATMS-Longi":"欢迎使用ATMS申报系统管理"
+	"WelcomeATMS-Longi":"欢迎使用DTS申报系统管理"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.ctrl.js

@@ -802,6 +802,7 @@
                     allowColumnResizing: true,
                     columnAutoWidth: true,
                     showRowLines: true,
+                    allowColumnReordering:true,
                     showColumnLines: true,
                     rowAlternationEnabled: true,  //单双行颜色
                     noDataText: $translate.instant('NoDataText'),

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -415,10 +415,10 @@
                                                        class="has-error label" style="margin-left: -16px">
                                                         {{resources.OrganizationMsgProvinceRequired}}</p>
                                                 </div>
-                                                <div class="col-sm-6" style="padding-left: 2px;"
+                                                <div class="col-sm-6" style="padding-left: 10px;"
                                                      ng-class="{'has-error':orgControlForm.selectCity.$invalid && (orgControlForm.selectCity.$dirty || orgControlForm.$submitted)}">
                                                     <select class="form-control localRequired" name="selectCity" id="selectCity"
-                                                            style="width: 120px; " ng-model="selectRegionID" >
+                                                            style="width: 130px; " ng-model="selectRegionID" >
                                                         <option value="">{{pleaseSelect}}</option>
                                                         <option ng-repeat="x in CityList" value="{{x.regionID}}"
                                                                 title="{{x.regionName}}">{{x.regionName |

atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js

@@ -20,26 +20,6 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
         $scope.nodeDicKey = constant.DictionaryDictKey.DataImport;
         $scope.linkShort = enums.linkShort.PreviewData;
         $scope.menus = [
-            {
-                name: 'balanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
-                text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: false
-            },
-//                {
-//                    name: 'accountVoucher', permission: constant.vatPermission.dataPreview.accountVoucher.queryCode,
-//                    text: $translate.instant('accountVoucher'), icon: 'fa fa-columns', show: true
-//                },
-            {
-                name: 'inputInvoice', permission: constant.vatPermission.dataPreview.inputInvoice.queryCode,
-                text: $translate.instant('inputInvoice'), icon: 'fa fa-file-text-o', show: false
-            },
-            {
-                name: 'outputInvoice', permission: constant.vatPermission.dataPreview.outputInvoice.queryCode,
-                text: $translate.instant('outputInvoice'), icon: 'fa fa-file-text-o', show: false
-            },
-             {
-                name: 'outputoffInvoice', permission: constant.vatPermission.dataPreview.outputInvoice.queryCode,
-                text: $translate.instant('offlineBilling'), icon: 'fa fa-file-text-o', show: false
-            },
              {
                 name: 'trialBalance', permission: constant.vatPermission.dataPreview.trialBalance.queryCode,
                 text: $translate.instant('trialBalance'), icon: 'fa fa-file-text-o', show: true
@@ -87,6 +67,26 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
              {
                 name: 'quarterlyOwnersEquityChangeTab', permission: constant.vatPermission.dataPreview.quarterlyOwnersEquityChangeTable.queryCode,
                 text: $translate.instant('quarterlyOwnersEquityChangeTable'), icon: 'fa fa-file-text-o', show: false
+            },
+            {
+                name: 'balanceSheet', permission: constant.vatPermission.dataPreview.balanceSheet.queryCode,
+                text: $translate.instant('balanceSheet'), icon: 'fa fa-bank', show: false
+            },
+//                {
+//                    name: 'accountVoucher', permission: constant.vatPermission.dataPreview.accountVoucher.queryCode,
+//                    text: $translate.instant('accountVoucher'), icon: 'fa fa-columns', show: true
+//                },
+            {
+                name: 'inputInvoice', permission: constant.vatPermission.dataPreview.inputInvoice.queryCode,
+                text: $translate.instant('inputInvoice'), icon: 'fa fa-file-text-o', show: false
+            },
+            {
+                name: 'outputInvoice', permission: constant.vatPermission.dataPreview.outputInvoice.queryCode,
+                text: $translate.instant('outputInvoice'), icon: 'fa fa-file-text-o', show: false
+            },
+            {
+                name: 'outputoffInvoice', permission: constant.vatPermission.dataPreview.outputInvoice.queryCode,
+                text: $translate.instant('offlineBilling'), icon: 'fa fa-file-text-o', show: false
             },
              {
                 name: 'directMethodCashFlowStatement', permission: constant.vatPermission.dataPreview.directMethodCashFlowStatement.queryCode,