Bug 23414

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

@@ -133,6 +133,18 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             if ($scope.componentSelectedArea) {
                 editModel.areaID = $scope.selectedAreaId;
             }
+
+            //所属业务线校验
+            if(!editModel.businessUnitID){
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+            //区域校验
+            if (editModel.areaID === "") {
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+
             if ($scope.isAdd) {
                 editModel.isActive = true;
                 orgService.addOrg(editModel).success(function (orgId) {
@@ -277,6 +289,17 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 editModel.areaID = $scope.selectedAreaId;
             }
 
+            //所属业务线校验
+            if(!editModel.businessUnitID){
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+            //区域校验
+            if (editModel.areaID === "") {
+                SweetAlert.error("请检查必填项");
+                return;
+            }
+
             if((typeof $scope.editOrgModel.foundationDate) ==="string"){
                 if (""!==($scope.editOrgModel.foundationDate)) {
                     $scope.editOrgModel.foundationDate = new Date($scope.editOrgModel.foundationDate);

atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js

@@ -908,23 +908,23 @@
                             $state.go('vat.importData.erpImport');
                         } else if (data[constant.vatPermission.dataPreview.trialBalance.queryCode]) {
                             $state.go('vat.previewData.trialBalance');
-                        } else if (data[constant.vatPermission.previewData.profitLoss.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.profitLoss.queryCode]) {
                             $state.go('vat.previewData.profitLoss');
-                        } else if (data[constant.vatPermission.previewData.offBalanceSheet.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.offBalanceSheet.queryCode]) {
                             $state.go('vat.previewData.offBalanceSheet');
-                        } else if (data[constant.vatPermission.previewData.journal.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.journal.queryCode]) {
                             $state.go('vat.previewData.journal');
-                        } else if (data[constant.vatPermission.previewData.cashFlow.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.cashFlow.queryCode]) {
                             $state.go('vat.previewData.cashFlow');
-                        } else if (data[constant.vatPermission.previewData.invoiceRecord.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.invoiceRecord.queryCode]) {
                             $state.go('vat.previewData.invoiceRecord');
-                        } else if (data[constant.vatPermission.previewData.certifiedInvoicesList.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.certifiedInvoicesList.queryCode]) {
                             $state.go('vat.previewData.certifiedInvoicesList');
-                        } else if (data[constant.vatPermission.previewData.redLetterInformationTable.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.redLetterInformationTable.queryCode]) {
                             $state.go('vat.previewData.redLetterInfoTab');
-                        } else if (data[constant.vatPermission.previewData.coupaPurchasingReport.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.coupaPurchasingReport.queryCode]) {
                             $state.go('vat.previewData.coupaPurchasingReport');
-                        } else if (data[constant.vatPermission.previewData.invoiceData.queryCode]) {
+                        } else if (data[constant.vatPermission.dataPreview.invoiceData.queryCode]) {
                             $state.go('vat.previewData.invoiceData');
                         } else if (data[constant.vatPermission.dataManage.caculateDataCode]) {
                             $state.go('vat.reductionData.caculateData');