调整新生学费变更、收入支出预算管理、合同流程监控、合同归档

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.js

@@ -82,31 +82,40 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     save = function (processId, callBack, i) {
-        if (!$('body').lrValidform()) {
-            return false;
-        }
-        var postData = {};
-        var strEntity = $('body').lrGetFormData();
         if (!!processId) {
-            strEntity.SupportProcessId = processId;
-        }
-        postData.strEntity = JSON.stringify(strEntity);
+            var res = {};
+            res.code = 200;
+            if (!!callBack) {
+                callBack(res, i);
+            }
 
-        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/SupportChange?keyValue=' + keyValue, postData, function (res) {
+        } else {
+            if (!$('body').lrValidform()) {
+                return false;
+            }
+            var postData = {};
+            var strEntity = $('body').lrGetFormData();
             if (!!processId) {
-                var res = {};
-                res.code = 200;
-                if (!!callBack) {
-                    callBack(res, i);
-                }
-                
-            } else {
-                // 保存成功后才回调
-                if (!!callBack) {
-                    callBack(res, strEntity, i);
-                }
+                strEntity.SupportProcessId = processId;
             }
-        });
+            postData.strEntity = JSON.stringify(strEntity);
+
+            $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/SupportChange?keyValue=' + keyValue, postData, function (res) {
+                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/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js

@@ -123,7 +123,7 @@ var bootstrap = function ($, learun) {
                         label: "审批状态", name: "SupportStatus", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
                             if (cellvalue === 1) {
-                                return '<span class=\"label label-warning\">审批中</span>';
+                                return '<span class=\"label label-warning\">进行中</span>';
                             } else if (cellvalue === 2) {
                                 return '<span class=\"label label-success\">审批通过</span>';
                             } else {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js

@@ -114,7 +114,19 @@ var bootstrap = function ($, learun) {
                     { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
                     { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" },
                     { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" },
-                    { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" },
+                    {
+                        label: '申报人', name: 'F_CreateUserName', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
                     { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
                     { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml

@@ -2,17 +2,7 @@
     ViewBag.Title = "流程监控";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div id="lr_layout" class="lr-layout lr-layout-left-center">
-    <div class="lr-layout-left">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
-            <div class="lr-layout-body">
-                <ul class="lr-left-list" id="lr_left_list">
-                    <li class="active lrlg" data-value="0">未完成</li>
-                    <li data-value="1" class="lrlg">已完成</li>
-                </ul>
-            </div>
-        </div>
-    </div>
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -36,12 +26,11 @@
                     </div>
                 </div>
             </div>
-
-            <div class="lr-layout-body" id="gridtable">
-            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
         </div>
     </div>
 </div>
+
 @Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js")
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js

@@ -7,14 +7,14 @@
  */
 var bootstrap = function ($, learun) {
     "use strict";
-    var categoryId = '0';
+    //var categoryId = '0';
     var logbegin = '';
     var logend = '';
 
     var page = {
         init: function () {
             $('#lr_verify').hide();
-            page.initleft();
+            //page.initleft();
             page.initGrid();
             page.bind();
         },
@@ -58,16 +58,16 @@ var bootstrap = function ($, learun) {
             });
             
         },
-        initleft: function () {
-            $('#lr_left_list li').on('click', function () {
-                var $this = $(this);
-                var $parent = $this.parent();
-                $parent.find('.active').removeClass('active');
-                $this.addClass('active');
-                categoryId = $this.attr('data-value');
-                page.search();
-            });
-        },
+        //initleft: function () {
+        //    $('#lr_left_list li').on('click', function () {
+        //        var $this = $(this);
+        //        var $parent = $this.parent();
+        //        $parent.find('.active').removeClass('active');
+        //        $this.addClass('active');
+        //        categoryId = $this.attr('data-value');
+        //        page.search();
+        //    });
+        //},
         initGrid: function () {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetContractList',
@@ -75,7 +75,19 @@ var bootstrap = function ($, learun) {
                     { label: '合同编号', name: 'LC_htbh', width: 150, align: "left" },
                     { label: '合同名称', name: 'LC_htmc', width: 200, align: "left" },
                     { label: '合同额(万元)', name: 'LC_htzje', width: 200, align: "left" },
-                    { label: '申报人', name: 'F_ModifyUserName', width: 100, align: "left" },
+                    {
+                        label: '申报人', name: 'F_CreateUserName', width: 100, align: "left" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: '对方单位名称', name: 'LC_dfdw', width: 200, align: "left" },
                     { label: '联系人', name: 'LC_dflxr', width: 100, align: "left" },
                     { label: '联系方式', name: 'LC_dfdh', width: 120, align: "left" },
@@ -105,7 +117,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
-            param.F_IsFinished = categoryId;
+            param.F_IsFinished = 0;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         eye: function () {

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

@@ -4,6 +4,7 @@ using System.Data;
 using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
 {
@@ -72,9 +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);
             var jsonData = new
             {
-                rows = data,
+                rows = list,
                 total = paginationobj.total,
                 page = paginationobj.page,
                 records = paginationobj.records

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

@@ -154,7 +154,7 @@ var bootstrap = function ($, learun) {
                             if (cellvalue == 0) {
                                 return '<span class=\"label label-default\" style=\"cursor: pointer;\">草稿</span>';
                             } else if (cellvalue == 1) {
-                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">审批中</span>';
+                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">进行中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" style=\"cursor: pointer;\">已审批</span>';
                             }

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

@@ -139,6 +139,7 @@ var bootstrap = function ($, learun) {
                 $('#gridtable').jfGrid({
                     url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetPageList',
                     headData: [
+                        { label: "项目名称", name: "IName", width: 100, align: "left" },
                         {
                             label: "预算类型", name: "ITopType", width: 100, align: "left",
                             formatterAsync: function (callback, value, row, op, $cell) {
@@ -152,7 +153,6 @@ var bootstrap = function ($, learun) {
                             }
                         },
                         //{ 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" },
@@ -169,6 +169,8 @@ var bootstrap = function ($, learun) {
                 $('#gridtable').jfGrid({
                     url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetPageList',
                     headData: [
+                        { label: "项目名称", name: "IName", width: 100, align: "left" },
+                        { label: "项目编号", name: "IEnCode", width: 100, align: "left" },
                         {
                             label: "预算类型",
                             name: "ITopType",
@@ -201,8 +203,6 @@ var bootstrap = function ($, learun) {
                                     });
                             }
                         },
-                        { 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" },
@@ -218,6 +218,7 @@ var bootstrap = function ($, learun) {
                 $('#gridtable').jfGrid({
                     url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_IncomeManage/GetPageList',
                     headData: [
+                        { label: "项目名称", name: "IName", width: 100, align: "left" },
                         {
                             label: "预算类型",
                             name: "ITopType",
@@ -251,7 +252,6 @@ var bootstrap = function ($, learun) {
                             }
                         },
                         //{ 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" },

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

@@ -59,5 +59,10 @@
         <div class="lr-form-item-title">支出金额<font face="宋体">*</font></div>
         <input id="PAmount" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="PFile"></div>
+    </div>
+
 </div>
 @Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.js")

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

@@ -25,6 +25,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#PFile').lrUploader();
+
             $('#PType').lrDataItemSelect({
                 code: 'payReimburseType', select: function (item) {
                     if (item) {
@@ -133,34 +135,42 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     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);
+            var res = {};
+            res.code = 200;
+            if (!!callBack) {
+                callBack(res, i);
+            }
 
-        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            console.log('aaaaa');
+        } else {
+            if (!$('body').lrValidform()) {
+                return false;
+            }
+            var postData = {};
+            var strEntity = $('body').lrGetFormData();
             if (!!processId) {
-                var res = {};
-                res.code = 200;
-                if (!!callBack) {
-                    callBack(res, i);
-                }
+                strEntity.PProcessId = processId;
+            }
+            strEntity.PType = ptype;
+            postData.strEntity = JSON.stringify(strEntity);
+
+            $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+
+                if (!!processId) {
+                    var res = {};
+                    res.code = 200;
+                    if (!!callBack) {
+                        callBack(res, i);
+                    }
 
-            } else {
-                // 保存成功后才回调
-                if (!!callBack) {
-                    callBack(res, strEntity, i);
+                } else {
+                    // 保存成功后才回调
+                    if (!!callBack) {
+                        callBack(res, strEntity, i);
+                    }
                 }
-            }
-        });
+            });
+        }
     };
 
     page.init();

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

@@ -48,16 +48,20 @@
         <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="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 class="col-xs-12 lr-form-item" data-table="FD_PayManage">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="PFile"></div>
+    </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

@@ -25,6 +25,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#PFile').lrUploader();
             $('#PType').lrDataItemSelect({
                 code: 'payReimburseType', select: function (item) {
                     if (item) {

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

@@ -248,7 +248,7 @@ var bootstrap = function ($, learun) {
                             if (cellvalue == '0') {
                                 return '<span class=\"label label-default\" style=\"cursor: pointer;\">草稿</span>';
                             } else if (cellvalue == '1') {
-                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">审批中</span>';
+                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">进行中</span>';
                             } else if (cellvalue == '2') {
                                 return '<span class=\"label label-success\" style=\"cursor: pointer;\">已审批</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs

@@ -2642,9 +2642,13 @@ where StuId='{keyValue}'";
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     var userinfo = LoginUserInfo.Get();
-                    string sql = $@"update StuEnroll set SupportBank='{entity.SupportBank}',
+                    string sql = $@"update StuEnroll set 
+StuName='{entity.StuName}',
+ClassNo='{entity.ClassNo}',
+SupportBank='{entity.SupportBank}',
 SupportBankCard='{entity.SupportBankCard}',
 SupportAmount='{entity.SupportAmount}',
+SecondMobile='{entity.SecondMobile}',
 SupportProcessId='{entity.SupportProcessId}',
 SupportChangeRemark='{entity.SupportChangeRemark}',
 SupportStatus=0,IsSupportChange=1,

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

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     /// 日 期：2021-05-28 14:18
     /// 描 述：支出预算管理
     /// </summary>
-    public class FD_PayManageEntity 
+    public class FD_PayManageEntity
     {
         #region 实体成员
         /// <summary>
@@ -125,6 +125,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("PREMARKS")]
         public string PRemarks { get; set; }
         /// <summary>
+        /// 附件
+        /// </summary>
+        [Column("PFILE")]
+        public string PFile { get; set; }
+        /// <summary>
         /// 状态 0草稿，1审批中，2已通过，3已拒绝
         /// </summary>
         [Column("PSTATUS")]