diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Inventory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Inventory.cshtml
index 3ad4119a9..e4b1381d5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Inventory.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/Inventory.cshtml
@@ -132,14 +132,16 @@
str += '
' + i + ' | ';//序号
str += '' + entity.aName + ' | ';//品名
str += ' | ';//规格
- str += '' + entity.aUnit + ' | ';//单位
- str += '1 | ';//数量
- str += '' + entity.aPrice + ' | ';//单价
- str += '' + entity.aAllPrice + ' | ';//金额
+ str += '' + (entity.aUnit ? entity.aUnit : '') + ' | ';//单位
+ str += ''+entity.aNum+' | ';//数量
+ str += '' + (entity.aPrice ? entity.aPrice : 0) + ' | ';//单价
+ str += '' + (entity.aAllPrice ? entity.aAllPrice : 0) + ' | ';//金额
str += ' |
';//用途
//累计金额
- price += parseFloat(entity.aPrice);
+ if (entity.aAllPrice) {
+ price += parseFloat(entity.aAllPrice);
+ }
}
$('.table').find('tr').eq(2).after(str);
$('#moneyUp').html(digitUppercase(price));
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Inventory.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Inventory.cshtml
index cae7272a4..e9c52bfab 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Inventory.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Inventory.cshtml
@@ -82,8 +82,8 @@
}
-
打印
+
打印
西昌民族幼专出库清单 |
@@ -144,14 +144,16 @@
str += '
' + i + ' | ';//序号
str += '' + entity.aName + ' | ';//品名
str += ' | ';//规格
- str += '' + entity.aUnit + ' | ';//单位
+ str += '' + (entity.aUnit ? entity.aUnit : '') + ' | ';//单位
str += '1 | ';//数量
- str += '' + entity.aPrice + ' | ';//单价
- str += '' + entity.aAllPrice + ' | ';//金额
+ str += '' + (entity.aPrice ? entity.aPrice : 0) + ' | ';//单价
+ str += '' + (entity.aAllPrice ? entity.aAllPrice : 0) + ' | ';//金额
str += ' |
';//用途
//累计金额
- price += parseFloat(entity.aPrice);
+ if (entity.aAllPrice) {
+ price += parseFloat(entity.aAllPrice);
+ }
}
$('.table').find('tr').eq(3).after(str);
$('#moneyUp').html(digitUppercase(price));