|
|
@@ -3496,8 +3496,8 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
/**
|
|
|
* 委外订单
|
|
|
*/
|
|
|
- app.controller('MakeOrderCtrl', ['$scope', '$filter', 'MakeOrder', 'ngTableParams', 'toaster', 'BaseService',
|
|
|
- function($scope, $filter, MakeOrder, ngTableParams, toaster, BaseService){
|
|
|
+ app.controller('MakeOrderCtrl', ['$scope', '$filter', 'MakeOrder', 'ngTableParams', 'toaster','ReportService', 'BaseService',
|
|
|
+ function($scope, $filter, MakeOrder, ngTableParams, toaster,ReportService, BaseService){
|
|
|
$scope.active = 'all';
|
|
|
$scope.dateZoneText = '不限';
|
|
|
$scope.condition = {dateZone: -1};
|
|
|
@@ -3624,6 +3624,12 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
}
|
|
|
};
|
|
|
|
|
|
+ $scope.print = function(order) {
|
|
|
+ console.log(order.id);
|
|
|
+ MakeOrder.printCount({id: order.id},{});//增加打印此次
|
|
|
+ ReportService.print(order.enUU, 'make', '{make_orders.ma_id}=' + order.id, ' 委外订单-' + order.code);
|
|
|
+ };
|
|
|
+
|
|
|
// 获取回复记录
|
|
|
$scope.getReply = function(order) {
|
|
|
if(!order.replies) {
|
|
|
@@ -3705,6 +3711,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
}
|
|
|
|
|
|
$scope.print = function(order) {
|
|
|
+ console.log(order.id);
|
|
|
MakeOrder.printCount({id: order.id},{});//增加打印此次
|
|
|
ReportService.print(order.enUU, 'make', '{make_orders.ma_id}=' + order.id, ' 委外订单-' + order.code);
|
|
|
};
|