Bläddra i källkod

【修改】经费开支申报:列表、表单金额显示两位小数。

新疆警官学校中职
dyy 2 år sedan
förälder
incheckning
6fc0424aa7
5 ändrade filer med 32 tillägg och 12 borttagningar
  1. +7
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js
  2. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml
  3. +7
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js
  4. +6
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js
  5. +10
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Index.js

+ 7
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.js Visa fil

@@ -112,10 +112,14 @@ var bootstrap = function ($, learun) {
label: '数量', name: 'Number', width: 150, align: 'left' 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, height: 400,
@@ -135,6 +139,7 @@ var bootstrap = function ($, learun) {
$('[data-table="' + id + '"]').lrSetFormData(data[id]); $('[data-table="' + id + '"]').lrSetFormData(data[id]);
if (data[id].SumAmount) { if (data[id].SumAmount) {
pricecount = data[id].SumAmount; pricecount = data[id].SumAmount;
$("#SumAmount").val(pricecount.toFixed(2));
} }
} }
} }


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml Visa fil

@@ -23,7 +23,7 @@
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="FundsApply"> <div class="col-xs-6 lr-form-item" data-table="FundsApply">
<div class="lr-form-item-title">是否固定资产</div> <div class="lr-form-item-title">是否固定资产</div>
<div id="IsFixedAssets"></div>
<div id="IsFixedAssets" readonly="readonly"></div>
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="FundsApply"> <div class="col-xs-6 lr-form-item" data-table="FundsApply">
<div class="lr-form-item-title">填报人</div> <div class="lr-form-item-title">填报人</div>
@@ -31,7 +31,7 @@
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="FundsApply"> <div class="col-xs-6 lr-form-item" data-table="FundsApply">
<div class="lr-form-item-title">申报人</div> <div class="lr-form-item-title">申报人</div>
<input id="Remark" type="text" class="form-control" />
<input id="Remark" type="text" class="form-control" readonly="readonly"/>
</div> </div>
@*<div class="col-xs-12 lr-form-item"> @*<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">明细操作</div> <div class="lr-form-item-title">明细操作</div>


+ 7
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.js Visa fil

@@ -112,10 +112,14 @@ var bootstrap = function ($, learun) {
label: '数量', name: 'Number', width: 150, align: 'left' 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, height: 400,
@@ -135,6 +139,7 @@ var bootstrap = function ($, learun) {
$('[data-table="' + id + '"]').lrSetFormData(data[id]); $('[data-table="' + id + '"]').lrSetFormData(data[id]);
if (data[id].SumAmount) { if (data[id].SumAmount) {
pricecount = data[id].SumAmount; pricecount = data[id].SumAmount;
$("#SumAmount").val(pricecount.toFixed(2));
} }
} }
} }


+ 6
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js Visa fil

@@ -157,9 +157,7 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/FormView?keyValue=' + keyValue, url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/FormView?keyValue=' + keyValue,
width: 860, width: 860,
height: 730, height: 730,
callBack: function (id) {

}
btn: null
}); });
} }
}); });
@@ -194,7 +192,11 @@ var bootstrap = function ($, learun) {
} }
}, },
{ label: "申报人", name: "Remark", width: 100, align: "left" }, { 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: "UpperAmount", width: 200, align: "left" },
{ {
label: "审批状态", name: "Status", width: 100, align: "left", label: "审批状态", name: "Status", width: 100, align: "left",


+ 10
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Index.js Visa fil

@@ -71,8 +71,16 @@ var bootstrap = function ($, learun) {
headData: [ headData: [
{ label: "项目内容", name: "ProjectContent", width: 100, align: "left"}, { label: "项目内容", name: "ProjectContent", width: 100, align: "left"},
{ label: "数量", name: "Number", 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', mainId:'Id',
isPage: true isPage: true


Laddar…
Avbryt
Spara