|
@@ -299,17 +299,19 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
$scope.notices.splice(index, 1);
|
|
$scope.notices.splice(index, 1);
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
- $scope.$watch($scope.notices, function(data) {
|
|
|
|
|
|
|
+ $scope.$watch(function(){
|
|
|
|
|
+ return $scope.notices;
|
|
|
|
|
+ }, function(data) {
|
|
|
var q = 0, t = 0;
|
|
var q = 0, t = 0;
|
|
|
if(data) {
|
|
if(data) {
|
|
|
- angular.forEach(function(d){
|
|
|
|
|
- q += d.qty;
|
|
|
|
|
- t += d.qty * d.price;
|
|
|
|
|
|
|
+ angular.forEach(data,function(d){
|
|
|
|
|
+ q += d.thisSendQty;
|
|
|
|
|
+ t += d.thisSendQty * d.orderItem.price;
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
$scope.totalQty = q;
|
|
$scope.totalQty = q;
|
|
|
$scope.total = t;
|
|
$scope.total = t;
|
|
|
- });
|
|
|
|
|
|
|
+ }, true);
|
|
|
$scope.cancel = function() {
|
|
$scope.cancel = function() {
|
|
|
$modalInstance.close();
|
|
$modalInstance.close();
|
|
|
};
|
|
};
|