From adb4eff5b803ce81378800e7dd7f2953e5413c1b Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 10 Jun 2021 18:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E7=94=9F=E5=AD=A6?= =?UTF-8?q?=E8=B4=B9=E5=8F=98=E6=9B=B4=E3=80=81=E6=94=B6=E5=85=A5=E6=94=AF?= =?UTF-8?q?=E5=87=BA=E9=A2=84=E7=AE=97=E7=AE=A1=E7=90=86=E3=80=81=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=B5=81=E7=A8=8B=E7=9B=91=E6=8E=A7=E3=80=81=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=BD=92=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuEnroll/HelpChange.js | 51 ++++++++++------- .../Views/StuEnroll/IndexHelpChange.js | 2 +- .../Views/NWFProcess/ContractFiling.js | 14 ++++- .../NWFProcess/ContractFilingMonitor.cshtml | 17 +----- .../Views/NWFProcess/ContractFilingMonitor.js | 40 ++++++++----- .../Controllers/FD_IncomeManageController.cs | 12 +++- .../Views/FD_BudgetBasics/Index.js | 2 +- .../Views/FD_IncomeManage/Index.js | 8 +-- .../Views/FD_PayManage/Form.cshtml | 5 ++ .../Views/FD_PayManage/Form.js | 56 +++++++++++-------- .../Views/FD_PayManage/FormPublic.cshtml | 18 +++--- .../Views/FD_PayManage/FormPublic.js | 1 + .../Views/FD_PayManage/Index.js | 2 +- .../StuEnroll/StuEnrollService.cs | 6 +- .../FD_PayManage/FD_PayManageEntity.cs | 7 ++- 15 files changed, 151 insertions(+), 90 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.js index ecc714151..54f8dd8d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/HelpChange.js +++ b/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(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js index 5b81a21b3..b59722ba2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js +++ b/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 '审批中'; + return '进行中'; } else if (cellvalue === 2) { return '审批通过'; } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js index 0fb5e7356..7ec9eb6c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js +++ b/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" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml index 62ebf7269..f269cf037 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.cshtml +++ b/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"; } -
-
-
-
-
    -
  • 未完成
    • -
  • 已完成
    • -
-
-
-
+
@@ -36,12 +26,11 @@
- -
-
+
+ @Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js index f5075048a..1d482a905 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFilingMonitor.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs index dba042f67..744c1b24d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_IncomeManageController.cs @@ -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(); 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 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/Index.js index 1ecaf08ea..88ed6de4a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_BudgetBasics/Index.js +++ b/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 '草稿'; } else if (cellvalue == 1) { - return '审批中'; + return '进行中'; } else if (cellvalue == 2) { return '已审批'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js index ee4c5b229..7b4cce1d8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Index.js @@ -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" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml index b754e2956..bb68cbe6f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml @@ -59,5 +59,10 @@
支出金额*
+
+
附件上传
+
+
+ @Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.js index 22cb027d2..eec46ba49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.js +++ b/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(); 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 66705a592..c66a9750b 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 @@ -48,16 +48,20 @@ @*
-
资金支出来源
-
-
-
-
财政专项名称
-
-
*@ +
资金支出来源
+
+ +
+
财政专项名称
+
+
*@
报销金额*
+
+
附件上传
+
+
@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.js index 22cb027d2..18e2102a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Index.js index 90994f348..dae2a4e39 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Index.js +++ b/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 '草稿'; } else if (cellvalue == '1') { - return '审批中'; + return '进行中'; } else if (cellvalue == '2') { return '已审批'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs index 47561bef4..62c09d6be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs +++ b/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, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageEntity.cs index f36a71f9d..56c3cd68a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageEntity.cs +++ b/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 /// 描 述：支出预算管理 /// - public class FD_PayManageEntity + public class FD_PayManageEntity { #region 实体成员 /// @@ -125,6 +125,11 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement [Column("PREMARKS")] public string PRemarks { get; set; } /// + /// 附件 + /// + [Column("PFILE")] + public string PFile { get; set; } + /// /// 状态 0草稿，1审批中，2已通过，3已拒绝 /// [Column("PSTATUS")]