Merge branch '长阳分支中职' of 123.57.209.16:bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js

@@ -786,6 +786,7 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 rows: 100,
                 isMultiselect: true,
+                sidx: "Grade desc,StuNo desc"
                 //onSelectRow: function (rowdata) {
                 //    if (rowdata.CheckMark == "1") {
                 //        $("#check").hide();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/printxjk.cshtml

@@ -106,12 +106,12 @@
                 <td>@Model.StuNo</td>
                 <td>学制</td>
                 <td>@Model.EduSystem</td>
-                <td>学籍号</td>
-                <td>@Model.StuCode</td>
-            </tr>
-            <tr>
                 <td>年级</td>
                 <td>@Model.Grade</td>
+            </tr>
+            <tr>
+                <td>学籍号</td>
+                <td>@Model.StuCode</td>
                 <td>专业</td>
                 <td id="MajorNo">@Model.MajorNo</td>
                 <td>身份证号</td>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.cshtml

@@ -2,11 +2,49 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<style>
+    .lr-layout-body {
+        overflow: auto;
+    }
+
+    .lr-layout-wrap {
+        border: none;
+    }
+
+    .tabbox {
+        width: 100%;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin-bottom: 20px;
+    }
+
+    .tabwrap {
+        height: 40px;
+        line-height: 40px;
+    }
+
+    .tabli {
+        display: flex;
+        align-items: center;
+        padding-left: 15px;
+    }
+
+        .tabli img {
+            width: 25px;
+            height: 25px;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+
+    .tabdiv {
+        height: 300px;
+    }
+</style>
 <div class="lr-layout ">
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
-                @*<div class="lr-layout-tool-left">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll; padding:0;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            @*<div class="lr-layout-tool">
+            <div class="lr-layout-tool-left">
                 <div class="lr-layout-tool-item">
                     <div id="multiple_condition_query">
                         <div class="lr-query-formcontent">
@@ -45,16 +83,67 @@
                         </div>
                     </div>
                 </div>
-            </div>*@
-                <div class="lr-layout-tool-right">
-                    <div class=" btn-group btn-group-sm">
-                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
-                    </div>
+            </div>
+            <div class="lr-layout-tool-right">
+                <div class=" btn-group btn-group-sm">
+                    <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                </div>
+            </div>
+        </div>*@
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        参军记录
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        参军记录
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtable"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        参军意向
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        参军意向
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableTwo"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        兵役记录
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        兵役记录
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableThree"></div>
                 </div>
             </div>
-            <div class="lr-layout-body" style="height:40%;border-bottom:1px solid #ccc;" id="gridtable"></div>
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableTwo"></div>
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableThree"></div>
+
+            
+           
         </div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js

@@ -17,6 +17,14 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.cshtml

@@ -2,59 +2,131 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<style>
+    .lr-layout-body {
+        overflow: auto;
+    }
+
+    .lr-layout-wrap {
+        border: none;
+    }
+
+    .tabbox {
+        width: 100%;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin-bottom: 20px;
+    }
+
+    .tabwrap {
+        height: 40px;
+        line-height: 40px;
+    }
+
+    .tabli {
+        display: flex;
+        align-items: center;
+        padding-left: 15px;
+    }
+
+        .tabli img {
+            width: 25px;
+            height: 25px;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+
+    .tabdiv {
+        height: 300px;
+    }
+</style>
 <div class="lr-layout ">
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;padding:0;;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            @*<div class="lr-layout-tool">
                 @*<div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div id="multiple_condition_query">
-                            <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">专业</div>
-                                    <div id="MajorNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">年级</div>
-                                    <div id="Grade"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">姓名</div>
-                                    <input id="StuName" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">身份证号</div>
-                                    <input id="IdentityCardNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学生编号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学籍号</div>
-                                    <input id="StuCode" type="text" class="form-control" />
-                                </div>
+                <div class="lr-layout-tool-item">
+                    <div id="multiple_condition_query">
+                        <div class="lr-query-formcontent">
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">系部</div>
+                                <div id="DeptNo"></div>
+                            </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">专业</div>
+                                <div id="MajorNo"></div>
+                            </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">年级</div>
+                                <div id="Grade"></div>
+                            </div>
+                            <div class="col-xs-12 lr-form-item">
+                                <div class="lr-form-item-title">班级</div>
+                                <div id="ClassNo"></div>
+                            </div>
+                            <div class="col-xs-6 lr-form-item">
+                                <div class="lr-form-item-title">姓名</div>
+                                <input id="StuName" type="text" class="form-control" />
+                            </div>
+                            <div class="col-xs-6 lr-form-item">
+                                <div class="lr-form-item-title">身份证号</div>
+                                <input id="IdentityCardNo" type="text" class="form-control" />
+                            </div>
+                            <div class="col-xs-6 lr-form-item">
+                                <div class="lr-form-item-title">学生编号</div>
+                                <input id="StuNo" type="text" class="form-control" />
+                            </div>
+                            <div class="col-xs-6 lr-form-item">
+                                <div class="lr-form-item-title">学籍号</div>
+                                <input id="StuCode" type="text" class="form-control" />
                             </div>
                         </div>
                     </div>
-                </div>*@
+                </div>
+            </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                 </div>
+            </div>*@
+
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        助学金
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        助学金
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtable"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        奖学金
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        奖学金
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableTwo"></div>
+                </div>
             </div>
-            <div class="lr-layout-body" style="height:45%;border-bottom:1px solid #ccc;" id="gridtable"></div>
 
-            <div class="lr-layout-body" style="height:45%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableTwo"></div>
+            
         </div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js

@@ -16,6 +16,13 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml

@@ -4,25 +4,102 @@
 }
 <style>
     .lr-layout-body {
-        height: 40%;
-        border-bottom: 1px solid #ccc;
         overflow: auto;
     }
+    .lr-layout-wrap{
+        border:none;
+    }
+    .tabbox {
+        width: 100%;
+        border:1px solid #ccc;
+        border-radius:5px;
+        margin-bottom:20px;
+    }
+    .tabwrap{
+        height:40px;
+        line-height:40px;
+    }
+    .tabli {
+        display: flex;
+        align-items: center;
+        padding-left:15px;
+    }
+    .tabli img{
+        width:25px;
+        height:25px;
+        margin-right:10px;
+        cursor:pointer;
+    }
+    .tabdiv{
+        height:300px;
+    }
 </style>
 <div class="lr-layout ">
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="overflow-y:auto;">
-            <div class="lr-layout-tool">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="overflow-y:auto;padding:0;">
+            @*<div class="lr-layout-tool">
 
-                <div class="lr-layout-tool-right">
-                    <div class=" btn-group btn-group-sm">
-                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
-                    </div>
+            <div class="lr-layout-tool-right">
+                <div class=" btn-group btn-group-sm">
+                    <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                 </div>
             </div>
-            <div class="lr-layout-body" id="gridtable"></div>
-            <div class="lr-layout-body" id="gridtableNotPass" style="border-top:1px solid #ccc;margin-top:50px;"></div>
-            <div class="lr-layout-body" id="gridtableNotPossTwo" style="border-top:1px solid #ccc;margin-top:50px;"></div>
+        </div>*@
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        成绩
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        成绩
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" id="gridtable" style="border-top:1px solid #ccc;"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        补考成绩
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        补考成绩
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" id="gridtableNotPass" style="border-top:1px solid #ccc;"></div>
+                </div>
+            </div>
+
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        二次补考成绩
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        二次补考成绩
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" id="gridtableNotPossTwo" style="border-top:1px solid #ccc;"></div>
+                </div>
+            </div>
+
+
+            
         </div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js

@@ -15,6 +15,17 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
+
+
+
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.cshtml

@@ -2,59 +2,135 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<style>
+    .lr-layout-body {
+        overflow: auto;
+    }
+
+    .lr-layout-wrap {
+        border: none;
+    }
+
+    .tabbox {
+        width: 100%;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin-bottom: 20px;
+    }
+
+    .tabwrap {
+        height: 40px;
+        line-height: 40px;
+    }
+
+    .tabli {
+        display: flex;
+        align-items: center;
+        padding-left: 15px;
+    }
+
+        .tabli img {
+            width: 25px;
+            height: 25px;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+
+    .tabdiv {
+        height: 300px;
+    }
+</style>
 <div class="lr-layout ">
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
-                @*<div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div id="multiple_condition_query">
-                            <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">专业</div>
-                                    <div id="MajorNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">年级</div>
-                                    <div id="Grade"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">姓名</div>
-                                    <input id="StuName" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">身份证号</div>
-                                    <input id="IdentityCardNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学生编号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学籍号</div>
-                                    <input id="StuCode" type="text" class="form-control" />
-                                </div>
-                            </div>
+        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;padding:0;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            @*<div class="lr-layout-tool">
+          <div class="lr-layout-tool-left">
+            <div class="lr-layout-tool-item">
+                <div id="multiple_condition_query">
+                    <div class="lr-query-formcontent">
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">系部</div>
+                            <div id="DeptNo"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">专业</div>
+                            <div id="MajorNo"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">年级</div>
+                            <div id="Grade"></div>
+                        </div>
+                        <div class="col-xs-12 lr-form-item">
+                            <div class="lr-form-item-title">班级</div>
+                            <div id="ClassNo"></div>
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">姓名</div>
+                            <input id="StuName" type="text" class="form-control" />
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">身份证号</div>
+                            <input id="IdentityCardNo" type="text" class="form-control" />
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">学生编号</div>
+                            <input id="StuNo" type="text" class="form-control" />
+                        </div>
+                        <div class="col-xs-6 lr-form-item">
+                            <div class="lr-form-item-title">学籍号</div>
+                            <input id="StuCode" type="text" class="form-control" />
                         </div>
                     </div>
-                </div>*@
-                <div class="lr-layout-tool-right">
-                    <div class=" btn-group btn-group-sm">
-                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
-                    </div>
                 </div>
             </div>
-            <div class="lr-layout-body" style="height:45%;border-bottom:1px solid #ccc;" id="gridtable"></div>
+        </div>
+            <div class="lr-layout-tool-right">
+                <div class=" btn-group btn-group-sm">
+                    <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                </div>
+            </div>
+        </div>*@
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        学生奖励
+                        
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        学生奖励
+                        @*<div class=" btn-group btn-group-sm">
+                            <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                        </div>*@
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top:1px solid #ccc;" id="gridtable"></div>
+                </div>
+            </div>
+
+            <div class="tabbox">
+                <ul id="tabul" class="tabwrap">
+                    <li class="tabli" style="display:none;">
+                        <img src="~/Content/images/addicon.png" />
+                        学生处分
+                    </li>
+                    <li class="tabli">
+                        <img src="~/Content/images/subicon.png" />
+                        学生处分
+                    </li>
+                </ul>
+
+                <div class="tabdiv">
+                    <div class="lr-layout-body" style="border-top: 1px solid #ccc;" id="gridtableTwo"></div>
+                </div>
+            </div>
+
 
-            <div class="lr-layout-body" style="height:45%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="gridtableTwo"></div>
+            
         </div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.js

@@ -16,6 +16,14 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+
+            //切换
+            $('#tabul li').on('click', function () {
+                $(this).hide();
+                $(this).siblings('li').show()
+                $(this).parent().siblings('div').toggle(500)
+                //$('#tabdivo').toggle(500)
+            })
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml

@@ -29,32 +29,46 @@
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">来源地址</div>
         <input id="F_SourceAddress" type="text" class="form-control" />
-    </div> 
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">接收部门</div>
         <div id="F_SendDeptId"></div>
-    </div> 
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">接收岗位</div>
         <div id="F_SendPostId"></div>
-    </div> 
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">下发飞星</div>
         <div id="F_IsSendFX"></div>
-    </div> 
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">标题图片</div>
         <div id="F_NewsImage"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">公告内容</div>
-        <div id="editor" style="height:300px;"></div>
+        <div id="editor" style="height:300px;overflow:auto;"></div>
         @*<script id="editor" type="text/plain" style="height:270px;">
-        </script>*@
+            </script>*@
     </div>
 </div>
+<style>
+    #editor {
+        height: 400px;
+        overflow: auto;
+        position: relative
+    }
 
+    #edui1 {
+        padding-top: 80px
+    }
+    #edui1_toolbarbox {
+        position: absolute !important;
+        top: 0
+    }
+</style>
 @*<script src="~/Content/ueditor/ueditor.config.js"></script>
-<script src="~/Content/ueditor/ueditor.all.js"></script>
-<script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>*@
+    <script src="~/Content/ueditor/ueditor.all.js"></script>
+    <script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>*@
 @Html.AppendJsFile("/Areas/LR_OAModule/Views/Notice/FormFlow.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js

@@ -32,8 +32,8 @@ var bootstrap = function ($, learun) {
                         id: 'formview',
                         title: '查看公告',
                         url: top.$.rootUrl + '/Utility/ListContentIndex?id=' + keyValue,
-                        width: 1000,
-                        height: 650,
+                        width: 1100,
+                        height: 850,
                         maxmin: true,
                         btn: null
                     });

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.config.js

@@ -46,7 +46,7 @@
         //    'print', /*'preview',*/ 'searchreplace', 'drafts', 'help'
         //]]
         , toolbars: [[
-            'undo', 'redo', '|',
+            'source', 'undo', 'redo', '|',
             'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|',
             'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
             'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|',

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

@@ -2219,6 +2219,7 @@
     <Content Include="Content\css\swiper.min1.css" />
     <Content Include="Content\idcardreader\idcardreaderv1.js" />
     <Content Include="Content\idcardreader\npCertReader.dll" />
+    <Content Include="Content\images\addicon.png" />
     <Content Include="Content\images\calendar.png" />
     <Content Include="Content\images\chick1.png" />
     <Content Include="Content\images\DragSSO\close.png" />
@@ -2660,6 +2661,7 @@
     <Content Include="Content\images\SsoSystem\noLogin.png" />
     <Content Include="Content\images\SsoSystem\search.png" />
     <Content Include="Content\images\SsoSystem\user.jpg" />
+    <Content Include="Content\images\subicon.png" />
     <Content Include="Content\jquery\plugin\jqprint\._jquery.jqprint-0.3.js" />
     <Content Include="Content\jquery\plugin\jqprint\jqprint.css" />
     <Content Include="Content\jquery\plugin\jqprint\jQuery.print.js" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml

@@ -13,7 +13,7 @@
     }
 </style>
 <!--  / warpper  -->
-<div class="warpper" style="margin-top: 50px; width: 60%;margin:0 auto">
+<div class="warpper" style="margin-top: 50px; width: 100%;margin:0 auto">
     <!--  / list_sec1  -->
     <div class="list_sec list_sec1">
         <div class="index_box">
@@ -26,7 +26,7 @@
             @*<div class="listDotBox" id="F_NewsContent">
                
             </div>*@
-            <iframe id="newscontentframe"scrolling="auto" frameborder="0" width="100%" height="400px"></iframe>
+            <iframe id="newscontentframe"scrolling="auto" frameborder="0" width="100%" height="600px"></iframe>
             <div id="F_NewsImage"></div>
         </div>
     </div>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue

@@ -56,9 +56,9 @@
 							{{ Statusitem(displayListItem(item, 'Status')) }}
 						</view>
 
-						<l-customlist-action :showButton="item.Status==0" buttonText="提交"
-							@join="action('check', item.Id)" :showEdit="item.Status==0" @edit="action('edit', item.Id)"
-							:showDelete="item.Status==0" @delete="action('delete', item.Id)"
+						<l-customlist-action :showButton="item.Status==0 && user.userId == item.ApplyUser" buttonText="提交"
+							@join="action('check', item.Id)" :showEdit="item.Status==0 && user.userId == item.ApplyUser" @edit="action('edit', item.Id)"
+							:showDelete="item.Status==0 && user.userId == item.ApplyUser" @delete="action('delete', item.Id)"
 							@view="action('view', item.Id)" />
 					</view>
 				</l-customlist>