Browse Source

【采购单】采购单详情页前台controller回复方法加入token验证,之前因为未加入token而回复无效。

dongbw 8 years ago
parent
commit
891719eb3b

+ 22 - 10
src/main/webapp/resources/js/index/app.js

@@ -3261,7 +3261,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
     }]);
-    app.controller('SaleOrderDetailCtrl', ['$scope', '$stateParams', 'PurcOrder', 'PurcOrderItem', 'toaster', 'ReportService', 'CurrentRole', function ($scope, $stateParams, PurcOrder, PurcOrderItem, toaster, ReportService, CurrentRole) {
+    app.controller('SaleOrderDetailCtrl', ['$scope', '$stateParams', 'PurcOrder', 'PurcOrderItem', 'toaster', 'ReportService', 'CurrentRole', 'token',function ($scope, $stateParams, PurcOrder, PurcOrderItem, toaster, ReportService, CurrentRole, token) {
         // 获取当前用户是否为普通用户
         CurrentRole.isUser({}, {}, function (data) {
             $scope.isUser = data.isUser;
@@ -3301,9 +3301,19 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             item[openParam] = !item[openParam];
         };
 
+        // 获取token信息
+        var getToken = function() {
+            token.info({userType: 'sale'}, {}, function(data) {
+                $scope.token = data.token;
+            }, function(response) {
+                toaster.pop('error', '提示', response.data);
+            });
+        };
+        getToken();
+
         $scope.onReplyClick = function (item, inverse) {
             if (item.reply) {
-                if (!item.reply.qty || item.reply.qty < 0 || item.reply.qty > item.qty) {
+                if (!item.reply.qty || item.reply.qty < 0 /*|| item.reply.qty > item.qty*/) {
                     toaster.pop('warning', '提示', '请填写有效的回复数量!');
                     return;
                 }
@@ -3316,14 +3326,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
                 if (inverse && inverse == -1) reply.qty = -1 * reply.qty;// 取相反
                 $scope.loading = true;
-                PurcOrderItem.reply({orderItemId: item.id}, reply, function () {
-                    $scope.loading = false;
-                    toaster.pop('info', '提示', (inverse == -1 ? '撤销成功' : '回复成功'));
-                    loadData();
-                }, function (response) {
-                    $scope.loading = false;
-                    toaster.pop('error', '回复失败', response.data);
-                });
+                if($scope.token != null) {
+                    PurcOrderItem.reply({orderItemId: item.id, token: $scope.token}, reply, function () {
+                        $scope.loading = false;
+                        toaster.pop('info', '提示', (inverse == -1 ? '撤销成功' : '回复成功'));
+                        $scope.tableParams.reload();
+                    }, function (response) {
+                        $scope.loading = false;
+                        toaster.pop('error', '回复失败', response.data);
+                    });
+                }
             }
         };
 

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -234,7 +234,7 @@
 											<i class="fa fa-arrow-up"></i> 确认回复
 										</a>
 										<br>
-										<a ng-click="onReplyClick(item, -1)" class="text-muted" title="减去已回复数量">
+										<a ng-if="item.replyQty"  ng-click="onReplyClick(item, -1)" class="text-muted" title="减去已回复数量">
 											<i class="fa fa-arrow-down"></i> 撤销回复</a>
 									</div>
 								</div>