Merge remote-tracking branch 'origin/dev' into authority

src/main/webapp/resources/js/index/app.js

@@ -2042,7 +2042,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             VendorService.exportXls.get({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + 'vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
+                    window.location.href = 'vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -2845,7 +2845,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.exportXls = function () {
                 PurcOrders.exportXls({}, {}, function (data) {
                     if (data.success){
-                        window.location.href = window.location.origin + window.location.pathname + '/sale/orders/purc/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                        window.location.href = 'sale/orders/purc/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);
@@ -3273,8 +3273,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcOrderItem.exportXls({}, {}, function (data) {
                 if (data.success){
-
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -3560,7 +3559,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcChange.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -3946,7 +3945,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcInquiry.exportXls({}, {}, function (data) {
                 if (data.success) {
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -4918,7 +4917,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurchaseInquiry.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -5743,7 +5742,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcInquiryMould.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/mould/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/mould/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -6078,7 +6077,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             Quotation.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/quotation/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/quotation/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -6874,7 +6873,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcNotice.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/notice/xls?_state='+$scope.active+
+                    window.location.href = 'sale/notice/xls?_state='+$scope.active+
                         '&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
@@ -7106,7 +7105,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             SaleSend.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/notice/sends/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = 'sale/notice/sends/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || '')+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -7845,7 +7844,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcSample.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/sample/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/sample/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8014,7 +8013,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcApproval.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/sample/approval/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = 'sale/sample/approval/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8215,7 +8214,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcAccept.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/accept/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/accept/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8361,7 +8360,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcReturn.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/return/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/return/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8500,7 +8499,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcBadIn.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/badIn/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/badIn/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8613,7 +8612,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcBadOut.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/badOut/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/badOut/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8722,7 +8721,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcMRB.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/MRB/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/MRB/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -9403,7 +9402,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             FaApBill.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/apBill/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = 'sale/apBill/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -9752,7 +9751,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             FaApCheck.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -11850,7 +11849,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.exportXls = function () {
                 MakeOrder.exportXls({}, {}, function (data) {
                     if (data.success){
-                        window.location.href = window.location.origin + window.location.pathname + '/make/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                        window.location.href = 'make/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);
@@ -12055,7 +12054,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeAccept.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/make/accept/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = 'make/accept/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12176,7 +12175,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeReturn.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/make/return/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                    window.location.href = 'make/return/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12319,7 +12318,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeChange.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/make/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'make/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12494,7 +12493,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             MakeOutOrder.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/make/outorders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
+                    window.location.href = 'make/outorders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12981,7 +12980,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             GetProductInfo.exportXls({},{}, function (data) {
                 if (data.success) {
-                    window.location.href = window.location.origin + window.location.pathname + '/product/baseInfo/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
+                    window.location.href = 'product/baseInfo/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -21492,7 +21491,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.exportXls = function () {
             PurcProduct.exportXls({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = window.location.origin + window.location.pathname + '/purcProduct/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
+                    window.location.href = 'purcProduct/xls?_state='+$scope.active+'&keyword='+ ($scope.keywordXls || "");
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);