Преглед на файлове

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

新疆警官学校中职
ndbs преди 1 година
родител
ревизия
32af383dea
променени са 12 файла, в които са добавени 97 реда и са изтрити 129 реда
  1. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs
  2. +6
    -6
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml
  3. +6
    -13
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js
  4. +26
    -26
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml
  5. +11
    -18
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js
  6. +13
    -12
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml
  7. +6
    -13
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js
  8. +8
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml
  9. +6
    -13
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js
  10. +6
    -6
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml
  11. +6
    -13
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js
  12. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs Целия файл

@@ -1,5 +1,6 @@
using Learun.Application.TwoDevelopment.EducationalAdministration;
using Learun.Util;
using System;
using System.Collections.Generic;
using System.Data;
using System.Web.Mvc;
@@ -176,6 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
StuTransferInfoEntity entity = strEntity.ToObject<StuTransferInfoEntity>();
entity.AnomalousType = "04";
entity.ChangeReason = "转入";
entity.StuId= Guid.NewGuid().ToString();
stuTransferInfoIBLL.SaveEntity(keyValue, entity);
return Success("保存成功!");
}


+ 6
- 6
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>


+ 6
- 13
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);
}

});


+ 26
- 26
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml Целия файл

@@ -61,101 +61,101 @@
<div class="condiv divactive" id="tab1">

<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll; padding-top:15px; -webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="padding:15px; -webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
<div class="lr-form-wrap" style="height:90%;" id="form">
@*转入班级*@
<div style="font-size:16px;border-bottom:1px solid #eee;margin:20px 0;">转入班级</div>
<div class="col-xs-12 lr-form-item">
<div style="font-size:18px;border-bottom:1px solid #eee;margin:20px;padding-bottom:10px;">转入班级</div>
<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-12 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-12 lr-form-item">
<div class="col-xs-2 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-12 lr-form-item">
<div class="col-xs-2 lr-form-item">
<div class="lr-form-item-title">班级<font face="宋体">*</font></div>
<div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="col-xs-2 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 style="font-size:16px;border-bottom:1px solid #eee;margin:20px 0;">转入学生信息</div>
<div class="col-xs-6 lr-form-item">
<div style="font-size:18px;border-bottom:1px solid #eee;margin:20px;margin-top:120px;padding-bottom:10px;">转入学生信息</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前学校</div>
<input id="TransferPreSchool" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前年级</div>
<input id="TransferPreGrade" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前班级</div>
<input id="TransferPreClass" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前专业</div>
<input id="TransferPreMajor" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前学号</div>
<input id="TransferPreStuNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学日期</div>
<input id="TransferPreDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#TransferPreDate').trigger('change'); } })" />
</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="StuName" type="text" class="form-control" 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>
<input id="StuNo" type="text" class="form-control" 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="IdCardType" 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="IdentityCardNo" class="form-control" type="text" 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">出生日期</div>
<input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" />
</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="Gender" 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">民族</div>
<div id="NationalityNo"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">户口所在地</div>
<input id="ResidencePlace" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">籍贯</div>
<input id="RegionNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">是否住宿</div>
<div id="IsInAccommodation"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">联系电话</div>
<input id="Mobile" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">家庭地址</div>
<input id="MailAddress" type="text" class="form-control" />
</div>


+ 11
- 18
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js Целия файл

@@ -827,25 +827,18 @@ var bootstrap = function ($, learun) {
rows: 100,
isMultiselect: true,
onSelectRow: function (rowdata, type) {
//console.log(rowdata)
//console.log(type)

if (type) {
var selectedRow = $('#gridtable').jfGridGet('rowdata');
if (list.length < 1) {
list = selectedRow
} else {
list = list.concat(selectedRow)
let temp = {}
list = list.reduce((prev, curv) => {
if (temp[curv.StuNo]) { }
else {
temp[curv.StuNo] = true
prev.push(curv)
}
return prev
}, [])
}
list.push(rowdata)
let temp = {}
list = list.reduce((prev, curv) => {
if (temp[curv.StuNo]) { }
else {
temp[curv.StuNo] = true
prev.push(curv)
}
return prev
}, [])
//var selectedRow = $('#gridtable').jfGridGet('rowdata');
tempdatra = list
$('#selgridtab').jfGridSet('refreshdata', tempdatra);
}


+ 13
- 12
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;">


+ 6
- 13
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);
}

});


+ 8
- 8
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>


+ 6
- 13
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);
}

});


+ 6
- 6
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>


+ 6
- 13
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);
}

});


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs Целия файл

@@ -845,7 +845,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
case "04": //转入
#region 学籍表加数据
var stuInfoBasicEntity = new StuInfoBasicEntity();
stuInfoBasicEntity.Create();
stuInfoBasicEntity.StuId = upTrua.StuId;
stuInfoBasicEntity.StuNo = upTrua.StuNo;
stuInfoBasicEntity.StuName = upTrua.StuName;
stuInfoBasicEntity.DeptNo = upTrua.DeptNo;


Зареждане…
Отказ
Запис