From df59f095aa50678192b1ea99ff8f8b1235554c53 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 1 Jul 2022 10:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/StuEnrollController.cs        |  11 +
 .../Controllers/StuEnrollPhoneController.cs   |  12 +-
 .../Views/CdMajor/Index.js                    |   2 +-
 .../Views/EmpInfo/Index.cshtml                |   1 -
 .../Views/EmpInfo/QRCode.cshtml               |   4 +-
 .../Views/StuEnrollPhone/Form.cshtml          |  77 ++--
 .../Views/StuEnrollPhone/Search.cshtml        |   4 +-
 .../Views/StuEnrollScore/AdmissionForm.cshtml |  22 +
 .../Views/StuEnrollScore/AdmissionForm.js     |  68 +++
 .../StuEnrollScore/AdmissionIndex.cshtml      |  52 +++
 .../Views/StuEnrollScore/AdmissionIndex.js    | 198 +++++++++
 .../Views/StuEnrollScore/Index.cshtml         | 103 +++++
 .../Views/StuEnrollScore/Index.js             | 416 ++++++++++++++++++
 .../Learun.Application.Web.csproj             |   6 +
 .../PhonePage/server.js                       |   2 +-
 .../CdMajor/CdMajorEntity.cs                  |  10 +-
 .../CdMajor/CdMajorService.cs                 |   6 +-
 17 files changed, 940 insertions(+), 54 deletions(-)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.cshtml
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
index 84edf0c21..6b1fd9a59 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs	
@@ -331,6 +331,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return Success(jsonData);
         }
 
+
+        /// <summary>
+        /// 审核页面  获取考试科目信息
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetExamDataByStuId(string keyValue)
+        {
+            var data = stuEnrollIBLL.GetExamDataByStuId(keyValue);
+            return Success(data);
+        }
+
         [HttpGet]
         [AjaxOnly]
         public ActionResult GetDormitorys(string pagination, string queryJson)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs
index 18da0844a..5dfec3369 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollPhoneController.cs	
@@ -22,8 +22,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
-        public ActionResult Search()
+        public ActionResult Search(int type)
         {
+            if (type == 1)
+            {
+
+                ViewBag.Title = "查询考试地点及时间";
+            }
+            if (type == 2)
+            {
+
+                ViewBag.Title = "查询录取结果";
+            }
             return View();
         }
         public ActionResult SearchResult()
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
index 451c1b0ed..7ba79830e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js	
@@ -131,7 +131,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetPageList',
                 headData: [
                     { label: "专业名称", name: "MajorName", width: 200, align: "left" },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml
index fa7a0bea6..5ec842f25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml	
@@ -82,7 +82,6 @@
                         <a id="lr_lock" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
                         <a id="lr_unlock" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;去审核</a>
                         <a id="checkall" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;审核全部</a>
-                        <li id="lr_resume"><a><i class="fa fa-id-badge"></i>&nbsp;简历管理</a></li>
                         <a id="lr_qrcode" class="btn btn-default"><i class="fa fa-linode"></i>&nbsp;生成二维码</a>
                         <a id="lr_more" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                             <i class="fa fa-reorder"></i>&nbsp;<span class="lrlt">更多</span><span class="caret"></span>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/QRCode.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/QRCode.cshtml
index 241abcaa5..d9c221777 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/QRCode.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/QRCode.cshtml	
@@ -35,8 +35,8 @@
     <script>
         //标签打印
         var qrcode = new QRCode(document.getElementById("qrcode"), {
-            width: 80,
-            height: 80
+            width: 130,
+            height: 130
         });
         var keyValue = request('keyValue');//二维码
         var EmpName = request('EmpName');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Form.cshtml
index e9894b2b9..c4a215fd2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Form.cshtml	
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "数字化校园-新生报名";
+    
     Layout = null;
 }
 
@@ -11,13 +11,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="format-detection" content="telephone=no" />
     <link rel="shortcut icon" href="" />
-    <title></title>
+    <title>数字化校园-新生报名</title>
     <meta name="keywords" content="" />
     <meta name="description" content="数字化校园-新生报名" />
     <link href="~/Content/css/font-awesome.css" rel="stylesheet" />
     <link href="~/Content/css/common.css" rel="stylesheet" />
     <link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" />
-    <link href="~/Content/layui/layui-v2.6.8/layui/css/layui.css" rel="stylesheet" />
+    <link href="~/Content/layui/css/layui.css" rel="stylesheet" />
+    @*<link href="~/Content/layui/layui-v2.6.8/layui/css/layui.css" rel="stylesheet" />*@
     <link href="~/Content/css/fromAdd.css" rel="stylesheet" />
     <style>
         #IdCardPtoUpload1 {
@@ -202,45 +203,45 @@
                         </div>
 
                         <div class="chickInput">
-                                                <span class="chickInputLable">身份证反面照片</span>
-                                                <div class="chickInputBox">
-                                                    <div class="layui-upload-list UploadFile" id="IdCardPtoUpload2">
-                                                        <img src="~/Content/images/chick1.png" class="layui-upload-img" />
-                                                        <div>选择</div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                           <div class="chickInput" hidden>
-                                <span class="chickInputLable" hidden><span>*</span> 身份证反面照片</span>
-                                <input type="text" id="IdCardPto2" name="IdCardPto2" class="layui-input">
-                            </div>
-                                            <div class="chickInput">
-                                <span class="chickInputLable">初中毕业证</span>
-                                <div class="chickInputBox">
-                                    <div class="layui-upload-list" id="chickUpload">
-                                        <img src="~/Content/images/chick1.png" class="layui-upload-img" />
-                                        <div>选择</div>
-                                    </div>
+                            <span class="chickInputLable">身份证反面照片</span>
+                            <div class="chickInputBox">
+                                <div class="layui-upload-list UploadFile" id="IdCardPtoUpload2">
+                                    <img src="~/Content/images/chick1.png" class="layui-upload-img" />
+                                    <div>选择</div>
                                 </div>
                             </div>
-                            <div class="chickInput" hidden>
-                                <span class="chickInputLable" hidden><span>*</span> 初中毕业证照片</span>
-                                <input type="text" id="MidDiplomaPto" name="MidDiplomaPto" class="layui-input">
+                        </div>
+                        <div class="chickInput" hidden>
+                            <span class="chickInputLable" hidden><span>*</span> 身份证反面照片</span>
+                            <input type="text" id="IdCardPto2" name="IdCardPto2" class="layui-input">
+                        </div>
+                        <div class="chickInput">
+                            <span class="chickInputLable">初中毕业证</span>
+                            <div class="chickInputBox">
+                                <div class="layui-upload-list" id="chickUpload">
+                                    <img src="~/Content/images/chick1.png" class="layui-upload-img" />
+                                    <div>选择</div>
+                                </div>
                             </div>
+                        </div>
+                        <div class="chickInput" hidden>
+                            <span class="chickInputLable" hidden><span>*</span> 初中毕业证照片</span>
+                            <input type="text" id="MidDiplomaPto" name="MidDiplomaPto" class="layui-input">
+                        </div>
 
-                                            <div class="chickInput">
-                                <span class="chickInputLable">中考成绩截图</span>
-                                <div class="chickInputBox">
-                                    <div class="layui-upload-list UploadFile" id="MidAchievementUpload">
-                                        <img src="~/Content/images/chick1.png" class="layui-upload-img" />
-                                        <div>选择</div>
-                                    </div>
+                        <div class="chickInput">
+                            <span class="chickInputLable">中考成绩截图</span>
+                            <div class="chickInputBox">
+                                <div class="layui-upload-list UploadFile" id="MidAchievementUpload">
+                                    <img src="~/Content/images/chick1.png" class="layui-upload-img" />
+                                    <div>选择</div>
                                 </div>
                             </div>
-                            <div class="chickInput" hidden>
-                                <span class="chickInputLable" hidden><span>*</span> 中考成绩照片</span>
-                                <input type="text" id="MidAchievementPto" name="MidAchievementPto" class="layui-input">
-                            </div>
+                        </div>
+                        <div class="chickInput" hidden>
+                            <span class="chickInputLable" hidden><span>*</span> 中考成绩照片</span>
+                            <input type="text" id="MidAchievementPto" name="MidAchievementPto" class="layui-input">
+                        </div>
 
                         <div class="chickInput">
                             <span class="chickInputLable"> 备注</span>
@@ -256,8 +257,8 @@
     <img id="fromBg" src="~/Content/images/from1.png" />
     <div class="footer"> Copyright  ©  2019       数字化智慧校园        版权所有</div>
     <script src="~/Content/js/jquery.min.js"></script>
-    <script src="~/Content/layui/layui-v2.6.8/layui/layui.js"></script>
-    @*<script src="~/Content/layui/layui.all.js"></script>*@
+    <script src="~/Content/layui/layui.js"></script>
+    @*<script src="~/Content/layui/layui-v2.6.8/layui/layui.js"></script>*@
     <script src="~/Content/vue/vue.js"></script>
     <script src="~/PhonePage/server.js"></script>
     <script>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml
index 23a04b016..e9d7b9069 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml	
@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "数字化校园-查询";
+    
     Layout = null;
 }
 
@@ -11,7 +11,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="format-detection" content="telephone=no" />
     <link rel="shortcut icon" href="" />
-    <title></title>
+    <title>@ViewBag.Title</title>
     <meta name="keywords" content="" />
     <meta name="description" content="数字化校园-新生报名" />
     <link href="~/Content/css/font-awesome.css" rel="stylesheet" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.cshtml
new file mode 100644
index 000000000..0fe0e7f8e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.cshtml	
@@ -0,0 +1,22 @@
+@{
+    ViewBag.Title = "新生录取";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<style>
+    .lr-form-item-lable {
+        height: 100%;
+        line-height: 30px;
+        text-align: right;
+    }
+    #form {
+        font-size: 14px;
+    }
+</style>
+<div class="lr-form-wrap" id="form">
+    @*<div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"/>
+    </div>*@
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js")
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js
new file mode 100644
index 000000000..d2137ce1b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionForm.js	
@@ -0,0 +1,68 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2021-06-15 17:30 
+ * 描  述：新生录取
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+           
+        },
+        initData: function () {
+            if (!!keyValue) {
+                learun.httpAsyncGet(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetScoreListByStuId?stuid=' + keyValue, function (data) {
+                    //learun.loading(false);
+                    
+                    if (data.code == 200) {
+                        var data = data.data;
+                        var html = '';
+                        for (var i = 0; i < data.length; i++) {
+                            html += '<div class="col-xs-6 lr-form-item" data-table="StuEnroll">';
+                            html += '<div class="lr-form-item-title">' + data[i].SubjectName + '：</div>';
+                            html += '<label class="lr-form-item-lable">' + data[i].Score + '</label>';
+                            html += '</div>';
+                        }
+                        $('#form').html(html);
+                    }
+                    else {
+                        learun.layerClose(window.name);
+                        learun.alert.error('数据获取失败,请重新获取！');
+                        learun.httpErrorLog(data.info);
+                    }
+                });
+
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        //var postData = {
+        //    strEntity: JSON.stringify($('body').lrGetFormData())
+        //};
+        learun.layerConfirm('是否确认录取当前学生！', function (res) {
+            if (res) {
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Admission?keyValue=' + keyValue,
+                    { IsAdmission: 1 }, function (res) {
+                        // 保存成功后才回调
+                        if (!!callBack) {
+                            callBack();
+                        }
+                    });
+            }
+        });
+        
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml
new file mode 100644
index 000000000..1683efd84
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.cshtml	
@@ -0,0 +1,52 @@
+@{
+    ViewBag.Title = "新生录取管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <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>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证号</div>
+                                    <input id="IDCard" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">手机号</div>
+                                    <input id="StuMobile" type="text" class="form-control" />
+                                </div>*@
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">年度</div>
+                                    <div id="Year" type="lrselect" class="lr-select"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo" type="lrselect" class="lr-select"></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 class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看成绩</a>
+                        <a id="lr_lq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录取</a>
+                        <a id="lr_nolq" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消录取</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js
new file mode 100644
index 000000000..ee19b45a6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js	
@@ -0,0 +1,198 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2021-06-18 11:20
+ * 描  述：新生录取管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            //专业
+            $('#MajorNo').lrselect({
+                placeholder: "请选择专业",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetMajorData',
+                value: 'value',
+                text: 'text'
+
+            });
+            //年度
+            $('#Year').lrselect({
+                placeholder: "请选择年度",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetYearNoData',
+                value: 'value',
+                text: 'text'
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+            //查看成绩 
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看成绩',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/AdmissionForm?keyValue=' + keyValue,
+                        width: 500,
+                        height: 400,
+                        btn: null
+                    });
+                }
+            });
+            // 录取
+            $('#lr_lq').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    var IsAdmission = $('#gridtable').jfGridValue('IsAdmission');
+                    if (IsAdmission == 1) {
+                        return learun.alert.warning('该学生已被录取！');
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '录取',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/AdmissionForm?keyValue=' + keyValue,
+                        width: 500,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 取消录取
+            $('#lr_nolq').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                if (learun.checkrow(keyValue)) {
+                    var IsAdmission = $('#gridtable').jfGridValue('IsAdmission');
+                    if (IsAdmission == 0) {
+                        return learun.alert.warning('该学生未被录取！');
+                    }
+                    learun.layerConfirm('是否确认取消录取当前学生！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Admission?keyValue=' + keyValue, { IsAdmission: 0 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                    
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetPageListForAdmission',
+                headData: [
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "性别", name: "Gender", width: 100, align: "left",
+                        formatter: function (value) {
+                            if (value == '0') {
+                                return '女';
+                            } else {
+                                return '男';
+                            }
+                        }
+                    },
+                    {
+                        label: "民族", name: "Nationals", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'National',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "身份证号", name: "IDCard", width: 100, align: "left" },
+                    { label: "手机号", name: "StuMobile", width: 100, align: "left" },
+                    { label: "中考总分", name: "MidTermExam", width: 100, align: "left" },
+                    { label: "毕业学校", name: "FromSchool", width: 100, align: "left" },
+                    {
+                        label: "地市", name: "City", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "县区", name: "County", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+                                key: value,
+                                keyId: 'acode',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "总分", name: "ExamScore", width: 100, align: "left" },
+                    {
+                        label: "是否录取", name: "IsAdmission", width: 100, align: "left",
+                        formatter: function (value) {
+                            if (value == 1) {
+                                return "<span class=\"label label-success\">是</span>";
+                            } else {
+                                return "<span class=\"label label-danger\">否</span>";
+                            }
+                        }
+                    },
+                ],
+                //isMultiselect: true,
+                mainId: 'StuId',
+                isPage: true,
+                sidx: 'ExamScore',
+                sord: 'ASC',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            //param.Grade = "20";
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml
new file mode 100644
index 000000000..0ef2ab278
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.cshtml	
@@ -0,0 +1,103 @@
+@{ ViewBag.Title = "新生考试成绩录入";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-select {
+        width: 150px;
+    }
+
+    #LessonNo {
+        width: 180px;
+    }
+
+    .lr-selectLittle {
+        width: 80px;
+    }
+
+    .lr-layout-tool {
+        height: 80px;
+    }
+
+    .lr-layout-center .lr-layout-wrap.lr-layout-wrap-notitle {
+        padding-top: 80px;
+    }
+
+    .divRow {
+        position: absolute;
+        width: 100%;
+        height: 55px;
+        top: 0;
+        left: 0;
+    }
+
+    .scaleRow {
+        top: 55px;
+        padding: 2px 10px;
+        height: 25px;
+    }
+
+        .scaleRow .timeBox {
+            float: right;
+            padding-right: 30px;
+        }
+
+        .scaleRow .tipBox {
+            display: inline-block;
+            color: #ff0000;
+            margin-left: 10px;
+        }
+
+    #addMinutesBtn {
+        display: inline-block;
+        cursor: pointer;
+        background-color: blue;
+        color: #fff;
+        padding: 1px 5px;
+        border-radius: 4px;
+    }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="selectRow divRow">
+                    <div class="lr-layout-tool-left">
+                        <div class="lr-layout-tool-item">
+                            <div id="Year" type="lrselect" class="lr-select lr-selectLittle"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <div id="SubjectId" type="lrselect" class="lr-select"></div>
+                        </div>
+                        <div class="lr-layout-tool-item">
+                            <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</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 class=" btn-group btn-group-sm" learun-authorize="yes">
+                            @*<a id="lr_add" class="btn btn-default"><i class="fa btn-default">&nbsp;成绩初始化</i></a>*@
+                            <a id="lr_input" class="btn btn-default"><i class="fa fa-edit">&nbsp;开始录入</i></a>
+                            <a id="lr_save" class="btn btn-default" style="display:none;"><i class="fa fa-edit">&nbsp;提交成绩</i></a>
+                            <a id="lr_check" class="btn btn-default"><i class="fa fa-lock">&nbsp;审核</i></a>
+                            <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-lock">&nbsp;去审</i></a>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="scaleRow divRow">
+                   
+                    <div class="tipBox">提示：录入完成后，请务必点击“保存成绩”按钮，避免成绩丢失！</div>
+                    <div class="timeBox" style="display:none;">
+                        倒计时：
+                        <span id="minutes" data-minutes="30"></span>分钟（<span id="seconds" data-seconds="60"></span>秒）
+                        <div id="addMinutesBtn" data-minutes="30">续时</div>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js
new file mode 100644
index 000000000..cbd956220
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/Index.js	
@@ -0,0 +1,416 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2021-06-18 11:02
+ * 描  述：全院学生成绩录入(新)
+ */
+var selectedRow;
+var refreshGirdData;
+var refreshGirdData2;
+var judgeSelect;    //判断下拉框是否选择
+var modifyDate; //成绩被占用，且是登录用户时，成绩表中的编辑时间；
+var timer;  //计时器
+var submitScoreTimer;   //五分钟提交成绩计时器
+var headData;   //常规列头
+var headDataEdit;   //可编辑列头
+var headDataNoEdit;     //不可编辑列头
+var headDataFinally;    //最终列头
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            headData = [
+                {
+                    label: '状态', name: 'Status', width: 100, align: "left",
+                    formatter: function (cellvalue) {
+                        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
+                    }
+                },
+                { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                { label: '手机号', name: 'StuMobile', width: 100, align: "left" },
+                { label: '身份证号', name: 'IdCard', width: 100, align: "left" },
+                {
+                    label: "性别", name: "Gender", width: 40, align: "left",
+                    formatter: function (cellvalue) {
+                        return cellvalue == '1' ? "男" : "女";
+                    }
+                }, { label: '年度', name: 'YearNo', width: 100, align: "left" },
+                {
+                    label: "专业", name: "MajorId", width: 100, align: "left",
+                    formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('custmerData', {
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                            key: value,
+                            keyId: 'id',
+                            callback: function (_data) {
+                                callback(_data['majorname']);
+                            }
+                        });
+                    }
+                },
+                {
+                    label: "科目", name: "SubjectId", width: 100, align: "left",
+                    formatterAsync: function (callback, value, row, op, $cell) {
+                        learun.clientdata.getAsync('custmerData', {
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ExamSubject',
+                            key: value,
+                            keyId: 'id',
+                            callback: function (_data) {
+                                callback(_data['subjectname']);
+                            }
+                        });
+                    }
+                },
+
+            ];
+            headDataEdit = [
+                {
+                    label: '成绩', name: 'Score', width: 100, align: "left",
+                    edit: {
+                        type: 'input',
+                        inputType: 'number',
+                        change: function (row, rownum) {
+                            //row.Score = (parseFloat(row.OrdinaryScore || '0') * (Number($('#OrdinaryScoreScale').html()) / 100) + parseFloat(row.TermInScore || '0') * (Number($('#TermInScoreScale').html()) / 100) + parseFloat(row.TermEndScore || '0') * (Number($('#TermEndScoreScale').html()) / 100) + parseFloat(row.OtherScore || '0') * (Number($('#OtherScoreScale').html()) / 100)).toFixed(0);
+                            $('#gridtable').jfGridSet('updateRow', rownum);
+                        },
+                    }
+                },
+                {
+                    label: '备注', name: 'Remark', width: 100, align: "left",
+                    edit: {
+                        type: 'input',
+                    }
+                },
+            ];
+            headDataNoEdit = [
+                { label: '成绩', name: 'Score', width: 80, align: "left" },
+                {
+                    label: '备注', name: 'Remark', width: 100, align: "left"
+                },
+            ];
+            headDataFinally = headData.concat(headDataNoEdit);
+
+            page.initGird();
+            page.bind();
+            page.bindSelect();
+        },
+        bind: function () {
+            //多条件选择
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 500);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                refreshGirdData2();
+            });
+            //// 成绩初始化
+            //$('#lr_add').on('click', function () {
+            //    //提示弹框
+            //    learun.layerConfirm('确认初始化成绩吗！', function (res) {
+            //        if (res) {
+            //            //审核成绩
+            //            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/EnrollScoreAdd', { queryJson: JSON.stringify(query), checkMark: 1 }, function (res) {
+            //                if (res.code == 200) {
+            //                    refreshGirdData2();
+            //                } else {
+            //                    learun.alert.warning("审核成绩失败！");
+            //                    return false;
+            //                }
+            //            });
+
+            //        }
+            //    });
+            //});
+            // 开始录入
+            $('#lr_input').on('click', function () {
+                //提示弹框
+                learun.layerConfirm('录入完成后，请务必点击“提交成绩”按钮，避免成绩丢失！', function (res) {
+                    if (res) {
+                        var query = judgeSelect();
+                        if (query) {
+
+                            //判断是否已审核；判断是否被其他教师占用
+                            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                                if (data != null) {
+                                    if (data.Status != 0) {
+                                        learun.alert.warning("学生成绩已审核！");
+                                        return false;
+                                    }
+                                    if (data.IsEditable == 0) {
+                                        if (data.EditUserId == learun.clientdata.get(['userinfo']).account) {
+                                            modifyDate = data.ModifyDate;
+                                        } else {
+                                            learun.alert.warning("当前班级成绩由账号为" + data.EditUserId + "的教师在使用！");
+                                            return false;
+                                        }
+                                    } else {
+                                        //占用成绩
+                                        learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/StartInputScore', { queryJson: JSON.stringify(query) }, function (res) { });
+                                    }
+                                    //显示可编辑列头
+                                    headDataFinally = headData.concat(headDataEdit);
+                                    $("#gridtable")[0].dfop = undefined;
+                                    page.initGird();
+                                    page.search(query);
+
+                                    //显示“提交成绩”按钮
+                                    $('#lr_save').show();
+                                    //隐藏“开始录入”按钮
+                                    $('#lr_input').hide();
+                                    //隐藏审核按钮
+                                    page.displaySubmit(0);
+                                    ////显示“倒计时”
+                                    //$('.timeBox').show();
+                                    //$('#minutes').html($('#minutes').attr('data-minutes'));
+                                    ////开始倒计时
+                                    //page.countDown();
+                                    //五分钟提交成绩
+                                    page.submitScore();
+                                } else {
+                                    learun.alert.warning("学生成绩不存在！");
+                                    return false;
+                                }
+                            });
+
+                        }
+
+                    }
+                });
+            });
+            //提交成绩
+            $('#lr_save').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    //成绩被占用，且是登录用户时，根据编辑时间判断是否是本人；
+                    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                        if (data != null) {
+                            if (data.Status != 0) {
+                                learun.alert.warning("学生成绩已审核！");
+                                return false;
+                            }
+                            if (data.IsEditable == 0) {
+                                if (data.EditUserId == learun.clientdata.get(['userinfo']).account) {
+                                    if (modifyDate != null && modifyDate != data.ModifyDate) {
+                                        learun.alert.warning("当前科目成绩被修改，请重新获取！");
+                                        return false;
+                                    }
+                                } else {
+                                    learun.alert.warning("当前班级成绩由账号为" + data.EditUserId + "的教师在使用！");
+                                    return false;
+                                }
+                            } else if (data.IsEditable == 1) {
+                                learun.alert.warning("学生成绩已提交！");
+                                return false;
+                            }
+                            
+                            //提交成绩
+                            var rowdatas = $('#gridtable').jfGridGet('rowdatas');
+                            learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/SaveInputScore', { data: JSON.stringify(rowdatas) }, function (res) {
+                                if (res.code == 200) {
+                                    //提交成绩：取消占用
+                                    learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/SaveInputScoreStatus', { queryJson: JSON.stringify(query) }, function (res) {
+                                        if (res.code == 200) {
+                                            refreshGirdData2();
+                                            modifyDate = null;
+                                            //隐藏“提交成绩”按钮
+                                            $('#lr_save').hide();
+                                            //显示“开始录入”按钮
+                                            $('#lr_input').show();
+                                            //显示审核按钮
+                                            page.displaySubmit(1);
+                                            //隐藏“倒计时”
+                                            //$('.timeBox').hide();
+                                            ////停止倒计时
+                                            //clearInterval(timer);
+                                            //停止五分钟提交成绩
+                                            clearInterval(submitScoreTimer);
+                                        } else {
+                                            learun.alert.warning("提交成绩：取消占用失败！");
+                                            return false;
+                                        }
+                                    });
+                                } else {
+                                    learun.alert.warning("提交成绩失败！");
+                                    return false;
+                                }
+                            });
+
+                        } else {
+                            learun.alert.warning("学生成绩不存在！");
+                            return false;
+                        }
+                    });
+                }
+            });
+            // 审核
+            $('#lr_check').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                        if (data != null) {
+                            if (data.Status != 0) {
+                                learun.alert.warning("学生成绩已审核！");
+                                return false;
+                            }
+                            learun.layerConfirm('是否确认审核当前科目的学生成绩！', function (res) {
+                                if (res) {
+                                    //审核成绩
+                                    learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/DoCheckScore', { queryJson: JSON.stringify(query), Status: 1 }, function (res) {
+                                        if (res.code == 200) {
+                                            refreshGirdData2();
+                                        } else {
+                                            learun.alert.warning("审核成绩失败！");
+                                            return false;
+                                        }
+                                    });
+                                }
+                            });
+                        } else {
+                            learun.alert.warning("学生成绩不存在！");
+                            return false;
+                        }
+                    });
+                }
+            });
+            // 去审核
+            $('#lr_uncheck').on('click', function () {
+                var query = judgeSelect();
+                if (query) {
+                    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetEntityByJson?queryJson=' + JSON.stringify(query), function (data) {
+                        if (data != null) {
+                            if (data.Status != 1) {
+                                learun.alert.warning("学生成绩未审核！");
+                                return false;
+                            }
+                            learun.layerConfirm('是否确认去审核科目的学生成绩！', function (res) {
+                                if (res) {
+                                    //去审核成绩
+                                    learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/DoCheckScore', { queryJson: JSON.stringify(query), Status: 0 }, function (res) {
+                                        if (res.code == 200) {
+                                            refreshGirdData2();
+                                        } else {
+                                            learun.alert.warning("去审核成绩失败！");
+                                            return false;
+                                        }
+                                    });
+                                }
+                            });
+                        } else {
+                            learun.alert.warning("学生成绩不存在！");
+                            return false;
+                        }
+                    });
+                }
+            });
+            
+        },
+        bindSelect: function () {
+            //年度
+            $('#Year').lrselect({
+                placeholder: "请选择年度",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetYearNoData',
+                value: 'value',
+                text: 'text'
+            });
+            //科目
+            $('#SubjectId').lrselect({
+                placeholder: "请选择科目",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetSubjectData',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/GetList',
+                headData: headDataFinally,
+                mainId: 'Id',
+                isPage: false,
+
+            });
+            //page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        },
+        countDown: function () {
+            //var minutes = $('#minutes').html();
+            //var minutesTemp = minutes;
+            //var seconds = $('#seconds').attr('data-seconds');
+            //$('#seconds').html(seconds);
+            //var secondsTemp = seconds;
+            //timer = setInterval(function () {
+            //    secondsTemp--;
+            //    $('#seconds').html(secondsTemp);
+            //    if (secondsTemp == 0) {
+            //        secondsTemp = seconds;
+            //        minutesTemp--;
+            //        $('#minutes').html(minutesTemp);
+            //        if (minutesTemp == 0) {
+            //            //停止倒计时
+            //            clearInterval(timer);
+            //            //自动提交成绩
+            //            $('#lr_save').trigger("click");
+            //        }
+            //    }
+            //}, 1000);
+        },
+        //提交成绩
+        submitScore: function () {
+            submitScoreTimer = setInterval(function () {
+                var rowdatas = $('#gridtable').jfGridGet('rowdatas');
+                learun.postFormSilence(top.$.rootUrl + '/EducationalAdministration/StuEnrollScore/SaveInputScore', { data: JSON.stringify(rowdatas) }, function (res) {
+                });
+            }, 300000);
+        },
+        displaySubmit: function (type) {
+            //显示隐藏审核按钮
+            if (type == 1) {
+                //显示
+                $('#lr_check').show();
+                $('#lr_uncheck').show();
+            } else {
+                //隐藏
+                $('#lr_check').hide();
+                $('#lr_uncheck').hide();
+            }
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    refreshGirdData2 = function () {
+        var query = judgeSelect();
+        if (query) {
+            //显示不可编辑列头
+            headDataFinally = headData.concat(headDataNoEdit);
+            $("#gridtable")[0].dfop = undefined;
+            page.initGird();
+
+            page.search(query);
+            //page.searchScale(query);
+        }
+    };
+    judgeSelect = function () {
+        var $content = $('body').find('.lr-layout-tool-left');
+        var query = $content.lrGetFormData();
+        if (query.Year == null || query.Year == "") {
+            learun.alert.warning("请选择年度！");
+            return false;
+        }
+        if (query.SubjectId == null || query.SubjectId == "") {
+            learun.alert.warning("请选择科目！");
+            return false;
+        }
+
+        return query;
+    };
+    page.init();
+}
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 49cd7ea16..5f97b7b4e 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	
@@ -1073,6 +1073,9 @@
     <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuConsumption\IndexForTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\FormView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\AmountForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\EnrollForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\EnrollFormView.js" />
@@ -7898,6 +7901,9 @@
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\EnrollSH.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuEnroll\EnrollIndexTJ.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuPunishment\CancelForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\AdmissionIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuEnrollScore\Index.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js
index e8f00a495..91c61e260 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js	
@@ -1,7 +1,7 @@
 //api地址
 var serverurl = "http://localhost:31173";
 //当前项目地址
-var currentUrl = "http://192.168.50.3:8082";
+var currentUrl = "http://192.168.10.46:8048";
 //地址栏传参
 function request(d) {
     for (var c = location.search.slice(1).split("&"), a = 0; a < c.length; a++) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs
index fb628abed..efe5f9338 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs	
@@ -128,11 +128,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("PHOTO")]
         public string Photo { get; set; }
         /// <summary> 
-        /// 考试科目编码 
-        /// </summary> 
-        [Column("SUBJECTNO")]
-        public string SubjectNo { get; set; }
-        /// <summary> 
         /// 年度 
         /// </summary> 
         [Column("YEAR")]
@@ -192,6 +187,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped]
         public string SchoolName { get; set; }
+        /// <summary>
+        /// 科目编码
+        /// </summary>
+        [NotMapped]
+        public string SubjectNo { get; set; }
         #endregion
     }
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs
index 44a392cb2..94662ce4a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs	
@@ -45,11 +45,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.GovMajorName,
                 t.GraduateNo,
                 t.MajorDirector,
-                t.CheckMark,
-                t.SubjectNo, 
+                t.CheckMark, 
                 t.Year, 
                 t.City, 
-                t.Area 
+                t.Area
                 ");
                 strSql.Append("  FROM CdMajor t ");
                 strSql.Append("  WHERE 1=1 ");
@@ -90,6 +89,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
         public IEnumerable<CdMajorEntity> GetElectivePageList(string queryJson)
         {
             try