|
|
@ -855,6 +855,9 @@ export default { |
|
|
|
// console.log("包含非数字字符"); |
|
|
|
// console.log("包含非数字字符"); |
|
|
|
asm.materialId = this.formMaterial.materialCode; |
|
|
|
asm.materialId = this.formMaterial.materialCode; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if(!!this.formMaterial.id){ |
|
|
|
|
|
|
|
id.push(this.formMaterial.id); |
|
|
|
|
|
|
|
}else{ |
|
|
|
if (this.selectionList.length > 0) { |
|
|
|
if (this.selectionList.length > 0) { |
|
|
|
this.selectionList.forEach(i => { |
|
|
|
this.selectionList.forEach(i => { |
|
|
|
id.push(i.id); |
|
|
|
id.push(i.id); |
|
|
@ -863,6 +866,7 @@ export default { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
id.push(this.formMaterial.id); |
|
|
|
id.push(this.formMaterial.id); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
asm.ids = id; |
|
|
|
asm.ids = id; |
|
|
|
console.log('>>>', asm); |
|
|
|
console.log('>>>', asm); |
|
|
|
updateParcelList(asm).then(() => { |
|
|
|
updateParcelList(asm).then(() => { |
|
|
@ -1369,7 +1373,7 @@ export default { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
i.conditions = '库存品'; |
|
|
|
i.conditions = '库存品'; |
|
|
|
} |
|
|
|
} |
|
|
|
if (i.materialId == '' || i.materialId == '-1') { |
|
|
|
if (!i.materialId) { |
|
|
|
//有 |
|
|
|
//有 |
|
|
|
this.dataMaterial = true; |
|
|
|
this.dataMaterial = true; |
|
|
|
} |
|
|
|
} |
|
|
|