From 7eac2ad396be1f8a6c758da1fd99c5ea32423f87 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 10 Jun 2021 10:40:11 +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=AF=E5=87=BA=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E3=80=82=E8=B0=83=E6=95=B4=E6=A1=86=E6=9E=B6=E4=B8=8A?= =?UTF-8?q?=E9=83=A8=E5=8E=9F=E5=85=88=E6=98=BE=E7=A4=BA=E7=AE=80=E4=BD=93?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuEnroll/IndexHelpChange.cshtml | 1 + .../Views/StuEnroll/IndexHelpChange.js | 33 ++++++++++++------- .../Views/FD_PayManage/Index.js | 1 + .../Views/Home/AdminAccordion.cshtml | 4 +-- .../Views/Home/AdminDefault.cshtml | 4 +-- .../Views/Home/AdminDefaultForDC.cshtml | 4 +-- .../Views/Home/AdminNavigation.cshtml | 4 +-- .../Views/Home/AdminTheme5.cshtml | 4 +-- .../Views/Home/AdminTop.cshtml | 4 +-- .../Views/Home/AdminWindos.cshtml | 4 +-- .../FD_PayManage/FD_PayManageService.cs | 2 +- 11 files changed, 39 insertions(+), 26 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml index 7455ffee8..976ec5338 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml @@ -60,6 +60,7 @@  查看  编辑   提交 + 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 d8265749f..5b81a21b3 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 @@ -37,17 +37,19 @@ var bootstrap = function ($, learun) { }); //查看 $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('StuId'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue, - width: 800, - height: 600, - btn: null - }); - } + page.eye(); + + //var keyValue = $('#gridtable').jfGridValue('StuId'); + //if (learun.checkrow(keyValue)) { + // learun.layerForm({ + // id: 'form', + // title: '查看', + // url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue, + // width: 800, + // height: 600, + // btn: null + // }); + //} }); //编辑 $('#lr_edit').on('click', function () { @@ -113,6 +115,7 @@ var bootstrap = function ($, learun) { { label: "开户银行", name: "SupportBank", width: 100, align: "left" }, { label: "银行卡号", name: "SupportBankCard", width: 100, align: "left" }, { label: "金额", name: "SupportAmount", width: 100, align: "left" }, + { label: "联系电话", name: "SecondMobile", width: 100, align: "left" }, { label: "创建时间", name: "SupportChangeTime", width: 200, align: "left" }, { label: "操作人", name: "SupportChangeUserName", width: 100, align: "left" }, { label: "备注信息", name: "SupportChangeRemark", width: 200, align: "left" }, @@ -159,6 +162,14 @@ var bootstrap = function ($, learun) { param.Grade = "20"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, + eye: function () { + var processId = $('#gridtable').jfGridValue('SupportProcessId') || ''; + var title = $('#gridtable').jfGridValue('StuName'); + + if (learun.checkrow(processId)) { + learun.frameTab.open({ F_ModuleId: 'monitor' + processId, F_FullName: '查看-' + title, F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/MonitorDetailsIndex?processId=' + processId }); + } + } }; 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 72fa792be..90994f348 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 @@ -199,6 +199,7 @@ var bootstrap = function ($, learun) { }); } }, + { label: "发起人", name: "PUserName", width: 100, align: "left" }, { label: "收款单位", name: "PPayee", width: 100, align: "left" }, { label: "开户银行", name: "PPayeeBank", width: 100, align: "left" }, { label: "银行账号", name: "PPayeeBankAccount", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml index 6f8380344..e989eeb74 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml @@ -16,8 +16,8 @@
- - + @* + *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml index 7492fde31..e612315ff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml @@ -20,8 +20,8 @@
- - + @* + *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml index 2cc39bf50..ab12e9018 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml @@ -20,8 +20,8 @@
- - + @* + *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml index 55fb06603..5c7c55af7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml @@ -18,8 +18,8 @@
- - + @* + *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTheme5.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTheme5.cshtml index b532dd551..f14e74a0b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTheme5.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTheme5.cshtml @@ -10,8 +10,8 @@
- - + @* + *@
@* 即时通讯窗体 *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml index 8742ff87c..4bf71884d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml @@ -11,8 +11,8 @@
- - + @* + *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml index 83b40e217..d1e092d82 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml @@ -25,8 +25,8 @@
- - + @* + *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageService.cs index 0108a3409..41ee377a0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FD_PayManage/FD_PayManageService.cs @@ -71,7 +71,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement t.PStatus, t.PProcessId, t.PDept, -t.PTime +t.PTime,t.PUserName "); strSql.Append(" FROM FD_PayManage t "); strSql.Append(" WHERE 1=1 and PIsDelete<>1 ");