处理BUG

src/main/webapp/resources/js/common/b2bServices.js

@@ -3103,8 +3103,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
         	}])
         .factory('B2bAccountResource', ['$resource', 'BaseService', function($resource, BaseService) {
             return $resource(BaseService.getB2bUrl() + '/account/resource', {});
-        }]).
-        factory('B2bUser', ['$resource', 'BaseService', function($resource, BaseService) {
+        }]).factory('B2bUser', ['$resource', 'BaseService', function($resource, BaseService) {
             var b2bUrl = BaseService.getB2bUrl();
             return $resource(b2bUrl + '/user/findByUserUUList', {}, {
                 getUsersByUU: {
@@ -3113,5 +3112,136 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                     isArray: true
                 }
             });
-        }])
+        }]).factory('B2bMakeOrder', ['$resource', 'BaseService', function($resource, BaseService) {
+        var b2bPath = BaseService.getB2bUrl();
+        return $resource(b2bPath + '/make/orders/info/search', {}, {
+            getItem: {
+                url: b2bPath + '/make/orders/:id/info',
+                method: 'GET'
+            },
+            reply: {
+                url: b2bPath + '/make/orders/:orderId/reply',
+                method: 'POST',
+                params: {
+                    orderId: 'orderId'
+                }
+            },
+            getReply: {
+                url: b2bPath + '/make/orders/:orderId/reply',
+                method: 'GET',
+                isArray: true,
+                params: {
+                    orderId: 'orderId'
+                }
+            },
+            getTodo: {
+                url: b2bPath + '/make/orders/info/search',
+                method: 'GET',
+                params: {
+                    _state: 'todo'
+                }
+            },
+            getDone: {
+                url: b2bPath + '/make/orders/info/search',
+                method: 'GET',
+                params: {
+                    _state: 'done'
+                }
+            },
+            printCount: {
+                url: b2bPath + '/make/orders/printCount/:id',
+                method: 'POST'
+            },
+            getEnd: {
+                url: b2bPath + '/make/orders/info/search',
+                method: 'GET',
+                params: {
+                    _state: 'end'
+                }
+            },
+            getAll: {},
+            setRead:{
+                url: b2bPath + '/make/orders/setRead',
+                method: 'POST'
+            },
+            setReadByState:{
+                url: b2bPath + '/make/orders/setReadByState',
+                method: 'GET'
+            },
+            getUnreadIds:{
+                url: b2bPath + '/make/orders/getUnreadIds',
+                method: 'GET'
+            },
+            getUnreadCount:{
+                url: b2bPath + '/make/orders/unread',
+                method: 'GET'
+            },
+            exportXls: {
+                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', {}, {
+            reply: {
+                url: b2bPath + '/make/changes/:itemId/reply',
+                method: 'POST',
+                params: {
+                    itemId: 'itemId'
+                }
+            },
+            getAll: {
+                url: b2bPath + '/make/changes/info/search',
+                method: 'GET'
+            },
+            getItem: {
+                url: b2bPath + '/make/changes/:id/info',
+                method: 'GET'
+            },
+            exportXls: {
+                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',{},{
+            getAll: {},
+            exportXls: {
+                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',{},{
+            getAll: {},
+            exportXls: {
+                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', {}, {
+            getReply: {
+                url: b2bPath + '/make/orders/:orderId/reply',
+                method: 'GET',
+                isArray: true,
+                params: {
+                    orderId: 'orderId'
+                }
+            },
+            getAll: {},
+            getItem: {
+                url: b2bPath + '/make/outorders/:id/info',
+                method: 'GET'
+            },
+            exportXls: {
+                url: b2bPath + '/make/outorders/xls/permission',
+                method: 'GET'
+            }
+        })
+    }]);
 });

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

@@ -1,4 +1,4 @@
-define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'common/query/brand', 'common/query/kind', 'common/query/component', 'common/query/goods', 'common/query/rate','common/query/cart', 'common/query/order', 'common/query/address', 'common/query/invoice', 'common/query/property', 'common/query/kindAdvice', 'common/query/propertyAdvice', 'common/query/return' , 'common/query/change', 'common/query/logistics', 'ui.router', 'ui-bootstrap', 'ui-form', 'ui-jquery','angular-toaster', 'ngDraggable', 'angular-sanitize', 'ngTable', 'dynamicInput', 'jquery-imagezoom', 'file-upload', 'file-upload-shim', 'common/query/urlencryption' , 'common/query/purchase', 'common/query/vendor', 'common/query/goods', 'common/query/bankTransfer', 'common/query/enterprise', 'common/query/bill', 'common/query/receipt', 'common/query/collection', 'common/query/express', 'common/query/bankInfo','common/query/charge', 'common/query/statistics', 'common/query/currency', 'jquery-chart', 'common/query/responseLogistics', 'common/query/goodsPrice', 'common/query/address' , 'common/query/search', 'common/query/urlencryption', 'common/query/releaseProInfo', 'common/query/makerDemand', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/logistics', 'common/query/storeInfo', 'common/query/recommendation', 'common/query/user', 'common/query/logisticsPort', 'common/query/cms', 'common/query/material', 'common/query/storeCms', 'common/query/productImport', 'common/query/stockInOut', 'common/module/store_recommend_product', 'common/module/chat_web_module', 'common/query/standardPutOnAdmin', 'common/query/storeViolations', 'common/query/internalMessage', 'common/query/installments','common/query/product','common/query/seekPurchase','common/query/UASBatchPutOnProperty', 'common/query/authority', 'common/query/attendtion', 'common/b2bServices', 'common/services/File', 'common/services/Token', 'common/services/Make'], function(angularAMD) {
+define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'common/query/brand', 'common/query/kind', 'common/query/component', 'common/query/goods', 'common/query/rate','common/query/cart', 'common/query/order', 'common/query/address', 'common/query/invoice', 'common/query/property', 'common/query/kindAdvice', 'common/query/propertyAdvice', 'common/query/return' , 'common/query/change', 'common/query/logistics', 'ui.router', 'ui-bootstrap', 'ui-form', 'ui-jquery','angular-toaster', 'ngDraggable', 'angular-sanitize', 'ngTable', 'dynamicInput', 'jquery-imagezoom', 'file-upload', 'file-upload-shim', 'common/query/urlencryption' , 'common/query/purchase', 'common/query/vendor', 'common/query/goods', 'common/query/bankTransfer', 'common/query/enterprise', 'common/query/bill', 'common/query/receipt', 'common/query/collection', 'common/query/express', 'common/query/bankInfo','common/query/charge', 'common/query/statistics', 'common/query/currency', 'jquery-chart', 'common/query/responseLogistics', 'common/query/goodsPrice', 'common/query/address' , 'common/query/search', 'common/query/urlencryption', 'common/query/releaseProInfo', 'common/query/makerDemand', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/logistics', 'common/query/storeInfo', 'common/query/recommendation', 'common/query/user', 'common/query/logisticsPort', 'common/query/cms', 'common/query/material', 'common/query/storeCms', 'common/query/productImport', 'common/query/stockInOut', 'common/module/store_recommend_product', 'common/module/chat_web_module', 'common/query/standardPutOnAdmin', 'common/query/storeViolations', 'common/query/internalMessage', 'common/query/installments','common/query/product','common/query/seekPurchase','common/query/UASBatchPutOnProperty', 'common/query/authority', 'common/query/attendtion', 'common/b2bServices', 'common/services/File', 'common/services/Token'], function(angularAMD) {
 	'use strict';
 	/**
 	 * 自定义Array对象的属性last 方法
@@ -8,7 +8,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 		return this.length > 0 ? this[this.length - 1] : null;
 	};
 
-	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ui.form', 'ui.jquery', 'toaster', 'ngDraggable', 'tool.directives', 'ngSanitize', 'common.query.kind', 'common.services', 'brandServices', 'componentServices', 'goodsServices',  'rateServices','cartServices', 'orderServices', 'addressServices', 'invoiceServices', 'common.query.propertyAdvice', 'propertyServices', 'returnServices' , 'changeServices',  'logisticsServices', 'common.query.kindAdvice', 'ngTable', 'ngDynamicInput', 'common.directives', 'angularFileUpload', 'urlencryptionServices', 'purchaseServices', 'vendorServices', 'goodsServices', 'bankTransfer', 'common.query.enterprise', 'billServices', 'receiptServices', 'collection', 'expressServices', 'bankInfo','Charge', 'statisticsServices', 'currencyService', 'responseLogisticsService', 'PriceServices', 'addressServices', 'searchService', 'urlencryptionServices', 'ReleaseProductByBatchService', 'makerDemand', 'afterSaleService', 'messageBoardServices', 'logisticsServices', 'table.directives', 'storeInfoServices', 'recommendation', 'common.query.user', 'logisticsPortService', 'cmsService', 'materialServices', 'StoreCmsServices', 'productImportModule', 'stockInOutModule', 'StoreCmsModule', 'WebChatModule', 'StandardPutOnAdminModule', 'StoreViolationsServices', 'internalMessageServices', 'installmentServices','common.query.product', 'ui.tour', 'seekPurchaseServices', 'UASBatchPutOnPropertyModule', 'authorityServices', 'AttendtionServices', 'common.b2bServices', 'FileService', 'TokenService', 'MakeServices'])
+	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ui.form', 'ui.jquery', 'toaster', 'ngDraggable', 'tool.directives', 'ngSanitize', 'common.query.kind', 'common.services', 'brandServices', 'componentServices', 'goodsServices',  'rateServices','cartServices', 'orderServices', 'addressServices', 'invoiceServices', 'common.query.propertyAdvice', 'propertyServices', 'returnServices' , 'changeServices',  'logisticsServices', 'common.query.kindAdvice', 'ngTable', 'ngDynamicInput', 'common.directives', 'angularFileUpload', 'urlencryptionServices', 'purchaseServices', 'vendorServices', 'goodsServices', 'bankTransfer', 'common.query.enterprise', 'billServices', 'receiptServices', 'collection', 'expressServices', 'bankInfo','Charge', 'statisticsServices', 'currencyService', 'responseLogisticsService', 'PriceServices', 'addressServices', 'searchService', 'urlencryptionServices', 'ReleaseProductByBatchService', 'makerDemand', 'afterSaleService', 'messageBoardServices', 'logisticsServices', 'table.directives', 'storeInfoServices', 'recommendation', 'common.query.user', 'logisticsPortService', 'cmsService', 'materialServices', 'StoreCmsServices', 'productImportModule', 'stockInOutModule', 'StoreCmsModule', 'WebChatModule', 'StandardPutOnAdminModule', 'StoreViolationsServices', 'internalMessageServices', 'installmentServices','common.query.product', 'ui.tour', 'seekPurchaseServices', 'UASBatchPutOnPropertyModule', 'authorityServices', 'AttendtionServices', 'common.b2bServices', 'FileService', 'TokenService'])
     app.directive('onFinishRenderFilters', function ($timeout) {
         return {
             restrict: 'A',

src/main/webapp/resources/js/vendor/controllers/b2b/saleMaketodoCtrl.js

@@ -4,8 +4,8 @@
  */
 define(['app/app'], function (app) {
     "use strict";
-    app.register.controller('saleMaketodoCtrl', ['BaseService', '$rootScope','$scope', '$filter', 'B2bMakeOrder', 'ngTableParams', 'toaster', 'B2bReportService', 'BaseService', 'B2bSearchFilter', '$http', 'B2bCurrentRole',
-        function (BaseService, $rootScope, $scope, $filter, MakeOrder, ngTableParams, toaster, ReportService, BaseService, SearchFilter, $http, B2bCurrentRole) {
+    app.register.controller('saleMaketodoCtrl', ['BaseService', '$rootScope','$scope', '$filter', 'B2bMakeOrder', 'ngTableParams', 'toaster', 'B2bReportService', 'B2bSearchFilter', '$http', 'B2bCurrentRole',
+        function (BaseService, $rootScope, $scope, $filter, MakeOrder, ngTableParams, toaster, ReportService, SearchFilter, $http, B2bCurrentRole) {
           $rootScope.active = 'vendor_order'
           $scope.tab = 'maketodo'
             var b2bUrl = BaseService.getB2bUrl()