|
|
@@ -483,7 +483,8 @@
|
|
|
function addFromQuotation(data){
|
|
|
data.map(item=>{
|
|
|
item.model = item.childModel
|
|
|
- item.sourceId = 'Quo'+item.childId
|
|
|
+ item.sourceId = item.childId
|
|
|
+ item.sourceType = 'Quo'+item.childId
|
|
|
item.sourceCode =data[0].billCode
|
|
|
})
|
|
|
var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)
|
|
|
@@ -505,7 +506,8 @@
|
|
|
function addFormSaleOrder(data){
|
|
|
data.map(item=>{
|
|
|
item.model = item.childModel
|
|
|
- item.sourceId = 'Con'+item.childId
|
|
|
+ item.sourceId = item.childId
|
|
|
+ item.sourceType = 'Con'+item.childId
|
|
|
item.sourceCode =data[0].billCode
|
|
|
// item.productClass =data[0].productClass
|
|
|
})
|
|
|
@@ -548,11 +550,11 @@
|
|
|
arrCon=[]
|
|
|
purOrderFormShipFormProductTable.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){
|
