|
|
@@ -8317,6 +8317,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
|
|
|
//提交
|
|
|
$scope.submit = function(prodInfo){
|
|
|
+ console.log(prodInfo);
|
|
|
var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
|
|
|
$upload.upload({
|
|
|
url: 'product/baseInfo/addNewProduct',
|
|
|
@@ -8743,7 +8744,25 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-
|
|
|
+ // 联想词 start
|
|
|
+ // 获取供应商
|
|
|
+ $scope.getSimilarVendors = function(value) {
|
|
|
+ console.log(value);
|
|
|
+ if (value) {
|
|
|
+ return Vendor.getSimilarVendors({keyword : value}).$promise.then(function(data) {
|
|
|
+ return data.map(function(item) {
|
|
|
+ return item;
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ $scope.onAssociateCmpClick = function(vendor, order) {
|
|
|
+ $scope.order.cust.uu = vendor.venduu;
|
|
|
+ $rootScope.venduu = $scope.order.cust.uu;
|
|
|
+ }
|
|
|
+ // 联想词 end
|
|
|
+
|
|
|
// $scope.order.orderItems.push(item);
|
|
|
if($rootScope.prodId) {
|
|
|
VendorInfo.getProdInfo({id: $rootScope.prodId}, {}, function(data) {
|
|
|
@@ -9007,7 +9026,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
|
|
|
$scope.ensure = false;
|
|
|
$scope.check = function(vendor) { // 需要进行判断的选择
|
|
|
- console.log(vendor);
|
|
|
$scope.vendorInfo = vendor;
|
|
|
$scope.ensure = true;
|
|
|
};
|
|
|
@@ -10484,7 +10502,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
|
|
|
|
|
|
$scope.loading = false;
|
|
|
-
|
|
|
+
|
|
|
+ $scope.tender = {};
|
|
|
// 获取收货地址列表
|
|
|
ShipAddress.shipAddList({}, function(data) {
|
|
|
$scope.ships = data;
|
|
|
@@ -10496,18 +10515,18 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
}).then(function(response) {
|
|
|
$scope.provinces = response.data;
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
// 新增收货地址保存
|
|
|
$scope.saveShipAddress = function(ship) {
|
|
|
ship.address = ship.province + ship.city + ship.district;
|
|
|
ShipAddress.saveAddress( {}, ship, function(data) {
|
|
|
if(data.success) {
|
|
|
- toaster.pop('success', '提示', data.success);
|
|
|
// 获取收货地址列表
|
|
|
ShipAddress.shipAddList({}, function(data) {
|
|
|
- $scope.ships = data;
|
|
|
- $scope.tender.shipAdd = $scope.ships[0];
|
|
|
+ $scope.ships = data;
|
|
|
+ $scope.tender.shipAdd = $scope.ships[0];
|
|
|
});
|
|
|
+ toaster.pop('success', '提示', data.success);
|
|
|
}
|
|
|
if(data.error) {
|
|
|
toaster.pop('error', '提示', data.error);
|