|
|
@@ -7033,10 +7033,9 @@ 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;
|
|
|
+ $scope.item.quotation.custUser = item.inquiry.recorderUser;
|
|
|
+ $scope.item.quotation.custUserUU = item.inquiry.recorderUU;
|
|
|
if (item.product == null || item.product.id == null) {
|
|
|
toaster.pop('info', '暂未匹配到物料信息，请手动选择');
|
|
|
} else {
|
|
|
@@ -7114,7 +7113,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) {
|
hejq