From 3ff31db95e384197a076d6e3667405481e7569f2 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 14 Sep 2021 16:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomFunction/Views/BudgetApply/Index.js |  2 +-
 .../Views/BudgetApply/IndexAdjust.cshtml      |  4 ---
 .../CustomFunction/Views/CostInvoice/Index.js |  2 +-
 .../Controllers/FD_IncomeManageController.cs  | 20 +++++++-------
 .../Views/FD_IncomeManage/Index.js            | 26 +++++++++----------
 .../FD_IncomeManage/FD_IncomeManageBLL.cs     |  2 +-
 6 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Index.js
index 04ec77e1f..e05455848 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Index.js	
@@ -112,7 +112,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/CustomFunction/BudgetApply/GetPageList',
                 headData: [
                     { label: "用途", name: "Purpose", width: 100, align: "left"},
-                    { label: "申请金额", name: "Amount", width: 100, align: "left"},
+                    { label: "申请金额", name: "Amount", width: 100, align: "left", statistics: true},
                     { label: "备注", name: "Remark", width: 100, align: "left"},
                     { label: "申请时间", name: "CreateTime", width: 100, align: "left"},
                     { label: "申请人", name: "CreateUserId", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/IndexAdjust.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/IndexAdjust.cshtml
index 21a198396..0112dc54b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/IndexAdjust.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/IndexAdjust.cshtml	
@@ -14,10 +14,6 @@
                                     <div class="lr-form-item-title">用途</div>
                                     <input id="Purpose" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">申请时间</div>
-                                    <div id="CreateTime"></div>
-                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">申请人</div>
                                     <div id="CreateUserId"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Index.js
index cf94ddbd7..722f9c658 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Index.js	
@@ -99,7 +99,7 @@ var bootstrap = function ($, learun) {
                     { label: "发票类别", name: "Type", width: 100, align: "left" },
                     { label: "服务名称", name: "ServiceName", width: 100, align: "left" },
                     { label: "税率", name: "TaxRate", width: 100, align: "left" },
-                    { label: "开票金额", name: "Amount", width: 100, align: "left" },
+                    { label: "开票金额", name: "Amount", width: 100, align: "left", statistics: true  },
                     { label: "发票号", name: "Number", width: 100, align: "left" },
                     { label: "对方单位", name: "OtherParty", width: 100, align: "left" },
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs
index 744c1b24d..b5f0f2db5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs	
@@ -73,18 +73,18 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
             var data = fD_IncomeManageIBLL.GetPageList(paginationobj, queryJson);
-            FD_IncomeManageEntity entity = new FD_IncomeManageEntity();// data.Sum(x=>x.IAmount)
-            entity.IName = "总计：";
-            entity.IActual = data.Sum(x => x.IActual);
-            entity.IQuota = data.Sum(x => x.IQuota);
-            entity.IAmount = data.Sum(x => x.IAmount);
-            entity.IUseAmount = data.Sum(x => x.IUseAmount);
-            entity.ISurplusAmount = data.Sum(x => x.ISurplusAmount);
-            var list = data.ToList();
-            list.Add(entity);
+            //FD_IncomeManageEntity entity = new FD_IncomeManageEntity();// data.Sum(x=>x.IAmount)
+            //entity.IName = "总计：";
+            //entity.IActual = data.Sum(x => x.IActual);
+            //entity.IQuota = data.Sum(x => x.IQuota);
+            //entity.IAmount = data.Sum(x => x.IAmount);
+            //entity.IUseAmount = data.Sum(x => x.IUseAmount);
+            //entity.ISurplusAmount = data.Sum(x => x.ISurplusAmount);
+            //var list = data.ToList();
+            //list.Add(entity);
             var jsonData = new
             {
-                rows = list,
+                rows = data,
                 total = paginationobj.total,
                 page = paginationobj.page,
                 records = paginationobj.records
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js
index 4292677e6..dcb2aabd4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js	
@@ -153,11 +153,11 @@ var bootstrap = function ($, learun) {
                             }
                         },
                         //{ label: "项目编号", name: "IEnCode", width: 100, align: "left" },
-                        { label: "年度实际收入", name: "IActual", width: 100, align: "left" },
-                        { label: "年度预计收入", name: "IQuota", width: 150, align: "left" },
-                        { label: "金额", name: "IAmount", width: 150, align: "left" },
-                        { label: "使用金额", name: "IUseAmount", width: 150, align: "left" },
-                        { label: "剩余金额", name: "ISurplusAmount", width: 150, align: "left" },
+                        { label: "年度实际收入", name: "IActual", width: 100, align: "left", statistics: true },
+                        { label: "年度预计收入", name: "IQuota", width: 150, align: "left", statistics: true },
+                        { label: "金额", name: "IAmount", width: 150, align: "left", statistics: true },
+                        { label: "使用金额", name: "IUseAmount", width: 150, align: "left", statistics: true },
+                        { label: "剩余金额", name: "ISurplusAmount", width: 150, align: "left", statistics: true },
                         { label: "备注", name: "IRemarks", width: 100, align: "left" },
                     ],
                     mainId: 'IId',
@@ -203,10 +203,10 @@ var bootstrap = function ($, learun) {
                                     });
                             }
                         },
-                        { label: "申报金额", name: "IQuota", width: 150, align: "left" },
-                        { label: "批复金额", name: "IAmount", width: 150, align: "left" },
-                        { label: "使用金额", name: "IUseAmount", width: 150, align: "left" },
-                        { label: "剩余金额", name: "ISurplusAmount", width: 150, align: "left" },
+                        { label: "申报金额", name: "IQuota", width: 150, align: "left", statistics: true},
+                        { label: "批复金额", name: "IAmount", width: 150, align: "left", statistics: true },
+                        { label: "使用金额", name: "IUseAmount", width: 150, align: "left", statistics: true },
+                        { label: "剩余金额", name: "ISurplusAmount", width: 150, align: "left", statistics: true },
                         { label: "备注", name: "IRemarks", width: 100, align: "left" }
                     ],
                     mainId: 'IId',
@@ -253,10 +253,10 @@ var bootstrap = function ($, learun) {
                         },
                         //{ label: "项目编号", name: "IEnCode", width: 100, align: "left" },
                         { label: "人数", name: "IPeopleNum", width: 100, align: "left" },
-                        { label: "定额", name: "IQuota", width: 150, align: "left" },
-                        { label: "金额", name: "IAmount", width: 150, align: "left" },
-                        { label: "使用金额", name: "IUseAmount", width: 150, align: "left" },
-                        { label: "剩余金额", name: "ISurplusAmount", width: 150, align: "left" },
+                        { label: "定额", name: "IQuota", width: 150, align: "left", statistics: true},
+                        { label: "金额", name: "IAmount", width: 150, align: "left", statistics: true},
+                        { label: "使用金额", name: "IUseAmount", width: 150, align: "left", statistics: true },
+                        { label: "剩余金额", name: "ISurplusAmount", width: 150, align: "left", statistics: true },
                         { label: "备注", name: "IRemarks", width: 100, align: "left" },
                     ],
                     mainId: 'IId',
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_IncomeManage/FD_IncomeManageBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_IncomeManage/FD_IncomeManageBLL.cs
index 5f3b45742..7a95b0239 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_IncomeManage/FD_IncomeManageBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_IncomeManage/FD_IncomeManageBLL.cs	
@@ -129,7 +129,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                         showcheck = false,
                         checkstate = 0,
                         isexpand = true,
-                        parentId = "6f52162a-1886-457a-a080-6f8d1156c5df"
+                        parentId = "2f87fd9d-251b-46cf-9a79-081499ca491d"
                     };
                     treeList.Add(node);
                 }