修改转专业之外页面的样式和多选功能

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

@@ -58,23 +58,23 @@
                     </div>
                 </div>
             </div>
-            <div class="lr-layout-body" style="height:50%;" id="gridtable"></div>
+            <div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div>
 
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
+            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
             <div class="lr-form-wrap" style="height:30%;" id="form">
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
                     <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
                     <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
                     <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
                     <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                 </div>

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

@@ -712,17 +712,11 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 rows: 100,
                 isMultiselect: true,
-                onSelectRow: function (rowdata) {
-                    var selectedRow = $('#gridtable').jfGridGet('rowdata');
-                    if (list.length < 1) {
-                        list = selectedRow
-                    } else {
-                        // 合并两个数组
-                        list = list.concat(selectedRow)
-                        // 去重
+                onSelectRow: function (rowdata, type) {
+                    if (type) {
+                        list.push(rowdata)
                         let temp = {}
                         list = list.reduce((prev, curv) => {
-                            // 若临时对象中有一模一样的item，则什么都不做
                             if (temp[curv.StuNo]) { }
                             else {
                                 temp[curv.StuNo] = true
@@ -730,11 +724,10 @@ var bootstrap = function ($, learun) {
                             }
                             return prev
                         }, [])
-                        //console.log('resources', list)
+                        //var selectedRow = $('#gridtable').jfGridGet('rowdata');
+                        tempdatra = list
+                        $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                     }
-                    //console.log(list)
-                    tempdatra = list
-                    $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
 
             });

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

@@ -112,35 +112,36 @@
 
                 <div class="lr-layout-body" style="height:40%;border-bottom:1px solid #ccc;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
                 <div class="lr-form-wrap" style="height:30%;" id="form">
-                    <div class="col-xs-3 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-                        <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
+                        <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
                     </div>
-                    <div class="col-xs-3 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
                         <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-3 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
                         <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-3 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
                         <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                     </div>
-                    <div class="col-xs-12 lr-form-item">
-                        <div class="lr-form-item-title">异动原因</div>
-                        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
-                    </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
                         <input id="SuspensionPeriod" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
                     </div>
-                    <div class="col-xs-6 lr-form-item" style="padding-left:160px;">
-                        <div class="lr-form-item-title" style="width:160px;">休学时段(文本框暂时)<font face="宋体">*</font></div>
+                    <div class="col-xs-2 lr-form-item" >
+                        <div class="lr-form-item-title">休学时段<font face="宋体">*</font></div>
                         <input id="SuspensionBeginTime" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
 
                     </div>
+                    <div class="col-xs-12 lr-form-item">
+                        <div class="lr-form-item-title">异动原因</div>
+                        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    </div>
+
                 </div>
 
                 <div id="SubmitBtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">

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

@@ -728,17 +728,11 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 rows: 100,
                 isMultiselect: true,
-                onSelectRow: function (rowdata) {
-                    var selectedRow = $('#gridtable').jfGridGet('rowdata');
-                    if (list.length < 1) {
-                        list = selectedRow
-                    } else {
-                        // 合并两个数组
-                        list = list.concat(selectedRow)
-                        // 去重
+                onSelectRow: function (rowdata, type) {
+                    if (type) {
+                        list.push(rowdata)
                         let temp = {}
                         list = list.reduce((prev, curv) => {
-                            // 若临时对象中有一模一样的item，则什么都不做
                             if (temp[curv.StuNo]) { }
                             else {
                                 temp[curv.StuNo] = true
@@ -746,11 +740,10 @@ var bootstrap = function ($, learun) {
                             }
                             return prev
                         }, [])
-                        //console.log('resources', list)
+                        //var selectedRow = $('#gridtable').jfGridGet('rowdata');
+                        tempdatra = list
+                        $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                     }
-                    //console.log(list)
-                    tempdatra = list
-                    $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
 
             });

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

@@ -54,35 +54,35 @@
 
             <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom:1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
             <div class="lr-form-wrap" style="height:40%;" id="form">
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
                     <div id="NewAnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">恢复学籍<font face="宋体">*</font></div>
                     <div id="RecoverStuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">恢复账号<font face="宋体">*</font></div>
                     <div id="RecoverWriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">入班日期<font face="宋体">*</font></div>
                     <input id="LeaveDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#LeaveDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
                     <div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
                     <div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
                     <div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
                     <div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
                 </div>

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

@@ -830,17 +830,11 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 rows: 100,
                 isMultiselect: true,
-                onSelectRow: function (rowdata) {
-                    var selectedRow = $('#gridtable').jfGridGet('rowdata');
-                    if (list.length < 1) {
-                        list = selectedRow
-                    } else {
-                        // 合并两个数组
-                        list = list.concat(selectedRow)
-                        // 去重
+                onSelectRow: function (rowdata, type) {
+                    if (type) {
+                        list.push(rowdata)
                         let temp = {}
                         list = list.reduce((prev, curv) => {
-                            // 若临时对象中有一模一样的item，则什么都不做
                             if (temp[curv.StuNo]) { }
                             else {
                                 temp[curv.StuNo] = true
@@ -848,11 +842,10 @@ var bootstrap = function ($, learun) {
                             }
                             return prev
                         }, [])
-                        //console.log('resources', list)
+                        //var selectedRow = $('#gridtable').jfGridGet('rowdata');
+                        tempdatra = list
+                        $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                     }
-                    //console.log(list)
-                    tempdatra = list
-                    $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
 
             });

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

@@ -58,23 +58,23 @@
                     </div>
                 </div>
             </div>
-            <div class="lr-layout-body" style="height:50%;" id="gridtable"></div>
+            <div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div>
 
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
+            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
             <div class="lr-form-wrap" style="height:30%;" id="form">
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
                     <div id="AnomalousType" type="text" readonly="readonly" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
                     <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
                     <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
+                <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
                     <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                 </div>

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

@@ -713,17 +713,11 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 rows: 100,
                 isMultiselect: true,
-                onSelectRow: function (rowdata) {
-                    var selectedRow = $('#gridtable').jfGridGet('rowdata');
-                    if (list.length < 1) {
-                        list = selectedRow
-                    } else {
-                        // 合并两个数组
-                        list = list.concat(selectedRow)
-                        // 去重
+                onSelectRow: function (rowdata, type) {
+                    if (type) {
+                        list.push(rowdata)
                         let temp = {}
                         list = list.reduce((prev, curv) => {
-                            // 若临时对象中有一模一样的item，则什么都不做
                             if (temp[curv.StuNo]) { }
                             else {
                                 temp[curv.StuNo] = true
@@ -731,11 +725,10 @@ var bootstrap = function ($, learun) {
                             }
                             return prev
                         }, [])
-                        //console.log('resources', list)
+                        //var selectedRow = $('#gridtable').jfGridGet('rowdata');
+                        tempdatra = list
+                        $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                     }
-                    //console.log(list)
-                    tempdatra = list
-                    $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
 
             });