修改买卖家订单中心删除订单的逻辑

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_order_ctrl.js

@@ -239,6 +239,16 @@ define(['app/app'], function (app) {
 			});
 		};
 
+		//取消订单状态码
+		$scope.cancelOrderArray = {
+			602: true,
+			603: true,
+			315: true,
+			604: true,
+			605: true,
+			606: true
+		};
+
 		var getRecommendComps = function (userUU, usedFor, pageable) {
 			Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
 				$scope.recommendComps = data.content;

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -853,6 +853,16 @@ define(['app/app'], function (app) {
             $scope.orderTableParams.reload();
         };
 
+        //取消订单状态码
+        $scope.cancelOrderArray = {
+            602: true,
+            603: true,
+            315: true,
+            604: true,
+            605: true,
+            606: true
+        };
+
         //当前页在前段的计算方式
         $scope.frontSegment = function (currentPage, totalElementPages) {
             angular.forEach($scope.pages, function (page) {

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -702,7 +702,7 @@
                                  <div style="display: none;" class="send-button"><a class="send">发送</a></div>
                             </div>
                         </span>
-						<span class="trash" ng-if="order.status == '603'" ng-click="showDeleteOrder(order)"><i class="fa fa-trash"></i></span>
+						<span class="trash" ng-if="cancelOrderArray[order.status]" ng-click="showDeleteOrder(order)"><i class="fa fa-trash"></i></span>
 						<div class="com-del-box" ng-if="order.showDelete">
 							<div class="title">
 								<a ng-click="order.showDelete=false"><i class="fa fa-close fa-lg"></i></a>

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -772,7 +772,7 @@
 								<a ng-click="print(purchase, 'SALESEND_ADMIN')" title="打印出货单"><i class="fa fa-print fa-lg"></i>打印出货单</a>
 							</div>
 						</span>
-						<span class="trash" ng-if="purchase.status=='603' || purchase.status=='606'" ng-click="showDeletePurchase(purchase)"><i class="fa fa-trash"></i></span>
+						<span class="trash" ng-if="cancelOrderArray[purchase.status]" ng-click="showDeletePurchase(purchase)"><i class="fa fa-trash"></i></span>
 						<div class="com-del-box" ng-if="purchase.showDelete">
 							<div class="title">
 								<a ng-click="purchase.showDelete=false"><i class="fa fa-close fa-lg"></i></a>