调整支出预算、收入预算

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js

@@ -161,6 +161,7 @@ var bootstrap = function ($, learun) {
             //$("#gridtable").empty();
 
             //$("#gridtable")[0].dfop = undefined;
+            console.log('selectedParent.ChildType=', selectedParent.ChildType);
             if (selectedParent.ChildType == "5") {
                 $('#gridtable').lrAuthorizeJfGridLei({
                     url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetPageList',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_BudgetBasicsController.cs

@@ -4,6 +4,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using Learun.Application.Organization;
 
 namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
 {
@@ -17,6 +18,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
     public class FD_BudgetBasicsController : MvcControllerBase
     {
         private FD_BudgetBasicsIBLL fD_BudgetBasicsIBLL = new FD_BudgetBasicsBLL();
+        private DepartmentIBLL departmentIBLL = new DepartmentBLL();
 
         #region 视图功能
 
@@ -27,7 +29,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -36,7 +38,12 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            var userInfo = LoginUserInfo.Get();
+            ViewBag.Name = userInfo.realName;
+            var dept = departmentIBLL.GetEntity(userInfo.departmentId);
+            ViewBag.Dept = dept == null ? "" : dept.F_FullName;
+            ViewBag.Date = DateTime.Now;
+            return View();
         }
         #endregion
 
@@ -72,8 +79,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var FD_BudgetBasicsData = fD_BudgetBasicsIBLL.GetFD_BudgetBasicsEntity( keyValue );
-            var jsonData = new {
+            var FD_BudgetBasicsData = fD_BudgetBasicsIBLL.GetFD_BudgetBasicsEntity(keyValue);
+            var jsonData = new
+            {
                 FD_BudgetBasics = FD_BudgetBasicsData,
             };
             return Success(jsonData);
@@ -94,7 +102,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
             };
             return Success(jsonData);
         }
-        
+
         #endregion
 
         #region 提交数据
@@ -110,7 +118,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         {
             var entity = fD_BudgetBasicsIBLL.GetFD_BudgetBasicsEntity(keyValue);
             entity.BIsDelete = true;
-            entity.BDeleteTime=DateTime.Now;
+            entity.BDeleteTime = DateTime.Now;
             entity.BDeleteUser = LoginUserInfo.Get().userId;
             fD_BudgetBasicsIBLL.SaveEntity(keyValue, entity);
             return Success("删除成功！");
@@ -127,7 +135,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             FD_BudgetBasicsEntity entity = strEntity.ToObject<FD_BudgetBasicsEntity>();
-            fD_BudgetBasicsIBLL.SaveEntity(keyValue,entity);
+            fD_BudgetBasicsIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs

@@ -38,6 +38,24 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form2()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form3()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
@@ -79,6 +97,21 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetTree()
+        {
+            var data = fD_IncomeManageIBLL.GetTree();
+
+            return Success(data);
+        }
+
         #endregion
 
         #region 提交数据
@@ -113,8 +146,18 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
             FD_IncomeManageEntity entity = strEntity.ToObject<FD_IncomeManageEntity>();
             if (entity.IAmount <= 0)
                 return Fail("金额必须大于0！");
-            entity.IUseAmount = 0;
-            entity.ISurplusAmount = entity.IAmount;
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.IUseAmount = 0;
+                entity.ISurplusAmount = entity.IAmount;
+            }
+            else
+            {
+                var FD_IncomeManageData = fD_IncomeManageIBLL.GetFD_IncomeManageEntity(keyValue);
+                entity.IUseAmount = FD_IncomeManageData.IUseAmount;
+                entity.ISurplusAmount = entity.IAmount - FD_IncomeManageData.IUseAmount;
+            }
+
             fD_IncomeManageIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_PayManageController.cs

@@ -3,6 +3,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
 using Learun.Application.WorkFlow;
 
 namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
@@ -57,10 +58,32 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         {
             return View();
         }
-        
+
+        /// <summary>
+        /// 表单（基本承包经费支出）
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormPublic()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPTypeTree(string keyValue)
+        {
+            var data = fD_PayManageIBLL.GetTree();
+
+            return Success(data);
+        }
 
         /// <summary>
         /// 获取页面显示列表数据
@@ -106,14 +129,14 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetPrintData(string keyValue,string processId)
+        public ActionResult GetPrintData(string keyValue, string processId)
         {
             var FD_PayManageData = fD_PayManageIBLL.GetFD_PayManageEntity(keyValue);
-            var TaskLogList = (List<NWFTaskLogEntity>) nWFTaskIBLL.GetLogList(processId);
+            var TaskLogList = (List<NWFTaskLogEntity>)nWFTaskIBLL.GetLogList(processId);
             var jsonData = new
             {
                 FD_PayManage = FD_PayManageData,
-                TaskLogList= TaskLogList
+                TaskLogList = TaskLogList
             };
             return Success(jsonData);
         }
@@ -184,6 +207,40 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             FD_PayManageEntity entity = strEntity.ToObject<FD_PayManageEntity>();
+            //判断资金支出来源对应的收入预算是否存在
+            var ITopType = "";
+            var ISecondType = "";
+            if ((entity.PTopSource == "1" || entity.PTopSource == "2") || entity.PType == "2")
+            {
+                //学校经费  部门专项经费对应公用经费
+                ITopType = "0";
+                ISecondType = "1";
+            }
+            else if (entity.PTopSource == "3")
+            {
+                //财政专项经费
+                ITopType = "0";
+                ISecondType = "2";
+            }
+            else if (entity.PTopSource == "4")
+            {
+                //培训收入
+                ITopType = "2";
+            }
+
+            var incomlist = fD_IncomeManageIBLL.GetIncomeList(ITopType, ISecondType);
+            if (incomlist.Count() <= 0)
+                return Fail("请先添加对应的收入预算！");
+
+            if (entity.PTopSource == "3" && string.IsNullOrEmpty(entity.PIncomeId))
+            {
+                //财政专项经费
+                return Fail("请选择财政专项名称！");
+            }
+            else
+            {
+                entity.PIncomeId = incomlist.Select(x => x.IId).FirstOrDefault();
+            }
             fD_PayManageIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/Form.cshtml

@@ -3,13 +3,25 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="FD_BudgetBasics" >
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">姓名</div>
+        <input  type="text" class="form-control" readonly="readonly" value="@ViewBag.Name" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">部门</div>
+        <input  type="text" class="form-control" readonly="readonly" value="@ViewBag.Dept" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
+        <div class="lr-form-item-title">当前时间</div>
+        <input type="text" class="form-control" readonly="readonly" value="@ViewBag.Date" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
         <div class="lr-form-item-title">附件上传</div>
-        <div id="BFile"  ></div>
+        <div id="BFile"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FD_BudgetBasics" >
+    <div class="col-xs-12 lr-form-item" data-table="FD_BudgetBasics">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="BRemarks" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="BRemarks" class="form-control" style="height: 100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.cshtml

@@ -2,23 +2,21 @@
     ViewBag.Title = "收入预算管理";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
+@*财政预算-人员经费、公用经费*@
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
-        <div class="lr-form-item-title">项目编号</div>
-        <input id="IEnCode" type="text" class="form-control" />
-    </div>
+   
     <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
         <div class="lr-form-item-title">项目名称<font face="宋体">*</font></div>
         <input id="IName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+    @*<div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
         <div class="lr-form-item-title">预算类型<font face="宋体">*</font></div>
         <div id="ITopType" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
         <div class="lr-form-item-title">预算科目</div>
         <div id="ISecondType" ></div>
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage">
         <div class="lr-form-item-title">人数</div>
         <input id="IPeopleNum" type="number" class="form-control" isvalid="yes" checkexpession="NumOrNull" />
@@ -31,10 +29,7 @@
         <div class="lr-form-item-title" id="idIAmount">金额<font face="宋体">*</font></div>
         <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" id="divIActual" style="display: none" >
-        <div class="lr-form-item-title">年度实际收入<font face="宋体">*</font></div>
-        <input id="IActual" type="number" class="form-control"  />
-    </div>
+   
     <div class="col-xs-12 lr-form-item"  data-table="FD_IncomeManage" >
         <div class="lr-form-item-title">备注</div>
         <textarea id="IRemarks" class="form-control" style="height:100px;"  ></textarea>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.js

@@ -6,6 +6,8 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var ITopType = request('ITopType');
+var ISecondType = request('ISecondType');
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -15,42 +17,42 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#ITopType').lrDataItemSelect({
-                code: 'BudgetType', select: function (item) {
-                    if (item) {
-                        if (item.id == '0' || item.text == '财政预算') {
-                            $('#ISecondType').removeAttr("readonly");
-                            $('#idIQuota').html('定额<font face="宋体">*</font>');
-                            document.getElementById("divIActual").style.display = "none";
-                        } else {
-                            $('#IPeopleNum').attr('readonly', 'readonly');
-                            $('#ISecondType').lrDataItemSelect({ code: 'financeBudgetType' });
-                            $('#ISecondType').attr('readonly', 'readonly');
-                            $('#idIQuota').html('年度预计收入<font face="宋体">*</font>');
-                            document.getElementById("divIActual").style.display = "";
-                            $('#idIAmount').html('金额<font face="宋体">*</font>');
-                        }
-                    }
-                }
-            });
-            $('#ISecondType').lrDataItemSelect({ code: 'financeBudgetType', select: function(item) {
-                if (item) {
-                    if (item.text == '人员经费') {
-                        $('#IPeopleNum').removeAttr("readonly");
-                    } else {
-                        $('#IPeopleNum').val('');
-                        $('#IPeopleNum').attr('readonly', 'readonly');
-                    }
-                    if (item.text == '财政专项') {
-                        $('#idIQuota').html('申报金额<font face="宋体">*</font>');
-                        $('#idIAmount').html('批复金额<font face="宋体">*</font>');
-                    } else {
-                        $('#spanIQuota').text('定额<font face="宋体">*</font>');
-                        $('#idIAmount').html('金额<font face="宋体">*</font>');
-                    }
-                }
+            //$('#ITopType').lrDataItemSelect({
+            //    code: 'BudgetType', select: function (item) {
+            //        if (item) {
+            //            if (item.id == '0' || item.text == '财政预算') {
+            //                $('#ISecondType').removeAttr("readonly");
+            //                $('#idIQuota').html('定额<font face="宋体">*</font>');
+            //                document.getElementById("divIActual").style.display = "none";
+            //            } else {
+            //                $('#IPeopleNum').attr('readonly', 'readonly');
+            //                $('#ISecondType').lrDataItemSelect({ code: 'financeBudgetType' });
+            //                $('#ISecondType').attr('readonly', 'readonly');
+            //                $('#idIQuota').html('年度预计收入<font face="宋体">*</font>');
+            //                document.getElementById("divIActual").style.display = "";
+            //                $('#idIAmount').html('金额<font face="宋体">*</font>');
+            //            }
+            //        }
+            //    }
+            //});
+            //$('#ISecondType').lrDataItemSelect({ code: 'financeBudgetType', select: function(item) {
+            //    if (item) {
+            //        if (item.text == '人员经费') {
+            //            $('#IPeopleNum').removeAttr("readonly");
+            //        } else {
+            //            $('#IPeopleNum').val('');
+            //            $('#IPeopleNum').attr('readonly', 'readonly');
+            //        }
+            //        if (item.text == '财政专项') {
+            //            $('#idIQuota').html('申报金额<font face="宋体">*</font>');
+            //            $('#idIAmount').html('批复金额<font face="宋体">*</font>');
+            //        } else {
+            //            $('#spanIQuota').text('定额<font face="宋体">*</font>');
+            //            $('#idIAmount').html('金额<font face="宋体">*</font>');
+            //        }
+            //    }
 
-            } });
+            //} });
         },
         initData: function () {
             if (!!keyValue) {
@@ -72,8 +74,11 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
+        var strEntity = $('body').lrGetFormData();
+        strEntity.ITopType = ITopType;
+        strEntity.ISecondType = ISecondType;
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
+            strEntity: JSON.stringify(strEntity)
         };
         $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form2.cshtml

@@ -0,0 +1,37 @@
+@{
+    ViewBag.Title = "收入预算管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+@*事业收入、培训收入*@
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="FD_IncomeManage">
+        <div class="lr-form-item-title">项目名称<font face="宋体">*</font></div>
+        <input id="IName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    @*<div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+            <div class="lr-form-item-title">预算类型<font face="宋体">*</font></div>
+            <div id="ITopType" isvalid="yes" checkexpession="NotNull" ></div>
+        </div>
+        <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+            <div class="lr-form-item-title">预算科目</div>
+            <div id="ISecondType" ></div>
+        </div>*@
+
+    <div class="col-xs-6 lr-form-item" data-table="FD_IncomeManage" id="divIActual">
+        <div class="lr-form-item-title">年度实际收入<font face="宋体">*</font></div>
+        <input id="IActual" type="number" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_IncomeManage" id="divIActual">
+        <div class="lr-form-item-title">年度预计收入<font face="宋体">*</font></div>
+        <input id="IQuota" type="number" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_IncomeManage">
+        <div class="lr-form-item-title" id="idIAmount">金额<font face="宋体">*</font></div>
+        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_IncomeManage">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="IRemarks" class="form-control" style="height:100px;"></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form3.cshtml

@@ -0,0 +1,38 @@
+@{
+    ViewBag.Title = "收入预算管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+@*财政预算-财政专项*@
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+        <div class="lr-form-item-title">项目编号<font face="宋体">*</font></div>
+        <input id="IEnCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+        <div class="lr-form-item-title">项目名称<font face="宋体">*</font></div>
+        <input id="IName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    @*<div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+        <div class="lr-form-item-title">预算类型<font face="宋体">*</font></div>
+        <div id="ITopType" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+        <div class="lr-form-item-title">预算科目</div>
+        <div id="ISecondType" ></div>
+    </div>*@
+  
+    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
+        <div class="lr-form-item-title" id="idIQuota">申报金额<font face="宋体">*</font></div>
+        <input id="IQuota" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage">
+        <div class="lr-form-item-title" id="idIAmount">批复金额<font face="宋体">*</font></div>
+        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+   
+    <div class="col-xs-12 lr-form-item"  data-table="FD_IncomeManage" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="IRemarks" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.cshtml

@@ -2,7 +2,13 @@
     ViewBag.Title = "收入预算管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout  lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlg ">类型</div>
+            <div id="dataTree" class="lr-layout-body"></div>
+        </div>
+    </div>
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -43,10 +49,10 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js

@@ -5,12 +5,15 @@
  * 描  述：收入预算管理
  */
 var refreshGirdData;
+var ITopType;
+var ISecondType;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
-            page.initGird();
+            //page.initGird();
             page.bind();
+            page.initTree();
         },
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
@@ -38,10 +41,28 @@ var bootstrap = function ($, learun) {
             });
             // 新增
             $('#lr_add').on('click', function () {
+                if (!ITopType) {
+                    learun.alert.warning('请选择类型！');
+                    return;
+                }
+                if (ITopType == '0' && !ISecondType) {
+                    learun.alert.warning('请选择二级类型！');
+                    return;
+                }
+                var url = '';
+                if (ITopType == '1' || ITopType == '2') {
+                    //事业收入、培训收入
+                    url = '/ReceiveSendFeeManagement/FD_IncomeManage/Form2';
+                } else if (ITopType == '0' && ISecondType == '2') {
+                    //财政预算
+                    url = '/ReceiveSendFeeManagement/FD_IncomeManage/Form3';
+                } else {
+                    url = '/ReceiveSendFeeManagement/FD_IncomeManage/Form';
+                }
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/Form',
+                    url: top.$.rootUrl + url + '?ITopType=' + ITopType + '&ISecondType=' + ISecondType,
                     width: 600,
                     height: 400,
                     callBack: function (id) {
@@ -53,10 +74,20 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('IId');
                 if (learun.checkrow(keyValue)) {
+                    var url = '';
+                    if (ITopType == '1' || ITopType == '2') {
+                        //事业收入、培训收入
+                        url = '/ReceiveSendFeeManagement/FD_IncomeManage/Form2';
+                    } else if (ITopType == '0' && ISecondType == '2') {
+                        //财政预算
+                        url = '/ReceiveSendFeeManagement/FD_IncomeManage/Form3';
+                    } else {
+                        url = '/ReceiveSendFeeManagement/FD_IncomeManage/Form';
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + url + '?keyValue=' + keyValue + '&ITopType=' + ITopType + '&ISecondType=' + ISecondType,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
@@ -83,50 +114,156 @@ var bootstrap = function ($, learun) {
                 $('#gridtable').jqprintTable();
             });
         },
+        initTree: function () {
+            $('#dataTree').lrtree({
+                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetTree',
+                nodeClick: function (item) {
+                    if (item.parent) {
+                        ISecondType = item.value;
+                        ITopType = item.parent.value;
+                    } else {
+                        ITopType = item.value;
+                        ISecondType = '';
+                    }
+                    page.initGird();
+                    page.search({ ITopType: ITopType, ISecondType: ISecondType });
+                }
+            });
+        },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').jfGrid({
-                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetPageList',
-                headData: [
-                    { label: "项目编号", name: "IEnCode", width: 100, align: "left" },
-                    { label: "项目名称", name: "IName", width: 100, align: "left" },
-                    {
-                        label: "预算类型", name: "ITopType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'BudgetType',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "预算科目", name: "ISecondType", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'financeBudgetType',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
-                    { label: "人数", name: "IPeopleNum", width: 100, align: "left" },
-                    { label: "定额/申报金额", name: "IQuota", width: 150, align: "left" },
-                    { label: "年度预计收入", name: "IQuota", width: 150, align: "left" },
-                    { label: "年度实际收入", name: "IActual", width: 100, 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: "IRemarks", width: 100, align: "left" },
-                ],
-                mainId: 'IId',
-                isPage: true
-            });
-            page.search();
+            $("#gridtable").empty();
+            $("#gridtable")[0].dfop = undefined;
+            if (ITopType == '1' || ITopType == '2') {
+                //事业收入、培训收入
+                $('#gridtable').jfGrid({
+                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetPageList',
+                    headData: [
+                        {
+                            label: "预算类型", name: "ITopType", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('dataItem', {
+                                    key: value,
+                                    code: 'BudgetType',
+                                    callback: function (_data) {
+                                        callback(_data.text);
+                                    }
+                                });
+                            }
+                        },
+                        //{ label: "项目编号", name: "IEnCode", width: 100, align: "left" },
+                        { label: "项目名称", name: "IName", 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: "IRemarks", width: 100, align: "left" },
+                    ],
+                    mainId: 'IId',
+                    isPage: true
+                });
+
+            } else if (ITopType == '0' && ISecondType == '2') {
+                //财政预算-财政专项
+                $('#gridtable').jfGrid({
+                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetPageList',
+                    headData: [
+                        {
+                            label: "预算类型",
+                            name: "ITopType",
+                            width: 100,
+                            align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'BudgetType',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
+                        },
+                        {
+                            label: "预算科目",
+                            name: "ISecondType",
+                            width: 100,
+                            align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'financeBudgetType',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
+                        },
+                        { label: "项目编号", name: "IEnCode", width: 100, align: "left" },
+                        { label: "项目名称", name: "IName", 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: "IRemarks", width: 100, align: "left" }
+                    ],
+                    mainId: 'IId',
+                    isPage: true
+                });
+            }
+            else {
+                //财政预算-人员经费、公用经费
+                $('#gridtable').jfGrid({
+                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetPageList',
+                    headData: [
+                        {
+                            label: "预算类型",
+                            name: "ITopType",
+                            width: 100,
+                            align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'BudgetType',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
+                        },
+                        {
+                            label: "预算科目",
+                            name: "ISecondType",
+                            width: 100,
+                            align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'financeBudgetType',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
+                        },
+                        //{ label: "项目编号", name: "IEnCode", width: 100, align: "left" },
+                        { label: "项目名称", name: "IName", 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: "IRemarks", width: 100, align: "left" },
+                    ],
+                    mainId: 'IId',
+                    isPage: true
+                });
+            }
+            //page.search();
         },
         search: function (param) {
             param = param || {};

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml

@@ -3,11 +3,11 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="FD_PayManage" >
-        <div class="lr-form-item-title">报销类型</div>
-        <div id="PType"  ></div>
+    <div class="col-xs-6 lr-form-item"  data-table="FD_PayManage" style="display: none">
+        <div class="lr-form-item-title">报销类型<font face="宋体">*</font></div>
+        <div id="PType"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="FD_PayManage" >
+    <div class="col-xs-12 lr-form-item"  data-table="FD_PayManage" >
         <div class="lr-form-item-title">付款方式<font face="宋体">*</font></div>
         <div id="PPayType" isvalid="yes" checkexpession="NotNull" ></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.js

@@ -6,6 +6,8 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+//报销类型
+var ptype = request('ptype');
 // 设置权限
 var setAuthorize;
 // 设置表单数据
@@ -23,22 +25,42 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#PType').lrDataItemSelect({ code: 'payReimburseType' });
+            $('#PType').lrDataItemSelect({
+                code: 'payReimburseType', select: function (item) {
+                    if (item) {
+                        if (item.id == '1') {
+                            //基本承包经费外支出
+                            $('#PTopSource').removeAttr("readonly");
+                            $('#PIncomeId').removeAttr("readonly");
+                        } else {
+                            //基本承包经费支出不需要选择资金支出来源
+                            //$('#PTopSource').html('');
+                            //$('#PIncomeId').html('');
+                            $('#PTopSource').attr('readonly', 'readonly');
+                            $('#PIncomeId').attr('readonly', 'readonly');
+                        }
+                    }
+                }
+            });
             $('#PPayType').lrDataItemSelect({ code: 'fdPayType' });
             $('#PTopSource').lrDataItemSelect({
                 code: 'fdPaySource', select: function (item) {
                     var budgetType = '';
                     var financeBudgetType = '';
                     if (item) {
-                        if (item.text == '学校经费' || item.text == '部门专项经费') {
+                        if (item.id == '1' || item.id == '2') {
+                            //学校经费  部门专项经费,都走公用经费
                             budgetType = '0';
                             financeBudgetType = '1';
-                        } else if (item.text == '财政专项经费') {
+                        } else if (item.id == '3') {
+                            //财政专项经费
                             budgetType = '0';
                             financeBudgetType = '2';
-                        } else {
+                        } else if (item.id == '4') {
+                            //培训收入
                             budgetType = '2';
                         }
+
                     }
 
                     //财政专项名称
@@ -49,6 +71,13 @@ var bootstrap = function ($, learun) {
                         value: 'value',
                         text: 'text'
                     });
+                    //if (item) {
+                    //    if (item.id == '3') {
+                    //        $('#PIncomeId').removeAttr("readonly");
+                    //    } else {
+                    //        $('#PIncomeId').attr('readonly', 'readonly');
+                    //    }
+                    //}
                 }
             });
 
@@ -104,7 +133,7 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     save = function (processId, callBack, i) {
-        console.log('保存');
+
         if (!$('body').lrValidform()) {
             return false;
         }
@@ -113,9 +142,11 @@ var bootstrap = function ($, learun) {
         if (!!processId) {
             strEntity.PProcessId = processId;
         }
+        strEntity.PType = ptype;
         postData.strEntity = JSON.stringify(strEntity);
 
         $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            console.log('aaaaa');
             if (!!processId) {
                 var res = {};
                 res.code = 200;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.cshtml

@@ -0,0 +1,63 @@
+@{
+    ViewBag.Title = "基本承包经费支出";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="FD_PayManage" style="display: none">
+        <div class="lr-form-item-title">报销类型<font face="宋体">*</font></div>
+        <div id="PType"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">付款方式<font face="宋体">*</font></div>
+        <div id="PPayType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">收款单位</div>
+        <input id="PPayee" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">开户银行</div>
+        <input id="PPayeeBank" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">银行账号</div>
+        <input id="PPayeeBankAccount" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">收款人</div>
+        <input id="PCollectionUser" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">开卡银行</div>
+        <input id="PCollectionBank1" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">卡号</div>
+        <input id="PCollectionBankAccount1" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">开卡银行</div>
+        <input id="PCollectionBank2" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">卡号</div>
+        <input id="PCollectionBankAccount2" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">资金支出用途</div>
+        <textarea id="PPurpose" class="form-control" style="height:80px;"></textarea>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">资金支出来源</div>
+        <div id="PTopSource"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">财政专项名称</div>
+        <div id="PIncomeId"></div>
+    </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">报销金额<font face="宋体">*</font></div>
+        <input id="PAmount" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.js

@@ -0,0 +1,167 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-05-28 14:18
+ * 描  述：支出预算管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+//报销类型
+var ptype = request('ptype');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#PType').lrDataItemSelect({
+                code: 'payReimburseType', select: function (item) {
+                    if (item) {
+                        if (item.id == '1') {
+                            //基本承包经费外支出
+                            $('#PTopSource').removeAttr("readonly");
+                            $('#PIncomeId').removeAttr("readonly");
+                        } else {
+                            //基本承包经费支出不需要选择资金支出来源
+                            //$('#PTopSource').html('');
+                            //$('#PIncomeId').html('');
+                            $('#PTopSource').attr('readonly', 'readonly');
+                            $('#PIncomeId').attr('readonly', 'readonly');
+                        }
+                    }
+                }
+            });
+            $('#PPayType').lrDataItemSelect({ code: 'fdPayType' });
+            $('#PTopSource').lrDataItemSelect({
+                code: 'fdPaySource', select: function (item) {
+                    var budgetType = '';
+                    var financeBudgetType = '';
+                    if (item) {
+                        if (item.id == '1' || item.id == '2') {
+                            //学校经费  部门专项经费,都走公用经费
+                            budgetType = '0';
+                            financeBudgetType = '1';
+                        } else if (item.id == '3') {
+                            //财政专项经费
+                            budgetType = '0';
+                            financeBudgetType = '2';
+                        } else if (item.id == '4') {
+                            //培训收入
+                            budgetType = '2';
+                        }
+
+                    }
+
+                    //财政专项名称
+                    $('#PIncomeId').lrselectRefresh({
+                        placeholder: "请选择财政专项名称",
+                        allowSearch: true,
+                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetIncomeList?budgetType=' + budgetType + '&financeBudgetType=' + financeBudgetType,
+                        value: 'value',
+                        text: 'text'
+                    });
+                    //if (item) {
+                    //    if (item.id == '3') {
+                    //        $('#PIncomeId').removeAttr("readonly");
+                    //    } else {
+                    //        $('#PIncomeId').attr('readonly', 'readonly');
+                    //    }
+                    //}
+                }
+            });
+
+            //财政专项名称
+            $('#PIncomeId').lrselect({
+                placeholder: "请选择财政专项名称",
+                allowSearch: true,
+                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetIncomeList?budgetType=&financeBudgetType=',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'FD_PayManage' && data[id]) {
+                            keyValue = data[id].PId;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {};
+        var strEntity = $('body').lrGetFormData();
+        if (!!processId) {
+            strEntity.PProcessId = processId;
+        }
+        strEntity.PType = ptype;
+        postData.strEntity = JSON.stringify(strEntity);
+
+        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            console.log('aaaaa');
+            if (!!processId) {
+                var res = {};
+                res.code = 200;
+                if (!!callBack) {
+                    callBack(res, i);
+                }
+
+            } else {
+                // 保存成功后才回调
+                if (!!callBack) {
+                    callBack(res, strEntity, i);
+                }
+            }
+        });
+    };
+
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Index.cshtml

@@ -2,7 +2,13 @@
     ViewBag.Title = "支出预算管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout  lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title lrlg ">类型</div>
+            <div id="dataTree" class="lr-layout-body"></div>
+        </div>
+    </div>
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Index.js

@@ -6,12 +6,15 @@
  */
 var refreshGirdData;
 var processId = '';
+var ptype = '';
+var url = '';
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
             page.initGird();
             page.bind();
+            page.initTree();
         },
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
@@ -22,19 +25,22 @@ var bootstrap = function ($, learun) {
             $('#PTopSource').lrDataItemSelect({ code: 'fdPaySource' });
             // 刷新
             $('#lr_refresh').on('click', function () {
-                location.reload();
+                refreshGirdData();
             });
             // 新增
             $('#lr_add').on('click', function () {
+                if (!ptype) {
+                    learun.alert.warning("请选择类型！");
+                    return;
+                }
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/Form',
+                    url: top.$.rootUrl + url + '?ptype=' + ptype,
                     width: 800,
                     height: 600,
                     callBack: function (id) {
-                        top[id].save();
-                        return location.reload();
+                        return top[id].save('', refreshGirdData());
                     }
                 });
             });
@@ -43,19 +49,18 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('PId');
                 var status = $('#gridtable').jfGridValue('PStatus');
                 if (status != 0) {
-                    learun.alert.warning("当前项目已提交，不可修改！");
+                    learun.alert.warning("当前项目已提交，不可编辑！");
                     return;
                 }
                 if (learun.checkrow(keyValue)) {
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + url + '?keyValue=' + keyValue + '&ptype=' + ptype,
                         width: 800,
                         height: 600,
                         callBack: function (id) {
-                            top[id].save();
-                            return refreshGirdData('', '', '');
+                            return top[id].save('', refreshGirdData());
                         }
                     });
                 }
@@ -83,7 +88,11 @@ var bootstrap = function ($, learun) {
                 //$('#gridtable').jqprintTable();
                 var keyValue = $('#gridtable').jfGridValue('PId');
                 var processId = $('#gridtable').jfGridValue('PProcessId');
-                
+                var status = $('#gridtable').jfGridValue('PStatus');
+                if (status == '0') {
+                    learun.alert.warning("请先提交当前项目！");
+                    return;
+                }
                 if (learun.checkrow(keyValue)) {
                     var type = $('#gridtable').jfGridValue('PType');
                     //PType 1:基本承包经费外支出--专用经费报销流程; 2:基本承包经费支出--公用经费报销流程
@@ -106,7 +115,7 @@ var bootstrap = function ($, learun) {
                         return;
                     }
                     var PType = $('#gridtable').jfGridValue('PType');
-                    
+
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
                             processId = learun.newGuid();
@@ -118,6 +127,20 @@ var bootstrap = function ($, learun) {
                 }
             });
         },
+        initTree: function () {
+            $('#dataTree').lrtree({
+                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetPTypeTree',
+                nodeClick: function (item) {
+                    ptype = item.value;
+                    url = '/ReceiveSendFeeManagement/FD_PayManage/Form';
+                    if (ptype == '2') {
+                        //基本承包经费外支出
+                        url = '/ReceiveSendFeeManagement/FD_PayManage/FormPublic';
+                    }
+                    page.search({ PType: ptype });
+                }
+            });
+        },
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -139,6 +162,23 @@ var bootstrap = function ($, learun) {
                                 });
                         }
                     },
+                    {
+                        label: "报销部门",
+                        name: "PDept",
+                        width: 100,
+                        align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '报销时间', name: 'PTime', width: 200, align: "left" },
                     {
                         label: "付款方式",
                         name: "PPayType",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/PrintPublic.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "支出预算管理";
+    ViewBag.Title = "基本承包经费支出打印";
     Layout = "~/Views/Shared/_SimpleForm.cshtml";
 }
 <style>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/PrintPublic.js

@@ -132,7 +132,6 @@ var bootstrap = function ($, learun) {
                 }
                 if (data && data.TaskLogList) {
                     processInfo = data.TaskLogList;
-                    console.log(processInfo);
                     //部门领导
                     var bmld = '';
                     var bmldyj = '';

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1418,6 +1418,7 @@
     <Content Include="Areas\PersonnelManagement\Views\VisitorInfo\ExamineForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\VisitorInfo\fromAdd.css" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\AmountConversion.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\FormPublic.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\PrintPublic.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\PrintSpecial.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerIndex.js" />
@@ -7295,6 +7296,9 @@
     <Content Include="Areas\PersonnelManagement\Views\VisitorInfo\ExamineForm.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\PrintSpecial.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\PrintPublic.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_PayManage\FormPublic.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_IncomeManage\Form2.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_IncomeManage\Form3.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_IncomeManage/FD_IncomeManageBLL.cs

@@ -43,7 +43,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             }
         }
 
-        
+
         /// <summary>
         /// 获取FD_IncomeManage表实体数据
         /// </summary>
@@ -92,6 +92,61 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             }
         }
 
+
+        /// <summary> 
+        /// 获取左侧树形数据 
+        /// <summary> 
+        /// <returns></returns> 
+        public List<TreeModel> GetTree()
+        {
+            try
+            {
+                DataTable list = fD_IncomeManageService.GetSqlTree("BudgetType");
+                DataTable childlist = fD_IncomeManageService.GetSqlTree("financeBudgetType");
+                List<TreeModel> treeList = new List<TreeModel>();
+                
+                foreach (DataRow item in list.Rows)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item["f_itemdetailid"].ToString(),
+                        text = item["f_itemname"].ToString(),
+                        value = item["f_itemvalue"].ToString(),
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = ""
+                    };
+                    treeList.Add(node);
+                }
+                foreach (DataRow item in childlist.Rows)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item["f_itemdetailid"].ToString(),
+                        text = item["f_itemname"].ToString(),
+                        value = item["f_itemvalue"].ToString(),
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = "6f52162a-1886-457a-a080-6f8d1156c5df"
+                    };
+                    treeList.Add(node);
+                }
+                return treeList.ToTree();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_IncomeManage/FD_IncomeManageIBLL.cs

@@ -29,6 +29,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         FD_IncomeManageEntity GetFD_IncomeManageEntity(string keyValue);
+        /// <summary>
+        /// 左侧树结构
+        /// </summary>
+        /// <returns></returns>
+        List<TreeModel> GetTree();
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_IncomeManage/FD_IncomeManageService.cs

@@ -148,6 +148,29 @@ isnull(t.ISurplusAmount,0) as ISurplusAmount
             }
         }
 
+
+        /// <summary> 
+        /// 获取树形数据 
+        /// </summary> 
+        /// <returns></returns> 
+        public DataTable GetSqlTree(string ItemCode)
+        {
+            try
+            {
+                return this.BaseRepository().FindTable($" SELECT * FROM dbo.LR_Base_DataItemDetail WHERE F_ItemId= (SELECT F_ItemId FROM dbo.LR_Base_DataItem WHERE F_ItemCode ='{ItemCode}') ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageBLL.cs

@@ -18,6 +18,44 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
 
         #region 获取数据
 
+        /// <summary> 
+        /// 获取左侧树形数据 
+        /// <summary> 
+        /// <returns></returns> 
+        public List<TreeModel> GetTree()
+        {
+            try
+            {
+                DataTable list = fD_PayManageService.GetSqlTree();
+                List<TreeModel> treeList = new List<TreeModel>();
+                foreach (DataRow item in list.Rows)
+                {
+                    TreeModel node = new TreeModel
+                    {
+                        id = item["f_itemvalue"].ToString(),
+                        text = item["f_itemname"].ToString(),
+                        value = item["f_itemvalue"].ToString(),
+                        showcheck = false,
+                        checkstate = 0,
+                        isexpand = true,
+                        parentId = ""
+                    };
+                    treeList.Add(node);
+                }
+                return treeList.ToTree();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageIBLL.cs

@@ -14,7 +14,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     public interface FD_PayManageIBLL
     {
         #region 获取数据
-
+        /// <summary>
+        /// 获取左侧树结构
+        /// </summary>
+        /// <returns></returns>
+        List<TreeModel> GetTree();
         /// <summary>
         /// 获取页面显示列表数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageService.cs

@@ -18,7 +18,28 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     public class FD_PayManageService : RepositoryFactory
     {
         #region 获取数据
-
+        /// <summary> 
+        /// 获取树形数据 
+        /// </summary> 
+        /// <returns></returns> 
+        public DataTable GetSqlTree()
+        {
+            try
+            {
+                return this.BaseRepository().FindTable(" SELECT * FROM dbo.LR_Base_DataItemDetail WHERE F_ItemId= (SELECT F_ItemId FROM dbo.LR_Base_DataItem WHERE F_ItemCode ='payReimburseType') ");
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// </summary>
@@ -48,7 +69,9 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 t.PIncomeId,
                 t.PAmount,
                 t.PStatus,
-t.PProcessId
+t.PProcessId，
+t.PDept,
+t.PTime
                 ");
                 strSql.Append("  FROM FD_PayManage t ");
                 strSql.Append("  WHERE 1=1  and PIsDelete<>1");
@@ -263,6 +286,10 @@ t.PProcessId
                             status = 0;
                         }
                     }
+                    else
+                    {
+                        status = 0;
+                    }
                 }
 
                 entity.PStatus = status;