Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

Dev oracle sherlock

See merge request root/atms!164

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -4,6 +4,12 @@ jdbc_password=taxadmin2018
 #jdbc_password=111111
 jdbc_admin_db=tax_admin
 
+#jdbc_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
+#jdbc_user=tax_admin_longi
+#jdbc_password=tax_admin_longi
+##jdbc_password=111111
+#jdbc_admin_db=tax_admin_longi
+
 jdbc2_url=jdbc:oracle:thin:@10.158.230.144:11521:XE
 jdbc2_user=pwc_invoice
 jdbc2_password=pwc_invoice

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

@@ -155,9 +155,12 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             }
             //事业部
             if ($scope.selectBusinessUnit) {
-                editModel.businessUnitID = $scope.selectBusinessUnit.id;
+                editModel.businessUnitID = $scope.selectBusinessUnit.ID;
+            }
+            //区域
+            if ($scope.selectedArea) {
+                editModel.areaID = $scope.selectedArea.ID;
             }
-
 
             //账套
             if ($scope.orgAccountList) {

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

@@ -41,27 +41,58 @@
                     }
 
                     if ($scope.hasTaxReturnPermission && $scope.hasQueryTaxReturnPermission) {
+                        // var templates = _.chain
                         // 获取 申报表 Report Template
                         var taxRtnGrp = {
                             name: 'TaxReturn',
-                            children: _.map(result[1].data.data, function (x) {
-                                //if (x.templateID === $scope.selectedTemplateId) {
-                                //    $state.go('vat.generateReport.reportView', { id: x.id, templateid: x.templateID, name: x.templateName });
-                                //}
+                            children: _.chain(result[1].data.data)
+                                .sortBy(function(x){
+                                    return x.templateName;
+                                })
+                                .map(function(x){
+                                    var nameIndex;
+                                    var tempName = x.templateName.substr(x.templateName.length - 4);
+                                    if(tempName.search("一") != -1){
+                                        nameIndex = 0;
+                                    } else if(tempName.search("二") != -1){
+                                        nameIndex = 1;
+                                    } else if(tempName.search("三") != -1){
+                                        nameIndex = 2;
+                                    } else if(tempName.search("四") != -1){
+                                        nameIndex = 3;
+                                    } else if(tempName.search("五") != -1){
+                                        nameIndex = 4;
+                                    } else {
+                                        nameIndex = 10;
+                                    }
+                                   return {
+                                        id:x.id,
+                                        templateId:x.templateId,
+                                        templateName:x.templateName,
+                                        templateCode:x.templateCode,
+                                        nameIndex:nameIndex
+                                    }
+                                })
+                                .sortBy(function(x){
+                                    return x.nameIndex;
+                                })
+                                .map(function (x) {
                                 return {
                                     reportId: x.id,
                                     id: x.templateId,
                                     name: x.templateName,
                                     code: x.templateCode
                                 };
-                            }),
+                            }).value(),
                             orderIndex: grps.length
                         };
                         grps.push(taxRtnGrp);
                     }
 
                     $scope.groups = _.chain(grps).sortBy(function (x) {
-                        return x.orderIndex
+
+                        return x.orderIndex;
+                        // return x.children.name;
                     }).map(function (x) {
                         x.isExpand = true;
                         return x;