经费开支优化

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml

@@ -30,7 +30,7 @@
         <input id="ApplyUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
     <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" />
     </div>
     <div class="col-xs-12 lr-form-item">
@@ -43,7 +43,7 @@
         <div id="FundsApplyDetail"></div>
     </div>
     <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="SumAmount" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml

@@ -30,7 +30,7 @@
         <input id="ApplyUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
     <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"  readonly="readonly"/>
     </div>
     @*<div class="col-xs-12 lr-form-item">
@@ -43,7 +43,7 @@
         <div id="FundsApplyDetail"></div>
     </div>
     <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="SumAmount" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml

@@ -3,19 +3,23 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
-        <div class="lr-form-item-title">项目内容<font face="宋体">*</font></div>
+    <div class="col-xs-12 lr-form-item" data-table="FundsApplyDetail">
+        <div class="lr-form-item-title">项目明细<font face="宋体">*</font></div>
         <input id="ProjectContent" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
+    <div class="col-xs-12 lr-form-item" data-table="FundsApplyDetail">
         <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
         <input id="Number" type="number" class="form-control calcul" isvalid="yes" checkexpession="PositiveInteger" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
+    <div class="col-xs-12 lr-form-item" data-table="FundsApplyDetail">
+        <div class="lr-form-item-title">单位<font face="宋体">*</font></div>
+        <div id="Unit"  isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FundsApplyDetail">
         <div class="lr-form-item-title">单价（元）<font face="宋体">*</font></div>
-        <input id="Price" type="text" class="form-control calcul"  isvalid="yes" checkexpession="NotNull" />
+        <input id="Price" type="text" class="form-control calcul" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
+    <div class="col-xs-12 lr-form-item" data-table="FundsApplyDetail">
         <div class="lr-form-item-title">金额（元）</div>
         <input id="Amount" type="text" class="form-control" readonly="readonly" />
     </div>

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();

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";

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();