wangcz 7 سال پیش
والد
کامیت
1ff2cd685f
2فایلهای تغییر یافته به همراه29 افزوده شده و 30 حذف شده
  1. 0 1
      src/main/webapp/resources/js/common/services/File.js
  2. 29 29
      src/main/webapp/resources/js/common/services/Make.js

+ 0 - 1
src/main/webapp/resources/js/common/services/File.js

@@ -84,7 +84,6 @@ define([ 'ngResource'], function() {
               document.documentElement.innerHTML = "Error:" + strHtmInstall + document.documentElement.innerHTML;
             return LODOP;
           }
-          ;
         }
       }
     })

+ 29 - 29
src/main/webapp/resources/js/common/services/Make.js

@@ -2,20 +2,20 @@ define([ 'ngResource'], function() {
 	angular.module('MakeServices', [ 'ngResource'
 	]).factory('B2bMakeOrder', ['$resource', 'BaseService', function($resource, BaseService) {
     var b2bPath = BaseService.getB2bUrl();
-		return $resource(b2bPath + 'make/orders/info/search', {}, {
+		return $resource(b2bPath + '/make/orders/info/search', {}, {
 			getItem: {
-				url: b2bPath +  'make/orders/:id/info',
+				url: b2bPath + '/make/orders/:id/info',
 				method: 'GET'
 			},
 			reply: {
-				url: b2bPath + 'make/orders/:orderId/reply',
+				url: b2bPath + '/make/orders/:orderId/reply',
 				method: 'POST',
 				params: {
 					orderId: 'orderId'
 				}
 			}, 
 			getReply: {
-				url: b2bPath + 'make/orders/:orderId/reply',
+				url: b2bPath + '/make/orders/:orderId/reply',
 				method: 'GET',
 				isArray: true,
 				params: {
@@ -23,25 +23,25 @@ define([ 'ngResource'], function() {
 				}
 			},	
 			getTodo: {
-				url: b2bPath + 'make/orders/info/search',
+				url: b2bPath + '/make/orders/info/search',
 				method: 'GET',
 				params: {
 					_state: 'todo'
 				}
 			},
 			getDone: {
-				url: b2bPath + 'make/orders/info/search',
+				url: b2bPath + '/make/orders/info/search',
 				method: 'GET',
 				params: {
 					_state: 'done'
 				}
 			},
 			printCount: {
-				url: b2bPath + 'make/orders/printCount/:id',
+				url: b2bPath + '/make/orders/printCount/:id',
 				method: 'POST'
 			},
 			getEnd: {
-				url: b2bPath + 'make/orders/info/search',
+				url: b2bPath + '/make/orders/info/search',
 				method: 'GET',
 				params: {
 					_state: 'end'
@@ -49,72 +49,72 @@ define([ 'ngResource'], function() {
 			},
 			getAll: {},
 			setRead:{
-				url: b2bPath + 'make/orders/setRead',
+				url: b2bPath + '/make/orders/setRead',
 				method: 'POST'
 			},
 			setReadByState:{
-				url: b2bPath + 'make/orders/setReadByState',
+				url: b2bPath + '/make/orders/setReadByState',
 				method: 'GET'
 			},
 			getUnreadIds:{
-				url: b2bPath + 'make/orders/getUnreadIds',
+				url: b2bPath + '/make/orders/getUnreadIds',
 				method: 'GET'
 			},
 			getUnreadCount:{
-				url: b2bPath + 'make/orders/unread',
+				url: b2bPath + '/make/orders/unread',
 				method: 'GET'
 			},
 			exportXls: {
-				url: b2bPath + 'make/orders/xls/permission',
+				url: b2bPath + '/make/orders/xls/permission',
 				method: 'GET'
 			}
 		});
 	}]).factory('B2bMakeChange', ['$resource', 'BaseService', function($resource, BaseService) {
     var b2bPath = BaseService.getB2bUrl();
-		return $resource(b2bPath + 'make/changes/info/search', {}, {
+		return $resource(b2bPath + '/make/changes/info/search', {}, {
 			reply: {
-				url: b2bPath + 'make/changes/:itemId/reply',
+				url: b2bPath + '/make/changes/:itemId/reply',
 				method: 'POST',
 				params: {
 					itemId: 'itemId'
 				}
 			},
 			getAll: {
-				url: b2bPath + 'make/changes/info/search',
-				method: 'GET',
+				url: b2bPath + '/make/changes/info/search',
+				method: 'GET'
 			},
 			getItem: {
-				url: b2bPath + 'make/changes/:id/info',
-				method: 'GET',
+				url: b2bPath + '/make/changes/:id/info',
+				method: 'GET'
 			},
 			exportXls: {
-				url: b2bPath + 'make/changes/xls/permission',
-				method: 'GET',
+				url: b2bPath + '/make/changes/xls/permission',
+				method: 'GET'
 			}
 		});
 	}]).factory('B2bMakeAccept',['$resource', 'BaseService', function($resource, BaseService){
     var b2bPath = BaseService.getB2bUrl();
-		return $resource(b2bPath + 'make/accept/:id',{},{
+		return $resource(b2bPath + '/make/accept/:id',{},{
 			getAll: {},
 			exportXls: {
-				url: b2bPath + 'make/accept/xls/permission',
+				url: b2bPath + '/make/accept/xls/permission',
 				method: 'GET'
 			}
 		});
 	}]).factory('B2bMakeReturn',['$resource', 'BaseService', function($resource, BaseService){
     var b2bPath = BaseService.getB2bUrl();
-		return $resource(b2bPath + 'make/return/:id',{},{
+		return $resource(b2bPath + '/make/return/:id',{},{
 			getAll: {},
 			exportXls: {
-				url: b2bPath + 'make/return/xls/permission',
+				url: b2bPath + '/make/return/xls/permission',
 				method: 'GET'
 			}
 		});
 	}]).factory('B2bMakeOutOrder', ['$resource', 'BaseService', function($resource, BaseService){
     var b2bPath = BaseService.getB2bUrl();
-		return $resource(b2bPath + 'make/outorders/info/search', {}, {
+		return $resource(b2bPath + '/make/outorders/info/search', {}, {
             getReply: {
-                url: b2bPath + 'make/orders/:orderId/reply',
+                url: b2bPath + '/make/orders/:orderId/reply',
                 method: 'GET',
                 isArray: true,
                 params: {
@@ -123,11 +123,11 @@ define([ 'ngResource'], function() {
             },
 			getAll: {},
 			getItem: {
-				url: b2bPath + 'make/outorders/:id/info',
+				url: b2bPath + '/make/outorders/:id/info',
 				method: 'GET'
 			},
 			exportXls: {
-				url: b2bPath + 'make/outorders/xls/permission',
+				url: b2bPath + '/make/outorders/xls/permission',
 				method: 'GET'
 			}
 		})