|
@@ -727,7 +727,7 @@
|
|
|
var allDiscountPrice = 0;
|
|
|
data.map((item) => {
|
|
|
item.model = item.childModel;
|
|
|
- item.deliveryTime = formData.deliveryTime;
|
|
|
+ item.deliveryTime = formData.deliveryTime&&formData.deliveryTime!==''?formData.deliveryTime:moment(formData.billDate).add(Number(data[0].deliveryDayChild), 'days').format('YYYY-MM-DD');
|
|
|
item.sourceId = item.childId;
|
|
|
item.sourceType = 'Quo' + item.childId;
|
|
|
item.taxPrice = item.salePrice;
|
|
@@ -763,6 +763,7 @@
|
|
|
formData.paymentTerms = data[0].paymentTerms;
|
|
|
formData.intermediator = data[0].intermediator;
|
|
|
formData.intermediatorName = data[0].intermediatorName;
|
|
|
+ formData.deliveryAddress = data[0].placeDelivery;
|
|
|
formData.deliveryTime = moment(formData.billDate).add(Number(data[0].deliveryDayHead), 'days').format('YYYY-MM-DD');
|
|
|
getShipList(data[0].headId, 'quotation');
|
|
|
var params = { id: formData.customer };
|
|
@@ -783,7 +784,7 @@
|
|
|
var allDiscountPrice = 0;
|
|
|
data.map((item) => {
|
|
|
item.model = item.childModel;
|
|
|
- item.deliveryTime = formData.deliveryTime;
|
|
|
+ item.deliveryTime = formData.deliveryTime&&formData.deliveryTime!==''?formData.deliveryTime:item.deliveryTime;
|
|
|
item.sourceId = item.childId;
|
|
|
item.sourceType = 'Con' + item.childId;
|
|
|
if (formData.doubleDiscount && formData.doubleDiscount !== '') {
|
|
@@ -817,6 +818,7 @@
|
|
|
formData.paymentTerms = data[0].paymentTerms;
|
|
|
formData.intermediator = data[0].intermediator;
|
|
|
formData.intermediatorName = data[0].intermediatorName;
|
|
|
+ formData.deliveryTime = data[0].deliveryTime;
|
|
|
getShipList(data[0].headId, 'contract');
|
|
|
var params = { id: formData.customer };
|
|
|
var obj = await CustomerOption(params);
|