|
|
@@ -5730,6 +5730,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
});
|
|
|
|
|
|
modalInstance.result.then(function (data) {
|
|
|
+ toaster.pop('success', '报价成功');
|
|
|
$scope.tableParams.reload();
|
|
|
}, function () {
|
|
|
|
|
|
@@ -5775,6 +5776,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
});
|
|
|
|
|
|
modalInstance.result.then(function (data) {
|
|
|
+ toaster.pop('success', '报价成功');
|
|
|
$scope.tableParams.reload();
|
|
|
}, function () {
|
|
|
|
|
|
@@ -6017,6 +6019,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
});
|
|
|
|
|
|
modalInstance.result.then(function () {
|
|
|
+ toaster.pop('success', '报价成功');
|
|
|
window.location.reload();
|
|
|
}, function () {
|
|
|
|
|
|
@@ -7012,7 +7015,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
// 根据传入的询价相关的信息封装成报价需要的信息
|
|
|
if ($stateParams.inquiryItem != null) {
|
|
|
var item = $stateParams.inquiryItem;
|
|
|
- console.log(item);
|
|
|
$scope.item.quotation.cust = item.inquiry.enterprise;
|
|
|
$scope.item.quotation.custUser = item.user;
|
|
|
$scope.item.quotation.custUserUU = item.userUU;
|
|
|
@@ -7020,6 +7022,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
toaster.pop('info', '暂未匹配到物料信息，请手动选择');
|
|
|
} else {
|
|
|
$scope.item.product = item.product;
|
|
|
+ if (item.replies.length > 0) {
|
|
|
+ $scope.item.prices = item.replies;
|
|
|
+ angular.forEach($scope.item.prices, function(price) {
|
|
|
+ price.id = null;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ $scope.item.quotation.taxrate = item.taxrate;
|
|
|
+ $scope.item.minPackQty = item.minPackQty;
|
|
|
+ $scope.item.minOrderQty = item.minOrderQty;
|
|
|
+ $scope.item.leadtime = item.leadtime;
|
|
|
+ $scope.item.quotation.currency = item.currency;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -7083,7 +7096,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
if (!$scope.item.quotation.code) //新增，设单号
|
|
|
$scope.item.quotation.code = 'BJ' + $filter('date')(new Date(), 'yyMMddHHmmss_sss');
|
|
|
$scope.item.quotation.custUU = $scope.item.quotation.cust.uu;
|
|
|
- $scope.item.quotation.custUserUU = $scope.item.quotation.custUser.userUU;
|
|
|
+ if ($scope.item.quotation.custUserUU == null) {
|
|
|
+ $scope.item.quotation.custUserUU = $scope.item.quotation.custUser.userUU;
|
|
|
+ }
|
|
|
$scope.item.productId = $scope.item.product.id;
|
|
|
// $scope.item.quotation.status = 101;//已提交
|
|
|
if ($scope.item.quotation.date instanceof Date) {
|
|
|
@@ -24303,6 +24318,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
});
|
|
|
|
|
|
modalInstance.result.then(function (data) {
|
|
|
+ toaster.pop('success', '报价成功');
|
|
|
$scope.tableParams.reload();
|
|
|
}, function () {
|
|
|
|
hejq