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

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

@@ -115,6 +115,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 打印方向表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DirectionPrint()
+        {
+            return View();
+        }
+        /// <summary>
         /// 打印
         /// <summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexItem.js

@@ -130,7 +130,6 @@ var bootstrap = function ($, learun) {
                 var AcademicYearNo = $('#AcademicYearNo').lrselectGet() || '';
                 var Semester = $('#Semester').lrselectGet() || '';
                 var LessonNo = $('#LessonNo').lrselectGet() || '';
-                console.log({ AcademicYearNo, Semester, LessonNo }, AcademicYearNo != '' && Semester != '' && LessonNo != '')
                 if (AcademicYearNo == '' && Semester == '' || LessonNo == '' ) {
                     learun.alert.warning("请选择学年，学期以及课程");
                     return;

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

@@ -2,15 +2,16 @@
     ViewBag.Title = "学生学籍";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<link href="~/Content/css/StuTransferInfo/QueryScoreIndex.css" rel="stylesheet" />
 <div class="lr-layout lr-layout-left-center" id="lr_layout">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">
             <div class="lr-layout-title lrlt ">班级列表</div>
-            <div id="dataTree" class="lr-layout-body"></div>
+            <div id="dataTree"></div>
         </div>
     </div>
     <div class="lr-layout-center">
-        <div class="lr-layout-wrap  ">
+        <div class="lr-layout-wrap">
             <div class="lr-layout-title">
                 <span id="titleinfo" class="lrlt">学生列表信息</span>
             </div>
@@ -37,7 +38,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">身份证号</div>
-                                    <input id="IdentityCardNo" type="text" class="form-control"/>
+                                    <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>
@@ -50,7 +51,13 @@
                     </div>
                 </div>
             </div>
-            <div class="lr-layout-body" id="gridtable"></div>
+            <div class="lr-layout-body" id="printBox">
+                <div class="printTitle" style="display:none;color:#333;font-size:20px;text-align:center;line-height:50px"></div>
+                <div class="lr-layout-body">
+                    <div class="lr-layout-wrap" id="gridtable"></div>
+                </div>
+            </div>
+            
         </div>
     </div>
 </div>

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

@@ -1,7 +1,7 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
-    var Class;
+    var Class, ClassName;
     var page = {
         init: function () {
             page.initGird();
@@ -13,6 +13,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetTree',
                 nodeClick: function (item) {
                     Class = item.value;
+                    ClassName = item.text;
                     page.search({ ClassNo: item.value });
                 }
             });
@@ -27,7 +28,38 @@ var bootstrap = function ($, learun) {
             });
             // 打印
             $('#lr_print').on('click', function () {
-                $('#gridtable').jqprintTable();
+                if (!Class) {
+                    learun.alert.warning("请选择左侧班级！");
+                    return
+                }
+                let params = {
+                    ClassName,
+                    Class,
+                }
+                learun.layerForm({
+                    id: 'QueryBasicInfo',
+                    title: '学生方向确认',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/DirectionPrint?' + $.param(params),
+                    width: 1102,
+                    height: 800,
+                    btn: null
+                });
+                //$('.printTitle').text((ClassName || '')+'学生方向确认')
+                //$('.printTitle').css('display', 'block');
+                //$('#gridtable').css('zoom', '94%')
+                
+                //let p5Width = $('.jfgrid-head-cell[path=5]').css('width')
+                //$('.jfgrid-head-cell[path=5]').css('width', '480px')
+                //let p10Width = $('.jfgrid-head-cell[path=10]').css('width')
+                //$('.jfgrid-head-cell[path=10]').css('width', '82px')
+                ////$('#gridtable').jqprintTable();
+
+                //$('#printBox').jqprint();
+
+                //$('.jfgrid-head-cell[path=5]').css('width', p5Width)
+                //$('.jfgrid-head-cell[path=10]').css('width', p10Width)
+                //$('#gridtable').css('zoom', '100%')
+                //$('.printTitle').css('display', 'none');
             });
         },
         // 初始化列表 
@@ -37,12 +69,12 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "姓名", name: "StuName", width: 100, align: "center" },
                     {
-                        label: "性别", name: "GenderNo", width: 80, align: "center",
+                        label: "性别", name: "GenderNo", width: 40, align: "center",
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "男" : "女";
                         }
                     },
-                    { label: "身份证号", name: "IdentityCardNo", width: 180, align: "center" },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "center" },
                     {
                         label: "民族", name: "NationalityNo", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -57,7 +89,7 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "学籍号", name: "StuCode", width: 160, align: "center" , },
                     {
-                        label: '选择方向', name: '选择方向', align: "center", statistics: true,
+                        label: '选择方向', name: '选择方向', align: "center", statistics: true, width: 460,
                         children: [
                             { label: "技能高考", name: "GK", width: 100, align: "center" },
                             { label: "高职单招", name: "DZ", width: 100, align: "center" },
@@ -101,7 +133,7 @@ var bootstrap = function ($, learun) {
             }
             param = param || {};
             param.ClassNo = Class;
-            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }, { page: request('page') || 1});
         }
     };
     refreshGirdData = function () {

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

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "学生学籍";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<link href="~/Content/css/StuInfoBasic/DirectionPrint.css" rel="stylesheet" />
+<div id="printPage" style="height:auto;overflow-y:scroll" id="printBox">
+    <div class="no-print" style="text-align:right;margin-top:5px">
+        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+    </div>
+    <div class="pageCard firstPage">
+        <div class="printTitle"></div>
+        <div id="gridtable"></div>
+    </div>
+    <div class="pageCard pageCard1">
+        <div class="printTitle"></div>
+        <div id="gridtable1"></div>
+    </div>
+    <div class="pageCard pageCard2">
+        <div class="printTitle"></div>
+        <div id="gridtable2"></div>
+    </div>
+    <div class="pageCard pageCard3">
+        <div class="printTitle"></div>
+        <div id="gridtable3"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/DirectionPrint.js")

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

@@ -0,0 +1,136 @@
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var Class, ClassName;
+    var page = {
+        init: function () {
+            Class = request('Class')
+            $.ajax({
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetTree',
+                type: "get",
+                dataType: "json",
+                async: false,
+                cache: false,
+                success: function (res) {
+                    if (res.code == 200) {
+                        let obj = res.data.find(e => e.value == Class)
+                        ClassName = obj ? obj.text : ''
+                        $('.printTitle').text((ClassName || '') + '学生方向确认')
+                    }
+                },
+            });
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 200, 400);
+            $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
+            $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
+            // 刷新 
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#printPage').jqprint();
+            });
+        },
+        // 初始化列表 
+        initGird: function () {
+            let option = {
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
+                headData: [
+                    { label: "姓名", name: "StuName", width: 100, align: "center" },
+                    {
+                        label: "性别", name: "GenderNo", width: 40, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "center" },
+                    {
+                        label: "民族", name: "NationalityNo", width: 100, align: "center",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'National',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学籍号", name: "StuCode", width: 160, align: "center", },
+                    {
+                        label: '选择方向', name: '选择方向', align: "center", statistics: true, width: 460,
+                        children: [
+                            { label: "技能高考", name: "GK", width: 80, align: "center" },
+                            { label: "高职单招", name: "DZ", width: 80, align: "center" },
+                            { label: "3+2高职转段", name: "ZD", width: 100, align: "center" },
+                            { label: "就业", name: "JY", width: 70, align: "center" },
+                            { label: "签名", name: "QM", width: 80, align: "center" },
+                        ]
+                    },
+
+
+                ],
+                mainId: 'StuId',
+                isPage: true,
+                rows: 24,
+                isShowNum: true,
+                // 是否显示序号
+                //isMultiselect: true,
+                //onSelectRow: function (rowdata) {
+                //    if (rowdata.CheckMark == "1") {
+                //        $("#check").hide();
+                //        $("#uncheck").show();
+                //        $("#lr_edit").hide();
+                //        $("#lr_delete").hide();
+                //    } else {
+                //        $("#uncheck").hide();
+                //        $("#check").show();
+                //        $("#lr_edit").show();
+                //        $("#lr_delete").show();
+                //    }
+                //}
+                onRenderComplete: function (list) {
+                    //if (!list.length) {
+                    //    $('.pageCard').hide()
+                    //}
+                }
+
+            }
+            $('#gridtable').lrAuthorizeJfGridLei(option);
+            $('#gridtable1').lrAuthorizeJfGridLei({
+                ...option, onRenderComplete: function (list) {
+                    if (!list.length) { $('.pageCard1').hide() }
+                }
+            });
+            $('#gridtable2').lrAuthorizeJfGridLei({
+                ...option, onRenderComplete: function (list) {
+                    if (!list.length) { $('.pageCard2').hide() }
+                }
+            });
+            $('#gridtable3').lrAuthorizeJfGridLei({
+                ...option, onRenderComplete: function (list) {
+                    if (!list.length) { $('.pageCard3').hide() }
+                }
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.ClassNo = Class;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }, { page: 1 });
+            $('#gridtable1').jfGridSet('reload', { queryJson: JSON.stringify(param) }, { page: 2 });
+            $('#gridtable2').jfGridSet('reload', { queryJson: JSON.stringify(param) }, { page: 3 });
+            $('#gridtable3').jfGridSet('reload', { queryJson: JSON.stringify(param) }, { page: 4 });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+} 

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/StuInfoBasic/DirectionPrint.css

@@ -0,0 +1,99 @@
+body {
+    overflow-y:auto
+}
+
+.lr-layout-body {
+    overflow: auto;
+}
+
+#printPage::-webkit-scrollbar {
+    display: none
+}
+
+.jfgrid-footer {
+    display:none;
+}
+
+.printTitle {
+    color: #333;
+    font-size: 20px;
+    text-align: center;
+    line-height: 54px;
+    height: 54px;
+    position:absolute;
+    top:0;
+    width:100%;
+}
+
+.pageCard {
+    position: relative;
+    padding-top:54px;
+}
+
+.jfgrid-layout {
+    border-top: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    padding-bottom:0!important;
+}
+
+
+@media print {
+    body {
+        height: auto !important;
+        border: none !important;
+        padding-left: 20px !important;
+        padding-right: 20px !important;
+        zoom:98%;
+    }
+
+    .no-print{
+        display:none;
+    }
+
+    .pageCard {
+        /*padding-top: 18px;*/
+        padding-left: 10px;
+        padding-right: 10px;
+        box-sizing: border-box;
+        height: 100vh !important;
+        overflow:hidden;
+    }
+    /*.pagecard.firstpage{
+        padding-top:0px;
+    }*/
+    ::-webkit-scrollbar {
+        display: none
+    }
+
+    .btn {
+        display: none;
+    }
+
+    /*打印时框架样式处理*/
+    .lr-layout.lr-layout-left-center {
+        padding-left: 0px !important;
+    }
+
+    .lr-layout-center > .lr-layout-wrap {
+        padding-top: 0px !important;
+    }
+
+    .lr-scroll-box {
+        position: unset !important;
+    }
+
+    .jfgrid-footer {
+        display: none;
+    }
+
+    .jfgrid_body_gridtable {
+        overflow: unset !important;
+        height: auto !important;
+    }
+
+    .lr-layout-title {
+        border-top: 0 !important;
+    }
+
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/StuTransferInfo/QueryScoreIndex.css

@@ -62,4 +62,30 @@
         font-size: 14px;
         color: #333;
     }
+
+    /*打印时框架样式处理*/
+    .lr-layout.lr-layout-left-center {
+        padding-left: 0px!important;
+    }
+    .lr-layout-center>.lr-layout-wrap {
+        padding-top: 0px!important;
+    }
+    .lr-scroll-box {
+        position: unset!important;
+    }
+    .jfgrid-footer{
+        display:none;
+    }
+    .jfgrid_body_gridtable {
+        overflow: unset !important;
+        height: auto !important;
+    }
+
+    .lr-layout-title{
+        border-top:0!important;
+    }
+    .lr-layout-body{
+        height:2848px!important;
+        border:none!important;
+    }
 }

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

@@ -1224,6 +1224,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasicChange\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\DirectionPrint.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Direction.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\SynPhotoForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\GraduateDiplomaReceiveForm.js" />
@@ -1343,6 +1344,7 @@
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\SyncByConditionForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexClassRoom.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\Direction.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\DirectionPrint.cshtml" />
     <None Include="Areas\EducationalAdministration\Views\StuInfoBasic\Printxjk.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\AllocationClassDC.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoFresh\StatisticClassIndex.js" />
@@ -1910,6 +1912,7 @@
     <Content Include="Content\css\OnlineRegistrate\Header.html" />
     <Content Include="Content\css\OnlineRegistrate\login.css" />
     <Content Include="Content\css\OnlineRegistrate\style.css" />
+    <Content Include="Content\css\StuInfoBasic\DirectionPrint.css" />
     <Content Include="Content\css\StuTransferInfo\QueryScoreIndex.css" />
     <Content Include="Content\css\UserCenter\user.css" />
     <Content Include="Content\echarts\AplicationVisitStatistic.html" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js

@@ -1374,7 +1374,7 @@
             });
         },
         // 后台数据加载 
-        reload: function ($self, op) {
+        reload: function ($self, op, setData={}) {
             op.rowdatas = [];
             if (op.isPage) {
                 learun.loading(true, '正在获取数据');
@@ -1403,6 +1403,8 @@
                     op.running.pageparam.page = 1;
                 }
 
+                if(setData.page)op.running.pageparam.page = setData.page;
+
                 op.param['pagination'] = JSON.stringify(op.running.pageparam);
 
                 learun.httpAsync('GET', op.url, op.param, function (data) {
@@ -2181,7 +2183,8 @@
         return $self;
     };
 
-    $.fn.jfGridSet = function (name, data) {
+    $.fn.jfGridSet = function (name, data, setData) {
+        setData = setData || {}
         var $self = $(this);
         if (!$self[0]) {
             return null;
@@ -2193,12 +2196,12 @@
         switch (name) {
             case 'reload': // 重新加载一边数据
                 if (data == undefined || data == null) {
-                    _jfgrid.reload($self, dfop);
+                    _jfgrid.reload($self, dfop, setData);
                 }
                 else {
                     data = data || dfop.param || {};
                     dfop.param = data.param || data;
-                    _jfgrid.reload($self, dfop);
+                    _jfgrid.reload($self, dfop, setData);
                 }
                 break;
             case 'reloadall'://重新加载所有数据
@@ -2206,7 +2209,7 @@
                 data = data || dfop.param || {};
                 dfop.param = data.param || data;
                 dfop.running.pageparam.page = 1;
-                _jfgrid.reload($self, dfop);
+                _jfgrid.reload($self, dfop, setData);
                 break;
             case 'refresh':
                 break;