|
@@ -384,11 +384,11 @@ import { InputNumberItem } from '/@/layouts/default/setting/components';
|
|
|
if(SaleOrderFormShipFormProductTable.dataSource)
|
|
|
SaleOrderFormShipFormProductTable.dataSource.map(item=>{
|
|
|
var sign = ''
|
|
|
- sign = item.sourceId?(item.sourceId).substring(0, 3):''
|
|
|
- if(item.sourceId&&sign=='Quo'){
|
|
|
- arrQuo.push(item.sourceId)
|
|
|
- }else if(item.sourceId&&sign=='Con'){
|
|
|
- arrCon.push(item.sourceId)
|
|
|
+ sign = item.sourceType ?(item.sourceType).substring(0, 3):''
|
|
|
+ if(item.sourceType&&sign=='Quo'){
|
|
|
+ arrQuo.push(item.sourceType)
|
|
|
+ }else if(item.sourceType&&sign=='Con'){
|
|
|
+ arrCon.push(item.sourceType)
|
|
|
}
|
|
|
})
|
|
|
if(arrQuo.length==0&&arrCon.length==0){
|
|
@@ -520,7 +520,8 @@ import { InputNumberItem } from '/@/layouts/default/setting/components';
|
|
|
data.map(item=>{
|
|
|
item.model = item.childModel
|
|
|
item.deliveryTime = formData.deliveryTime
|
|
|
- item.sourceId = 'Quo'+item.childId
|
|
|
+ item.sourceId = item.childId
|
|
|
+ item.sourceType = 'Quo'+item.childId
|
|
|
item.taxPrice = item.salePrice
|
|
|
item.discountedPrice = (Number(item.taxPrice) *(1-Number(item.discount)/100))
|
|
|
item.discountedAmount =Number(item.discountedPrice) *Number(item.quantity)
|
|
@@ -554,7 +555,8 @@ import { InputNumberItem } from '/@/layouts/default/setting/components';
|
|
|
data.map(item=>{
|
|
|
item.model = item.childModel
|
|
|
item.deliveryTime = formData.deliveryTime
|
|
|
- item.sourceId = 'Con'+item.childId
|
|
|
+ item.sourceId = item.childId
|
|
|
+ item.sourceType = 'Con'+item.childId
|
|
|
item.discountedPrice =Number(item.taxPrice)*(1-Number(item.discount)/100)
|
|
|
item.discountedAmount =Number(item.discountedPrice) *Number(item.quantity)
|
|
|
item.discountedPrice = (item.discountedPrice).toFixed(2)
|