|
|
@@ -12863,7 +12863,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
/**
|
|
|
* 新增采购单
|
|
|
*/
|
|
|
- app.controller('PurcNewOrderCtrl', ['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', '$http', '$window', function ($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor, $http, $window) {
|
|
|
+ app.controller('PurcNewOrderCtrl', ['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', '$http', '$window', 'token', function ($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor, $http, $window, token) {
|
|
|
BaseService.scrollBackToTop();
|
|
|
// 每次进入时先清除掉rootScope下的venduu
|
|
|
$rootScope.venduu = null;
|
|
|
@@ -12879,7 +12879,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}).then(function (response) {
|
|
|
$scope.provinces = response.data;
|
|
|
});
|
|
|
-
|
|
|
+ var getToken = function() {
|
|
|
+ if($scope.token == null) {
|
|
|
+ token.info({userType: 'salenotice'}, {}, function(data) {
|
|
|
+ $scope.token = data.token;
|
|
|
+ }, function(response) {
|
|
|
+ toaster.pop('error', '提示', response.data);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ getToken();
|
|
|
+
|
|
|
$scope.order = {
|
|
|
date: new Date(),
|
|
|
cust: {
|
|
|
@@ -13150,7 +13160,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.order.orderItems[i].rate = 0;
|
|
|
}
|
|
|
}
|
|
|
- addtoCart.save({}, $scope.order, function (data) {
|
|
|
+ addtoCart.save({token: $scope.token}, $scope.order, function (data) {
|
|
|
$scope.loading = false;
|
|
|
toaster.pop('success', '成功', '保存成功');
|
|
|
window.location.hash = '#/purc/cart/' + data.id;
|
|
|
@@ -13181,7 +13191,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.order.orderItems[i].rate = 0;
|
|
|
}
|
|
|
}
|
|
|
- addtoCart.save({}, $scope.order, function (data) {
|
|
|
+ addtoCart.save({token: $scope.token}, $scope.order, function (data) {
|
|
|
$scope.loading = false;
|
|
|
toaster.pop('success', '成功', '保存成功');
|
|
|
window.location.hash = '#/purc/order/' + data.id;
|