代采订单编辑权限

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -123,12 +123,26 @@ public class DeputyOrderController {
 	 * @param deOrder
 	 * @return
 	 */
-	@RequestMapping(value = "/saveDeOrder", method = RequestMethod.POST)
+	@RequestMapping(value = "/edit/saveDeOrder", method = RequestMethod.POST)
 	public ModelMap saveDeOrder(@RequestBody String deOrder) {
 		DeputyOrder deorder = JSON.parseObject(deOrder, DeputyOrder.class);
+		deorder.setEntrystatus("保存");
 		return deputyOrderService.saveDeOrder(deorder);
 	}
-	
+
+	/**
+	 * 提交代采订单
+	 *
+	 * @param deOrder
+	 * @return
+	 */
+	@RequestMapping(value = "/submit/saveDeOrder", method = RequestMethod.POST)
+	public ModelMap submitDeOrder(@RequestBody String deOrder) {
+		DeputyOrder deorder = JSON.parseObject(deOrder, DeputyOrder.class);
+		deorder.setEntrystatus("已提交");
+		return deputyOrderService.saveDeOrder(deorder);
+	}
+
 	/**
 	 * 买家查看代采订单（全部）
 	 * 
@@ -353,7 +367,7 @@ public class DeputyOrderController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/clearOrder/{id}", method = RequestMethod.DELETE)
+	@RequestMapping(value = "/edit/clearOrder/{id}", method = RequestMethod.POST)
 	private ModelMap clearOrder(@PathVariable Long id) {
 		return deputyOrderService.clearOrder(id);
 	}
@@ -519,7 +533,7 @@ public class DeputyOrderController {
 	 * @param id
 	 * @return
 	 */
-	@RequestMapping(value = "/copyorder/{id}", method = RequestMethod.POST)
+	@RequestMapping(value = "/edit/copyorder/{id}", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap copyOrder(@PathVariable("id") Long id) {
 		return deputyOrderService.copyOrder(id);

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

@@ -16995,7 +16995,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 保存
         $scope.isSave = false;
         $scope.save = function () {
-            $scope.deOrder.entrystatus = '保存';
             checkKeyword();
             if ($scope.checkresult) {
                 $scope.deOrder.totalamount = 0;
@@ -17020,7 +17019,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             toaster.pop('error', '提示', '保存失败');
                         }
                     }, function (response) {
-
+                        toaster.pop('error', '保存失败', response.data);
                     });
                 }
             }
@@ -17029,7 +17028,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 提交
         $scope.isSubmit = false;
         $scope.submit = function () {
-            $scope.deOrder.entrystatus = '已提交';
             checkKeyword();
             if ($scope.checkresult) {
                 $scope.deOrder.totalamount = 0;
@@ -17042,7 +17040,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.deOrder.totalpayament += DecimalNumber.accMul(item.amount, item.unitprice);
                     $scope.deOrder.orderamount += DecimalNumber.accMul(item.amount, item.purcprice);
                 });
-                DeputyOrder.saveDeOrder({}, $scope.deOrder, function (data) {
+                DeputyOrder.submitDeOrder({}, $scope.deOrder, function (data) {
                     if (data.id) {
                         toaster.pop('success', '提示', '提交成功');
                         window.location.hash = "#/purc/deputy/" + data.id;
@@ -17051,7 +17049,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         toaster.pop('error', '提示', '保存失败');
                     }
                 }, function (response) {
-
+                    toaster.pop('error', '保存失败', response.data);
                 });
             }
         }

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

@@ -2,7 +2,11 @@ define(['ngResource'], function() {
 	angular.module('DeputyOrderService', [ 'ngResource']).factory('DeputyOrder', ['$resource', function($resource) {
 		return $resource('deputyOrder', {}, {
 			saveDeOrder: {
-				url: 'deputyOrder/saveDeOrder',
+				url: 'deputyOrder/edit/saveDeOrder',
+				method: 'POST'
+			},
+			submitDeOrder: {
+				url: 'deputyOrder/submit/saveDeOrder',
 				method: 'POST'
 			},
 			getOrderDetail: {
@@ -73,12 +77,12 @@ define(['ngResource'], function() {
             	method: 'GET'
             },
             copyOrder: {
-            	url: 'deputyOrder/copyorder/:id',
+            	url: 'deputyOrder/edit/copyorder/:id',
             	method: 'POST'
             },
             clearOrder: {
-            	url: 'deputyOrder/clearOrder/:id',
-            	method: 'DELETE'
+            	url: 'deputyOrder/edit/clearOrder/:id',
+            	method: 'POST'
             },
             odersAmount: {
             	url: 'deputyOrder/odersAmount',