|
@@ -552,8 +552,7 @@ export default {
|
|
let tableData=[];
|
|
let tableData=[];
|
|
importData.forEach((row)=>{
|
|
importData.forEach((row)=>{
|
|
let temp=that.tableData.find(item=>item.wagonNo==row.wagonNo
|
|
let temp=that.tableData.find(item=>item.wagonNo==row.wagonNo
|
|
- && row.productName.includes(item.foreignShipName)
|
|
|
|
- && item.materialName.includes(row.mineral));
|
|
|
|
|
|
+ && row.productName.includes(item.foreignShipName));
|
|
if(temp)
|
|
if(temp)
|
|
tableData.push(temp);
|
|
tableData.push(temp);
|
|
});
|
|
});
|