diff --git a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html index 8fe6adf4..e402be5f 100644 --- a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html +++ b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html @@ -166,11 +166,12 @@ result = res.data; lis.push("
' + "物料品牌:" + result[i].mbrand + '
'; - if (result[i].mbrand === "") { + let brandItem = '' + "物料品牌:" + resultElement.mbrand + '
'; + if (resultElement.mbrand === "") { brandItem = ""; } for (let j = 0; j < keys.length; j++) { @@ -178,13 +179,13 @@ let item = '' + "计量单位:" + key + ";对应库存:" + splitInventory[key] + '
'; InventoryItem += item; } - lis.push('' + "物料编码:" + result[i].mcode + '
' - + '' + "物料型号:" + result[i].version + '
' + + '' + "物料编码:" + resultElement.mcode + '
' + + '' + "物料型号:" + resultElement.version + '
' + brandItem - + '' + "所处位置:" + result[i].dname + "-" + result[i].kingdeecode + '
' + + '' + "所处位置:" + resultElement.dname + "-" + resultElement.kingdeecode + '
' + InventoryItem + '' + "物料品牌:" + result[i].mbrand + '
'; - if (result[i].mbrand === "") { + let brandItem = '' + "物料品牌:" + resultElement.mbrand + '
'; + if (resultElement.mbrand === "") { brandItem = ""; } for (let j = 0; j < keys.length; j++) { @@ -178,13 +180,13 @@ let item = '' + "计量单位:" + key + ";对应库存:" + splitInventory[key] + '
'; InventoryItem += item; } - lis.push('' + "物料编码:" + result[i].mcode + '
' - + '' + "物料型号:" + result[i].version + '
' + + '' + "物料编码:" + resultElement.mcode + '
' + + '' + "物料型号:" + resultElement.version + '
' + brandItem - + '' + "所处位置:" + result[i].dname + "-" + result[i].kingdeecode + '
' + + '' + "所处位置:" + resultElement.dname + "-" + resultElement.kingdeecode + '
' + InventoryItem + '