diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml index 3ca60a42f..6751a2481 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml @@ -30,7 +30,7 @@
-
申报人
+
备注
@@ -43,7 +43,7 @@
-
总金额
+
合计
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 da19f9b6b..6eba6acf3 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 @@ -106,10 +106,22 @@ var bootstrap = function ($, learun) { $('#FundsApplyDetail').jfGrid({ headData: [ { - label: '项目内容', name: 'ProjectContent', width: 150, align: 'left' + label: '项目明细', name: 'ProjectContent', width: 150, align: 'left' }, { - label: '数量', name: 'Number', width: 150, align: 'left' + label: '数量', name: 'Number', width: 120, align: 'left' + }, + { + label: '单位', name: 'Unit', width: 120, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sldw', + callback: function (_data) { + callback(_data.text); + } + }); + } }, { label: '单价(元)', name: 'Price', width: 150, align: 'left', formatter: function (cellvalue) { 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 5a799ef85..460a3e5d5 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 @@ -30,7 +30,7 @@
-
申报人
+
备注
@*
@@ -43,7 +43,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 14b4b5768..a47ad0e59 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 @@ -106,10 +106,22 @@ var bootstrap = function ($, learun) { $('#FundsApplyDetail').jfGrid({ headData: [ { - label: '项目内容', name: 'ProjectContent', width: 150, align: 'left' + label: '项目明细', name: 'ProjectContent', width: 150, align: 'left' }, { - label: '数量', name: 'Number', width: 150, align: 'left' + label: '数量', name: 'Number', width: 120, align: 'left' + }, + { + label: '单位', name: 'Unit', width: 120, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sldw', + callback: function (_data) { + callback(_data.text); + } + }); + } }, { label: '单价(元)', name: 'Price', width: 150, align: 'left', formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml index 1fbb4ca22..d6d7a724b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml @@ -3,19 +3,23 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
-
项目内容*
+
+
项目明细*
-
+
数量*
-
+
+
单位*
+
+
+
单价(元)*
- +
-
+
金额(元)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js index beefe134b..4908f5e64 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js @@ -17,6 +17,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#Unit').lrDataItemSelect({ allowSearch: true,code: 'sldw' }); $('.calcul').blur(function () { var num = $('#Number').val(); var Price = $('#Price').val(); 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 f4d548a22..87d5e2837 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 @@ -70,7 +70,19 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/AssetManagementSystem/FundsApplyDetail/GetPageList', headData: [ { label: "项目内容", name: "ProjectContent", width: 100, align: "left"}, - { label: "数量", name: "Number", width: 100, align: "left"}, + { label: "数量", name: "Number", width: 100, align: "left" }, + { + label: '单位', name: 'Unit', width: 150, align: 'left', + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'sldw', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "单价(元)", name: "Price", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue != null && cellvalue != "" && cellvalue != undefined ? cellvalue.toFixed(2) : "0.00"; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApplyDetail/FundsApplyDetailService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApplyDetail/FundsApplyDetailService.cs index 19718c593..c056cfd42 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApplyDetail/FundsApplyDetailService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApplyDetail/FundsApplyDetailService.cs @@ -32,13 +32,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.Id, - t.ProjectContent, - t.Number, - t.Price, - t.Amount - "); + strSql.Append(@" t.* "); strSql.Append(" FROM FundsApplyDetail t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject();