diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js index 7a8c570f2..afe703ac6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js @@ -112,10 +112,14 @@ var bootstrap = function ($, learun) { label: '数量', name: 'Number', width: 150, align: 'left' }, { - label: '单价(元)', name: 'Price', width: 150, align: 'left' + label: '单价(元)', name: 'Price', width: 150, align: 'left', formatter: function (cellvalue) { + return cellvalue.toString().indexOf(".") > 0 ? cellvalue : cellvalue.toFixed(2); + } }, { - label: '金额(元)', name: 'Amount', width: 150, align: 'left' + label: '金额(元)', name: 'Amount', width: 150, align: 'left', formatter: function (cellvalue) { + return cellvalue.toString().indexOf(".") > 0 ? cellvalue : cellvalue.toFixed(2); + } }, ], height: 400, @@ -135,6 +139,7 @@ var bootstrap = function ($, learun) { $('[data-table="' + id + '"]').lrSetFormData(data[id]); if (data[id].SumAmount) { pricecount = data[id].SumAmount; + $("#SumAmount").val(pricecount.toFixed(2)); } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml index 6fc7fc5a7..5a799ef85 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml @@ -23,7 +23,7 @@
是否固定资产
-
+
填报人
@@ -31,7 +31,7 @@
申报人
- +
@*
明细操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js index 7e40036df..ae1d7b262 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js @@ -112,10 +112,14 @@ var bootstrap = function ($, learun) { label: '数量', name: 'Number', width: 150, align: 'left' }, { - label: '单价(元)', name: 'Price', width: 150, align: 'left' + label: '单价(元)', name: 'Price', width: 150, align: 'left', formatter: function (cellvalue) { + return cellvalue.toString().indexOf(".") > 0 ? cellvalue : cellvalue.toFixed(2); + } }, { - label: '金额(元)', name: 'Amount', width: 150, align: 'left' + label: '金额(元)', name: 'Amount', width: 150, align: 'left', formatter: function (cellvalue) { + return cellvalue.toString().indexOf(".") > 0 ? cellvalue : cellvalue.toFixed(2); + } }, ], height: 400, @@ -135,6 +139,7 @@ var bootstrap = function ($, learun) { $('[data-table="' + id + '"]').lrSetFormData(data[id]); if (data[id].SumAmount) { pricecount = data[id].SumAmount; + $("#SumAmount").val(pricecount.toFixed(2)); } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js index 6d77f184f..e207e1b05 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js @@ -157,9 +157,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/FormView?keyValue=' + keyValue, width: 860, height: 730, - callBack: function (id) { - - } + btn: null }); } }); @@ -194,7 +192,11 @@ var bootstrap = function ($, learun) { } }, { label: "申报人", name: "Remark", width: 100, align: "left" }, - { label: "总金额", name: "SumAmount", width: 100, align: "left" }, + { + label: "总金额", name: "SumAmount", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue.toFixed(2); + } + }, { label: "人民币(大写)", name: "UpperAmount", width: 200, align: "left" }, { label: "审批状态", name: "Status", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Index.js index 50342f841..df0b22486 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Index.js @@ -71,8 +71,16 @@ var bootstrap = function ($, learun) { headData: [ { label: "项目内容", name: "ProjectContent", width: 100, align: "left"}, { label: "数量", name: "Number", width: 100, align: "left"}, - { label: "单价(元)", name: "Price", width: 100, align: "left"}, - { label: "金额(元)", name: "Amount", width: 100, align: "left"}, + { + label: "单价(元)", name: "Price", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue.toFixed(2); + } + }, + { + label: "金额(元)", name: "Amount", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue.toFixed(2); + } + }, ], mainId:'Id', isPage: true