|
|
|
@ -243,19 +243,19 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
|
|
|
|
let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
|
|
|
|
_data.rows.forEach((item) => {
|
|
|
|
_data.rows.forEach((item) => {
|
|
|
|
let k3Code = item.FBaseMaterialDesc;
|
|
|
|
// let k3Code = item.FBaseMaterialDesc;
|
|
|
|
if(k3Code.indexOf("@") > 0){
|
|
|
|
// if(k3Code.indexOf("@") > 0){
|
|
|
|
item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
|
|
|
|
// item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
|
|
|
|
item.FK3Name = k3Code.substr(k3Code.indexOf("@") +1);
|
|
|
|
// item.FK3Name = k3Code.substr(k3Code.indexOf("@") +1);
|
|
|
|
}else{
|
|
|
|
// }else{
|
|
|
|
item.FK3Code = "";
|
|
|
|
// item.FK3Code = "";
|
|
|
|
item.FK3Name = "";
|
|
|
|
// item.FK3Name = "";
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if(k3Code.lastIndexOf(".") > 0){
|
|
|
|
// if(k3Code.lastIndexOf(".") > 0){
|
|
|
|
item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".")+1);
|
|
|
|
// item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".")+1);
|
|
|
|
}else{
|
|
|
|
// }else{
|
|
|
|
item.FK3ShortCode = "";
|
|
|
|
// item.FK3ShortCode = "";
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
|
|
|
|
let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
|
|
|
|
if (info != null) {
|
|
|
|
if (info != null) {
|
|
|
|
col7.forEach((col) => {
|
|
|
|
col7.forEach((col) => {
|
|
|
|
|