【修改】新生信息管理区分高职和中职；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs

@@ -46,6 +46,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+
+        /// <summary>
+        /// 主页面【中职】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexCenter()
+        {
+            return View();
+        }
+
         /// <summary>
         /// 
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js

@@ -6,6 +6,7 @@
  */
 var acceptClick, getParam;
 var keyValue = request('keyValue');
+var Crowning = request('Crowning');//中高职标识
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -205,6 +206,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.Crowning = Crowning;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js

@@ -211,6 +211,11 @@ var bootstrap = function ($, learun) {
                     { label: '数学', name: 'MathScore', width: 100, align: "left" },
                     { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
                     { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
+                    {
+                        label: '职校类型', name: 'Crowning', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "中职" : "高职";
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js

@@ -6,6 +6,7 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var Crowning = request('Crowning');//中高职标识
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
@@ -181,7 +182,9 @@ var bootstrap = function ($, learun) {
         var Score4 = $('#ComprehensiveScore').val();
         $('#HighAmountScore').val(Number(Score1) + Number(Score2) + Number(Score3) + Number(Score4));
         var postData = {};
-        postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
+        var data = $('[data-table="StuInfoFresh"]').lrGetFormData();
+        data["Crowning"] = Crowning;
+        postData.strEntity = JSON.stringify(data);
         postData.strstuInfoFreshEmergePeopleList = JSON.stringify($('#StuInfoFreshEmergePeople').jfGridGet('rowdatas'));
         postData.strstuInfoFreshFamilyList = JSON.stringify($('#StuInfoFreshFamily').jfGridGet('rowdatas'));
         $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SaveForm?keyValue=' + keyValue, postData, function (res) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js

@@ -418,6 +418,11 @@ var bootstrap = function ($, learun) {
                     { label: '数学', name: 'MathScore', width: 100, align: "left" },
                     { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
                     { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
+                    {
+                        label: '职校类型', name: 'Crowning', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "中职" : "高职";
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,

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

@@ -45,7 +45,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/Form',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/Form?Crowning=' + 0,
                     width: 1200,
                     height: 700,
                     callBack: function (id) {
@@ -61,7 +61,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/Form?keyValue=' + keyValue + '&Crowning=' + 0,
                         width: 1200,
                         height: 700,
                         callBack: function (id) {
@@ -102,7 +102,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'form',
                     title: "分配班级",
-                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/AllocationClass',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/AllocationClass?Crowning=' + 0,
                     width: 1300,
                     height: 800,
                     btn: null
@@ -384,6 +384,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.Crowning = 0;//高职
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexCenter.cshtml

@@ -0,0 +1,43 @@
+@{
+    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">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="考生号/准考证号/姓名/身份证号" />
+                        <input id="Grade" type="text" class="form-control" placeholder="年级" />
+                    </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_printlc" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印报道流程单</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_allocationClass" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;分配班级</a>
+                        <a id="lr_newallocationDormitory" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;分配宿舍</a>
+                        <a id="lr_newallocationBed" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;分配床位</a>
+                        <a id="lr_confirmDormitory" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;确认分配</a>
+                        <a id="lr_exportBed" class="btn btn-default"><i class="fa fa-sign-out"></i>&nbsp;导出学生宿舍</a>
+                        <a id="lr_insertStuInfoBasic" 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/StuInfoFresh/IndexCenter.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexCenter.js

@@ -0,0 +1,395 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-08-08 17:21
+ * 描  述：新生信息管理
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                var Grade = $('#Grade').val();
+                page.search({ keyword: keyword, Grade: Grade });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //打印报道流程单
+            $('#lr_printlc').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '打印报道流程单',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/PrintSignFlow?Id=' + keyValue,
+                        width: 1200,
+                        height: 800,
+                        btn: null
+                    });
+                }
+
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/Form?Crowning=' + 1,
+                    width: 1200,
+                    height: 700,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/Form?keyValue=' + keyValue + '&Crowning=' + 1,
+                        width: 1200,
+                        height: 700,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DeleteForm', { keyValue: keyValue }, function () {
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/FormView?keyValue=' + keyValue,
+                        width: 1200,
+                        height: 700,
+                        btn: null
+                    });
+                }
+            });
+            //  分配班级
+            $('#lr_allocationClass').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: "分配班级",
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/AllocationClass?Crowning=' + 1,
+                    width: 1300,
+                    height: 800,
+                    btn: null
+                });
+
+            });
+            //  分配宿舍
+            $('#lr_newallocationDormitory').on('click', function () {
+                learun.layerFormForPercent({
+                    id: 'form',
+                    title: "分配宿舍",
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/AllocationDormitory',
+                    width: '95%',
+                    height: '95%',
+                    btn: null
+                });
+            });
+            //  分配床位
+            $('#lr_newallocationBed').on('click', function () {
+                learun.layerFormForPercent({
+                    id: 'form',
+                    title: "分配床位",
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/AllocationBed',
+                    width: '95%',
+                    height: '95%',
+                    btn: null
+                });
+            });
+            //  导出学生宿舍
+            $('#lr_exportBed').on('click', function () {
+                learun.layerForm({
+                    id: 'ExportBedForm',
+                    title: '导出学生宿舍',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/ExportBedForm',
+                    width: 600,
+                    height: 400,
+                    btn: null
+                });
+            });
+            //确认分配宿舍
+            $('#lr_confirmDormitory').on('click', function () {
+                learun.layerConfirm('是否确认已经分配的宿舍！', function (res) {
+                    if (res) {
+                        learun.loading(true, '分配中');
+                        learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/ConfirmDormitory', {}, function (val) {
+                            learun.alert.success('操作成功');
+                            learun.loading(false);
+                        });
+                    }
+                });
+            });
+            // 生成学籍信息
+            $('#lr_insertStuInfoBasic').on('click', function () {
+                learun.layerConfirm('是否确认生成学籍信息！', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/ImportStuInfoBasic', {}, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPageList',
+                headData: [
+                    { label: '考生号', name: 'ksh', width: 150, align: "left" },
+                    { label: '准考证号', name: 'zkzh', width: 150, align: "left" },
+                    { label: '学号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '年级', name: 'Grade', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    {
+                        label: '是否完善信息', name: 'ID', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DirectRelatives',
+                                key: row.ID,
+                                keyId: 'stuinfofreshid',
+                                callback: function (_data) {
+                                    var a = _data['id'];
+                                    if (a == undefined) {
+                                        callback("<span class=\"label label-warning\">未完善</span>");
+                                    } else {
+                                        callback("<span class=\"label label-success\">已完善</span>");
+                                    }
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否生成学籍', name: 'IsInBasic', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == true ? "<span class=\"label label-success\">是</span>" : "<span class=\"label label-warning\">否</span>";
+                        }
+                    },
+                    {
+                        label: '院系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        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: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '班级', name: 'ClassNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '性别', name: 'GenderNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '身份证号', name: 'IdentityCardNo', width: 150, align: "left" },
+                    {
+                        label: '民族', name: 'NationalityNo', width: 80, 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: 'FamilyOriginNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ExamineeCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '考生类型', name: 'TestStuSortNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ExamineeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '省份', name: 'Province', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+                                key: value,
+                                keyId: 'pcode',
+                                callback: function (_data) {
+                                    callback(_data['pname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '地市', name: 'City', width: 150, 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: 'SchoolTag', width: 100, align: "left" },
+                    {
+                        label: '毕业生类型', name: 'GraduateType', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'GraduateType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '科类', name: 'TestStuSubjectNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'SubjectType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '高考总分', name: 'HighAmountScore', width: 100, align: "left" },
+                    { label: '第几志愿', name: 'WillNo', width: 80, align: "left" },
+                    {
+                        label: '录取专业', name: 'RecruitMajorNo', 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: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '录取方式', name: 'MatriculateSort', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EnrollStyle',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '语文', name: 'ChineseScore', width: 100, align: "left" },
+                    { label: '数学', name: 'MathScore', width: 100, align: "left" },
+                    { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
+                    { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
+                    {
+                        label: '开户银行', name: 'DepositBank', width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepositBank',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: '银行卡账号', name: 'BankCard', width: 150, align: "left" },
+                    { label: '开户银行位置', name: 'BankLocation', width: 300, align: "left" },
+                    { label: '开户行号', name: 'BankNo', width: 150, align: "center" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'StuNo',
+                sord: 'desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.Crowning = 1;//中职
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js

@@ -204,14 +204,14 @@ var bootstrap = function ($, learun) {
             //同步数据
             $('#lr_synchronous').on('click',
                 function () {
-                    learun.layerConfirm('是否要同步缴费数据！',function (res) {
-                            if (res) {
-                                learun.postForm(
-                                    top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SynchronousList', {}, function () {
+                    learun.layerConfirm('是否要同步缴费数据！', function (res) {
+                        if (res) {
+                            learun.postForm(
+                                top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SynchronousList', {}, function () {
                                     refreshGirdData();
-                                 });
-                            }
-                        });
+                                });
+                        }
+                    });
                 });
             // 取消其他费用缴费
             $('#lr_cancelOtherPay').on('click', function () {
@@ -413,6 +413,11 @@ var bootstrap = function ($, learun) {
                     //{ label: '数学', name: 'MathScore', width: 100, align: "left" },
                     //{ label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
                     //{ label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
+                    {
+                        label: '职校类型', name: 'Crowning', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "中职" : "高职";
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js

@@ -258,6 +258,11 @@ var bootstrap = function ($, learun) {
                     { label: '数学', name: 'MathScore', width: 100, align: "left" },
                     { label: '英语', name: 'ForeignLangScore', width: 100, align: "left" },
                     { label: '综合', name: 'ComprehensiveScore', width: 100, align: "left" },
+                    {
+                        label: '职校类型', name: 'Crowning', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "中职" : "高职";
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js

@@ -316,6 +316,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: '职校类型', name: 'Crowning', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "中职" : "高职";
+                        }
+                    },
                 ],
                 mainId: 'ID',
                 isPage: true,

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

@@ -1047,6 +1047,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\IndexOfTwo.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexCenter.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\SoonGraduateIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\IndexCenter.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\IndexUnpassTwoOfElective.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexOfElectiveInTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScoreNotPassTwo\InputScoreIndexOfElective.js" />
@@ -8315,6 +8316,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuFellowship\FormOfStudent.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\FormOfStudent.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexInStuScoreOfStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\IndexCenter.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

@@ -670,6 +670,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         [Column("GETBEDDINGSTATUS")]
         public string GetBeddingStatus { get; set; }
+        /// <summary>
+        /// 中职高职 0 高职 1 中职
+        /// </summary>
+        [Column("CROWNING")]
+        public string Crowning { get; set; }
         #endregion
 
         #region  扩展操作 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -253,6 +253,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     strSql.Append(" and (t.ksh like @keyword or t.zkzh like @keyword or t.StuName like @keyword or t.IdentityCardNo like @keyword )");
                     dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
                 }
+                if (!queryParam["Crowning"].IsEmpty())
+                {
+                    dp.Add("Crowning", queryParam["Crowning"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Crowning = @Crowning ");
+                }
                 if (!queryParam["StuNo"].IsEmpty())
                 {
                     strSql.Append(" and t.StuNo = @StuNo ");
@@ -1835,8 +1840,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 RegisterDate, Photo, TeachPlanNo, CheckMark, mobile, EMail, QQ, FatherUnit, FatherName, FatherPhone, MatherName, 
                 MatherUnit, MatherPhone, username, password, MailAddress, PostalCode, InSchoolStatus, TransMark, ClassTutorNo, 
                 ResumeCheck, PracStatus, RegisterStatus, PunishmentDate, F_CityId, F_CountyId, F_ProvinceId, F_SchoolId, 
-                EduSystem, StudyModality, SyncFlag)
-select NEWID(),StuNo,null,NoticeNo,null,ksh,DeptNo,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0 from
+                EduSystem, StudyModality, SyncFlag,Crowning)
+select NEWID(),StuNo,null,NoticeNo,null,ksh,DeptNo,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0,Crowning from
 (select f.*,m.F_SchoolId from StuInfoFresh f left join CdMajor m on f.MajorNo=m.MajorNo where f.StuNo is not null ) as bb
 where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo) ");