diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 58768550b..eb7c48124 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/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(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/printxjk.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/printxjk.cshtml index fa1989e02..f536fe3c7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/printxjk.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/printxjk.cshtml @@ -106,12 +106,12 @@ @Model.StuNo 学制 @Model.EduSystem - 学籍号 - @Model.StuCode - - 年级 @Model.Grade + + + 学籍号 + @Model.StuCode 专业 @Model.MajorNo 身份证号 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.cshtml index fdae15e89..215f1caec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.cshtml @@ -2,11 +2,49 @@ ViewBag.Title = "学籍异动列表"; Layout = "~/Views/Shared/_Index.cshtml"; } +
-
-
- @*
+
+ @*
+
@@ -45,16 +83,67 @@
-
*@ -
-
- -
+
+
+
+ +
+
+
*@ + +
+
    + +
  • + + 参军记录 +
    • +
+ +
+
+
+
+ +
+
    + +
  • + + 参军意向 +
    • +
+ +
+
+
+
+ +
+
    + +
  • + + 兵役记录 +
    • +
+ +
+
-
-
-
+ + +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js index 233e8793c..31e844c10 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryMSRMilitaryIndex.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.cshtml index 2e57af9a6..848208f1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.cshtml @@ -2,59 +2,131 @@ ViewBag.Title = "学籍异动列表"; Layout = "~/Views/Shared/_Index.cshtml"; } +
-
-
+
+ @*
@*
-
-
-
-
-
系部
-
-
-
-
专业
-
-
-
-
年级
-
-
-
-
班级
-
-
-
-
姓名
- -
-
-
身份证号
- -
-
-
学生编号
- -
-
-
学籍号
- -
+
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
年级
+
+
+
+
班级
+
+
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
学生编号
+ +
+
+
学籍号
+
-
*@ +
+
+
*@ + + +
+
    + +
  • + + 助学金 +
    • +
+ +
+
+
+
+ +
+
    + +
  • + + 奖学金 +
    • +
+ +
+
+
-
-
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js index 81880b324..b9744c3ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScholarshipIndex.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml index b1eca8c22..26e89d6c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.cshtml @@ -4,25 +4,102 @@ }
-
-
+
+ @*
-
-
- -
+
+
+
-
-
-
+
*@ + +
+
    + +
  • + + 成绩 +
    • +
+ +
+
+
+
+ +
+
    + +
  • + + 补考成绩 +
    • +
+ +
+
+
+
+ + +
+
    + +
  • + + 二次补考成绩 +
    • +
+ +
+
+
+
+ + +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js index c9fc14119..c20d0e1ce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryScoreIndex.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.cshtml index 8b1831434..724695dd7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.cshtml @@ -2,59 +2,135 @@ ViewBag.Title = "学籍异动列表"; Layout = "~/Views/Shared/_Index.cshtml"; } +
-
-
- @*
-
-
-
-
-
系部
-
-
-
-
专业
-
-
-
-
年级
-
-
-
-
班级
-
-
-
-
姓名
- -
-
-
身份证号
- -
-
-
学生编号
- -
-
-
学籍号
- -
-
+
+ @*
+
+
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
年级
+
+
+
+
班级
+
+
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
学生编号
+ +
+
+
学籍号
+
-
*@ -
-
- -
-
+
+
+
+ +
+
+
*@ + +
+
    + +
  • + + 学生奖励 + @*
    + +
    *@ +
    • +
+ +
+
+
+
+ +
+
    + +
  • + + 学生处分 +
    • +
+ +
+
+
+
+ -
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.js index 05b8178d6..ff3846ae7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryStuEncourgementIndex.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml index e9a3da405..ae7131810 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml @@ -29,32 +29,46 @@
来源地址
-
+
接收部门
-
+
接收岗位
-
+
下发飞星
-
+
标题图片
公告内容
-
+
@**@ + *@
+ @* - -*@ + + *@ @Html.AppendJsFile("/Areas/LR_OAModule/Views/Notice/FormFlow.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js index 6e3214bb5..c6a9a3761 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js +++ b/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 }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/addicon.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/addicon.png new file mode 100644 index 000000000..923499d14 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/addicon.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/subicon.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/subicon.png new file mode 100644 index 000000000..07e716257 Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/subicon.png differ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.config.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.config.js index 55296ca5d..cb42b5112 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.config.js +++ b/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', '|', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index bc5afaa61..84bbb6e6f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -2219,6 +2219,7 @@ + @@ -2660,6 +2661,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml index 8d31bb3b1..463e26c4e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.cshtml @@ -13,7 +13,7 @@ } -
+
@@ -26,7 +26,7 @@ @*
*@ - +
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue index 2809973fd..a516dee67 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue @@ -56,9 +56,9 @@ {{ Statusitem(displayListItem(item, 'Status')) }} -