|
|
@@ -366,7 +366,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
});
|
|
|
};
|
|
|
}]);
|
|
|
- app.controller('TruckModalCtrl', ['$scope', '$rootScope', '$modalInstance', 'SaleTruck', 'PurcNotice', 'toaster', function($scope, $rootScope, $modalInstance, SaleTruck, PurcNotice, toaster){
|
|
|
+ app.controller('TruckModalCtrl', ['$scope', '$rootScope', '$modalInstance', 'SaleTruck', 'PurcNotice', 'toaster', '$state', function($scope, $rootScope, $modalInstance, SaleTruck, PurcNotice, toaster, $state){
|
|
|
$scope.saleSend = {sendItems: []};
|
|
|
SaleTruck.detail({}, function(data){
|
|
|
$scope.notices = data;
|
|
|
@@ -421,8 +421,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
sendItems: items
|
|
|
});
|
|
|
PurcNotice.sendByBatch({}, send, function(data){
|
|
|
- toaster.pop('success', '提示', '发货成功。');
|
|
|
+ toaster.pop('success', '提示', '发货成功，跳转至发货单：' + send.code);
|
|
|
$modalInstance.close(true);
|
|
|
+ $state.go('sale.send_detail', {id: data.id});
|
|
|
}, function(response){
|
|
|
toaster.pop('error', '错误', response.data);
|
|
|
});
|
|
|
@@ -1627,7 +1628,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
}]);
|
|
|
|
|
|
// 发货提醒
|
|
|
- app.controller('SaleNoticeCtrl', ['$scope', '$rootScope', '$filter', 'PurcNotice', 'ngTableParams', 'toaster', 'BaseService', 'PurcNoticeHis', '$modal', 'SaleTruck', 'Symbol', function($scope, $rootScope, $filter, PurcNotice, ngTableParams, toaster, BaseService, PurcNoticeHis, $modal, SaleTruck, Symbol){
|
|
|
+ app.controller('SaleNoticeCtrl', ['$scope', '$rootScope', '$filter', 'PurcNotice', 'ngTableParams', 'toaster', 'BaseService', 'PurcNoticeHis', '$modal', 'SaleTruck', 'Symbol', '$state', function($scope, $rootScope, $filter, PurcNotice, ngTableParams, toaster, BaseService, PurcNoticeHis, $modal, SaleTruck, Symbol, $state){
|
|
|
$scope.active = 'todo';
|
|
|
$scope.currency = Symbol.currency;
|
|
|
$scope.dateZoneText = '不限';
|
|
|
@@ -1715,13 +1716,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
} else {
|
|
|
var send = {code: notice.send.code, remark: notice.send.remark, sendItems: [{qty: notice.send.qty}]};
|
|
|
$scope.loading = true;
|
|
|
- PurcNotice.save({id: notice.id}, send, function(){
|
|
|
+ PurcNotice.save({id: notice.id}, send, function(data){
|
|
|
$scope.loading = false;
|
|
|
- toaster.pop('success', '提示', '发货成功');
|
|
|
- $scope.tableParams.reload();
|
|
|
+ toaster.pop('success', '提示', '发货成功，跳转至发货单：' + notice.send.code);
|
|
|
+ $state.go('sale.send_detail', {id: data.id});
|
|
|
}, function(response){
|
|
|
$scope.loading = false;
|
|
|
- toaster.pop('error', '失败', response.data);
|
|
|
+ toaster.pop('error', '发货失败', response.data);
|
|
|
});
|
|
|
}
|
|
|
};
|
|
|
@@ -1753,7 +1754,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
$scope.sendByBatch = function(){
|
|
|
var modalInstance = $modal.open({
|
|
|
animation: true,
|
|
|
- templateUrl: 'sendByBatch.html',
|
|
|
+ templateUrl: 'static/tpl/index/sale/sendByBatch.html',
|
|
|
controller: 'SaleNoticeSendByBatchCtrl',
|
|
|
size: 'lg',
|
|
|
resolve: {
|
|
|
@@ -1826,7 +1827,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
data && ($scope.tableParams.reload());
|
|
|
}, true);
|
|
|
}]);
|
|
|
- app.controller('SaleNoticeSendByBatchCtrl', ['$scope', '$modalInstance', 'Symbol', 'selectedNotices', 'PurcNotice', 'toaster', function($scope, $modalInstance, Symbol, selectedNotices, PurcNotice, toaster){
|
|
|
+ app.controller('SaleNoticeSendByBatchCtrl', ['$scope', '$modalInstance', 'Symbol', 'selectedNotices', 'PurcNotice', 'toaster', '$state', function($scope, $modalInstance, Symbol, selectedNotices, PurcNotice, toaster, $state){
|
|
|
$scope.notices = angular.copy(selectedNotices);
|
|
|
$scope.currency = Symbol.currency;//将币别转化为对应的符号
|
|
|
$scope.saleSend = {
|
|
|
@@ -1840,6 +1841,21 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
|
|
|
};
|
|
|
|
|
|
+ // 计算总数、总额
|
|
|
+ $scope.$watch(function(){
|
|
|
+ return $scope.notices;
|
|
|
+ }, function(data) {
|
|
|
+ var q = 0, t = 0;
|
|
|
+ if(data) {
|
|
|
+ angular.forEach(data,function(d){
|
|
|
+ q += d.thisSendQty;
|
|
|
+ t += d.thisSendQty * d.orderItem.price;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ $scope.totalQty = q;
|
|
|
+ $scope.total = t;
|
|
|
+ }, true);
|
|
|
+
|
|
|
/**
|
|
|
* 删除一个已选中的送货提醒
|
|
|
*/
|
|
|
@@ -1877,8 +1893,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
toaster.pop('error', '错误', '只有客户一致、币别一致、付款方式一致才能一起发货。');
|
|
|
} else {
|
|
|
PurcNotice.sendByBatch({}, $scope.saleSend, function(data){
|
|
|
- toaster.pop('success', '提示', '批量发货成功。');
|
|
|
+ toaster.pop('success', '提示', '发货成功，跳转至发货单：' + $scope.saleSend.code);
|
|
|
$modalInstance.close('success');
|
|
|
+ $state.go('sale.send_detail', {id: data.id});
|
|
|
}, function(response){
|
|
|
toaster.pop('error', '错误', response.data);
|
|
|
});
|
suntg