Merge branch '金隅分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml

@@ -60,6 +60,7 @@
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
+                        
                     </div>
                 </div>
             </div>

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 });
+            }
+        }
 
     };
 

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" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml

@@ -16,8 +16,8 @@
 <div class="lr-frame-menu-btn" id="lr_frame_menu_btn"><i class="fa fa-fw fa-dedent"></i></div>
 
 <div class="lr-lg-setting" id="lr_lg_setting">
-    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
-    <ul class="dropdown-menu"></ul>
+    @*<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
+    <ul class="dropdown-menu"></ul>*@
 </div>
 
 <div class="lr-im-bell" title="消息中心">

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml

@@ -20,8 +20,8 @@
     </div>
 </div>
 <div class="lr-lg-setting" id="lr_lg_setting">
-    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
-    <ul class="dropdown-menu"></ul>
+    @*<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
+    <ul class="dropdown-menu"></ul>*@
 </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml

@@ -20,8 +20,8 @@
     </div>
 </div>
 <div class="lr-lg-setting" id="lr_lg_setting">
-    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
-    <ul class="dropdown-menu"></ul>
+    @*<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
+    <ul class="dropdown-menu"></ul>*@
 </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml

@@ -18,8 +18,8 @@
     <div><iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&a=getcode&id=34&h=25&w=280"></iframe></div>
 </div>
 <div class="lr-lg-setting" id="lr_lg_setting">
-    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
-    <ul class="dropdown-menu"></ul>
+    @*<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
+    <ul class="dropdown-menu"></ul>*@
 </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTheme5.cshtml

@@ -10,8 +10,8 @@
     </div>
 </div>
 <div class="lr-lg-setting" id="lr_lg_setting">
-    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
-    <ul class="dropdown-menu"></ul>
+    @*<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
+    <ul class="dropdown-menu"></ul>*@
 </div>
 @* 即时通讯窗体 *@
 <div class="lr-im-bell" title="消息中心">

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml

@@ -11,8 +11,8 @@
 <div class="lr-frame-menu-btn" id="lr_frame_menu_btn"><i class="fa fa-fw fa-dedent"></i></div>
 <div class="lr-second-menu-wrap"><div id="lr_second_menu_wrap"></div></div>
 <div class="lr-lg-setting" id="lr_lg_setting">
-    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
-    <ul class="dropdown-menu"></ul>
+    @*<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
+    <ul class="dropdown-menu"></ul>*@
 </div>
 
 <div class="lr-im-bell" title="消息中心">

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml

@@ -25,8 +25,8 @@
 </div>
 
 <div class="lr-lg-setting" id="lr_lg_setting">
-    <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
-    <ul class="dropdown-menu"></ul>
+    @*<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
+    <ul class="dropdown-menu"></ul>*@
 </div>
 
 <div class="lr-im-body">

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 ");