From a0d6c61d0cccf672a4ceb2dc4622335ead93b0c5 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 5 Aug 2021 11:24:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=94=B3=E8=AF=B7=E6=94=AF?=
=?UTF-8?q?=E5=87=BA=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=89=A9=E4=BD=99=E9=87=91?=
=?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/FD_PayManageController.cs | 9 +
.../Views/FD_PayManage/FormPublic.cshtml | 12 +-
.../Views/FD_PayManage/FormPublic.js | 2 -
.../DBModel/资产系统.PDM | 8649 ++++++++++-------
4 files changed, 4950 insertions(+), 3722 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_PayManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_PayManageController.cs
index 129249729..75241d177 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_PayManageController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_PayManageController.cs
@@ -66,6 +66,15 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
[HttpGet]
public ActionResult FormPublic()
{
+ ViewBag.Amount = 0;
+ ViewBag.Name = "";
+ var incomlist = fD_IncomeManageIBLL.GetIncomeList("0", "1");
+ if (incomlist.Count() > 0)
+ {
+ var model = incomlist.FirstOrDefault();
+ ViewBag.Name = model.IName;
+ ViewBag.Amount = model.ISurplusAmount;
+ }
return View();
}
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.cshtml
index c66a9750b..7c34a04d0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.cshtml
@@ -47,18 +47,14 @@
资金支出用途
- @*
- *@
+