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

pom.xml

@@ -9,7 +9,6 @@
 		<groupId>com.uas.platform</groupId>
 		<artifactId>platform</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../platform</relativePath>
 	</parent>
 	<profiles>
 		<profile>
@@ -350,12 +349,10 @@
 					</execution>
 				</executions>
 				<configuration>
-					<configuration>
-						<format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
-						<items>
-							<item>timestamp</item>
-						</items>
-					</configuration>
+					<format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -449,7 +446,7 @@
 								<sourceInclude>resources/tpl/**/*.html</sourceInclude>
 								<sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
 							</sourceIncludes>
-							http://static.ubtob.com/css/index.css?_v=1450321871828
+							<!--http://static.ubtob.com/css/index.css?_v=1450321871828-->
 							<versionSuffix>
 								<suffix>?_v=${timestamp}</suffix>
 								<exclude>*/require.js,*.min.js,*.min.css</exclude>

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 = window.location.origin + window.location.pathname + 'vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -2842,7 +2842,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='+angular.toJson($scope.searchFilterXls);
+                        window.location.href = window.location.origin + window.location.pathname + '/sale/orders/purc/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);
@@ -3269,7 +3269,8 @@ 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='+angular.toJson($scope.searchFilterXls);
+
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -3553,7 +3554,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -3939,7 +3940,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -4911,7 +4912,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -5736,7 +5737,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/mould/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -6071,7 +6072,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/quotation/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -7780,7 +7781,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/sample/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8150,7 +8151,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/accept/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8296,7 +8297,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/return/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8435,7 +8436,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/badIn/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8548,7 +8549,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/badOut/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -8657,7 +8658,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/MRB/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -9685,7 +9686,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/sale/apCheck/xls/list?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -11783,7 +11784,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='+angular.toJson($scope.searchFilterXls);
+                        window.location.href = window.location.origin + window.location.pathname + '/make/orders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                     }
                 }, function (response) {
                     toaster.pop('error', '数据加载失败', response.data);
@@ -12252,7 +12253,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/make/changes/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
@@ -12427,7 +12428,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='+angular.toJson($scope.searchFilterXls);
+                    window.location.href = window.location.origin + window.location.pathname + '/make/outorders/xls?_state='+$scope.active+'&searchFilter='+encodeURIComponent(angular.toJson($scope.searchFilterXls));
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/index/services/Product.js

@@ -154,11 +154,11 @@ define([ 'ngResource'], function() {
 				method: 'POST'
 			},
 			matchbytype: {
-				url: '/purcProduct/edit/matchbytype/:type',
+				url: 'purcProduct/edit/matchbytype/:type',
 				method: 'POST'
 			},
 			exportXls: {
-				url: '/purcProduct/xls/permission',
+				url: 'purcProduct/xls/permission',
 				method: 'GET'
 			}
 		})

src/main/webapp/resources/js/index/services/Purc.js

@@ -225,7 +225,7 @@ define([ 'ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: '/sale/orders/purc/xls/permission',
+				url: 'sale/orders/purc/xls/permission',
 				method: 'GET'
 			}
 		});