Browse Source

评论:批量回复提示

wangdy 8 years ago
parent
commit
097d4e62e0

+ 1 - 1
src/main/java/com/uas/platform/b2c/trade/order/status/PurchaseStatus.java

@@ -26,7 +26,7 @@ public enum PurchaseStatus {
 	/**
 	 * {@code completed 已完成}
 	 */
-	COMPLETED("completed", "520-522-523"),//520-606
+	COMPLETED("completed", "520"),//520-606
 	/**
 	 * {@code unavailable 已失效}
 	 */

+ 30 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/show_rate_ctrl.js

@@ -84,6 +84,34 @@ define(['app/app'], function(app) {
             // $scope.rateContent.storeid = purchase.storeid;
             // $scope.rateContent.purchaseid = purchase.purchaseid;
             // $scope.rateContent.orderid = purchase.orderid;
+            if(type == 'allRate'){
+                var count= 0 ;
+                if ($scope.order.ratestatus == 523){
+                    angular.forEach($scope.buyerRateGoods,function (item,index) {
+                        if (item.buyerRate != '此用户没有填写评价!'){
+                            if (!item.returnMeg || item.returnMeg =='' ){
+                                item.returnMeg = param.returnMeg;
+                            }else{count++;}
+                        }else{count++;}
+                    })
+                    if (count == $scope.buyerRateGoods.length){
+                        $scope.setShowRateBoxFlag(false);
+                        toaster.pop('warning', '所有商品都已回复完成');
+                        return;
+                    }
+                }else if ($scope.order.ratestatus == 522){
+                    angular.forEach($scope.buyerRateGoods,function (item,index) {
+                        if (item.buyerAfterRate && !item.afterReturnMeg){
+                            item.afterReturnMeg = param.returnMeg;
+                        }else {count++;}
+                    })
+                    if (count == $scope.buyerRateGoods.length){
+                        $scope.setShowRateBoxFlag(false);
+                        toaster.pop('warning', '所有商品都已回复完成');
+                        return;
+                    }
+                }
+            }
             $scope.rateType = type;
             if (detail) {$scope.goodsId = detail.goodsId;
                 Rate.getRateTemplate({storeuuid: detail.storeId},{},function (data) {
@@ -250,7 +278,7 @@ define(['app/app'], function(app) {
                 });
             } else if ($scope.rateType == "allRate") {
                 var count= 0 ;
-                if ($scope.order.status == 523){
+                if ($scope.order.ratestatus == 523){
                     angular.forEach($scope.buyerRateGoods,function (item,index) {
                         if (item.buyerRate != '此用户没有填写评价!'){
                             if (!item.returnMeg || item.returnMeg =='' ){
@@ -263,7 +291,7 @@ define(['app/app'], function(app) {
                         toaster.pop('warning', '所有商品都已回复完成');
                         return;
                     }
-                }else if ($scope.order.status == 522){
+                }else if ($scope.order.ratestatus == 522){
                     angular.forEach($scope.buyerRateGoods,function (item,index) {
                         if (item.buyerAfterRate && !item.afterReturnMeg){
                             item.afterReturnMeg = param.returnMeg;

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1042,8 +1042,8 @@
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">点击发货</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
                                 <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>
-								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) && !purchase.isAfterRate">追加评价</a>
-								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) && !purchase.isFirstRate">评价</a>
+								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isAfterRate && purchase.isFirstRate">追加评价</a>
+								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isFirstRate">评价</a>
 								<!--<div ng-if="purchase.status == 520" class="clock-mind">
                                   <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="purchase.complete + 1728000000 | restTime"></em>&lt;!&ndash;暂时设定30天自动初评&ndash;&gt;
                               </div>