bjquanjiang
/
DigitalScholl
1
0
Derivar 0
Código Questões 0 Pedidos de integração 0 Lançamentos 0 Wiki Trabalho
Ver a proveniência

学籍异动-查看和综合查询页面合并

怀来职教中心中职
ndbs há 1 ano
ascendente
d3fd0d7a83
cometimento
8525d72960
8 ficheiros alterados com 26 adições e 410 eliminações
Visualização em 2 colunas
Opções das diferenças
Mostrar estatísticas Descarregar ficheiro patch Descarregar ficheiro diff
  1. +0
    -9
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs
  2. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml
  3. +18
    -18
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js
  4. +0
    -54
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.cshtml
  5. +0
    -323
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js
  6. +5
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml
  7. +3
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.js
  8. +0
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

+ 0
- 9
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs Ver ficheiro

@@ -104,15 +104,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return View();
}
/// <summary>
/// 综合查询
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult IndexQuery()
{
return View();
}
/// <summary>
/// 综合查询-基本信息
/// </summary>
/// <returns></returns>


+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml Ver ficheiro

@@ -94,7 +94,6 @@
<a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
</div>
<div class=" btn-group btn-group-sm">
<a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
<a id="lr_compoundQuery" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;综合查询</a>
</div>
</div>


+ 18
- 18
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js Ver ficheiro

@@ -131,24 +131,24 @@ var bootstrap = function ($, learun) {
$('#lr_refresh').on('click', function () {
location.reload();
});
// 查看
$('#lr_view').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
if (keyValue.indexOf(',') != -1) {
learun.alert.warning("只能选择一条记录进行查看！");
return;
}
learun.layerForm({
id: 'formview',
title: '查看',
url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue,
width: 1000,
height: 600,
btn: null
});
}
});
//// 查看
//$('#lr_view').on('click', function () {
// var keyValue = $('#gridtable').jfGridValue('ID');
// if (learun.checkrow(keyValue)) {
// if (keyValue.indexOf(',') != -1) {
// learun.alert.warning("只能选择一条记录进行查看！");
// return;
// }
// learun.layerForm({
// id: 'formview',
// title: '查看',
// url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue,
// width: 1000,
// height: 600,
// btn: null
// });
// }
//});
// 综合查询
$('#lr_compoundQuery').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');


+ 0
- 54
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.cshtml Ver ficheiro

@@ -1,54 +0,0 @@
@{
ViewBag.Title = "学籍异动列表";
Layout = "~/Views/Shared/_Index.cshtml";
}
<div class="lr-layout ">
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle">
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="multiple_condition_query">
<div class="lr-query-formcontent">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">异动类型</div>
<div id="AnomalousType"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">姓名</div>
<input id="StuName" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">班级</div>
<div id="ClassNo"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">申请人</div>
<div id="CreateUserId"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">审核人</div>
<div id="CheckUserId"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">保留学籍</div>
<div id="StuStatus"></div>
</div>
</div>
</div>
</div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class=" btn-group btn-group-sm">
<a id="lr_views" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
</div>
</div>
</div>
<div class="lr-layout-body" id="gridtable"></div>
</div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js")

+ 0
- 323
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IndexQuery.js Ver ficheiro

@@ -1,323 +0,0 @@
/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
* Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
* 创建人：超级管理员
* 日 期：2023-01-04 15:03
* 描 述：学籍异动列表
*/
var selectedRow;
var refreshGirdData;
var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.initGird();
page.bind();
},
bind: function () {
// 查询
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 290, 400);
$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
$('#ClassNo').lrselect({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
value: "classno",
text: "classname"
});
$('#CheckUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
$('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
$('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
// 查看
$('#lr_views').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
if (keyValue.indexOf(',') != -1) {
learun.alert.warning("只能选择一条记录进行查看！");
return;
}
learun.layerForm({
id: 'formview',
title: '查看',
url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue,
width: 1000,
height: 600,
btn: null
});
}
});
},
initGird: function () {
$('#gridtable').lrAuthorizeJfGridLei({
url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList',
headData: [
{ label: '姓名', name: 'StuName', width: 100, align: "left" },
{ label: '学号', name: 'StuNo', width: 160, align: "left" },
{
label: "性别", name: "GenderNo", width: 80, align: "left",
formatter: function (cellvalue) {
return cellvalue == true ? "男" : "女";
}
},
{ label: '身份证号', name: 'IdentityCardNo', width: 200, align: "left" },
{
label: '原班级', name: 'ClassNo', width: 150, 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: 'MajorNo', width: 150, 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: '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: 'Grade', width: 100, align: "left" },
{
label: '学制', name: 'EduSystem', width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'EduSystem',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: '入班日期', name: 'LeaveDate', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '离班日期', name: 'EnteDate', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '现班级', name: 'NewClassNo', 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: 'NewMajorNo', 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: 'NewDeptNo', 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: 'NewGrade', width: 60, align: "left" },
//{
// label: '创建时间', name: 'CreateTime', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '创建用户', name: 'CreateUserId', width: 200, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
// key: value,
// keyId: 'f_userid',
// callback: function (_data) {
// callback(_data['f_realname']);
// }
// });
// }
//},
//{
// label: '审核时间', name: 'CheckTime', width: 200, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '审核用户', name: 'CheckUserId', width: 200, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
// key: value,
// keyId: 'f_userid',
// callback: function (_data) {
// callback(_data['f_realname']);
// }
// });
// }
//},
{
label: '审核状态', name: 'F_EnabledMark', width: 200, align: "left",
formatter: function (cellvalue) {
return cellvalue == "1" ? "<span class=\"label label-success\">已生效</span>" : "<span class=\"label label-danger\">未生效</span>";
}
},
{
label: '异动类型', name: 'AnomalousType', width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'StuChangeType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{ label: '异动原因', name: 'ChangeReason', width: 300, align: "left" },
//{
// label: '是否保留学籍', name: 'StuStatus', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: '是否注销账号', name: 'F_WriteMark', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: '是否恢复学籍', name: 'RecoverStuStatus', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: '是否恢复账号', name: 'RecoverWriteMark', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: '修学年限', name: 'SuspensionPeriod', width: 200, align: "left" },
//{
// label: '休学开始时间', name: 'SuspensionBeginTime', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '休学结束时间', name: 'SuspensionEndTime', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{ label: '转学前学校', name: 'TransferSchool', width: 150, align: "left" },
//{ label: '转学前学号', name: 'TransferStuNo', width: 100, align: "left" },
//{
// label: '出身日期', name: 'Birthday', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{ label: '民族', name: 'NationalityNo', width: 80, align: "left" },
//{ label: '省', name: 'Province', width: 100, align: "left" },
//{ label: '市', name: 'City', width: 100, align: "left" },
//{ label: '县/区', name: 'County', width: 100, align: "left" },
//{ label: '联系电话', name: 'Mobile', width: 100, align: "left" },
//{ label: '家庭地址', name: 'MailAddress', width: 200, align: "left" },
//{ label: '转出学校', name: 'OutSchool', width: 100, align: "left" },
//{ label: '备注', name: 'Remark', width: 500, align: "left" },
],
mainId: 'ID',
isPage: true,
rows: 100,
});
page.search();
},
search: function (param) {
param = param || {};
param.SqlParameter = ' and F_EnabledMark = 1 ';
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
page.init();
}

+ 5
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.cshtml Ver ficheiro

@@ -18,6 +18,7 @@
</script>
<div class="lr-form-tabs" id="lr_form_tabs">
<ul class="nav nav-tabs">
<li><a data-value="tab">异动情况</a></li>
<li><a data-value="tab1">基本资料</a></li>
<li><a data-value="tab2">成绩查看</a></li>
<li><a data-value="tab3">奖助学金查看</a></li>
@@ -27,9 +28,12 @@
</ul>
</div>
<div class="tab-content lr-tab-content" id="lr_tab_content">
<div class="lr-form-wrap tab-pane" id="tab">
<iframe id="FormView" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
</div>
<div class="lr-form-wrap tab-pane" id="tab1" style="height:100%;overflow:auto">
<div id="student" class="user_warpper student_warpper">
<div class="index_sec index_sec1">
@*<div class="userTitle">基本信息</div>*@
<!-- / user_sec1 -->


+ 3
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/QueryBasicInfo.js Ver ficheiro

@@ -16,6 +16,7 @@ var bootstrap = function ($, learun) {
},
bind: function () {
//选项卡
$("#FormView").attr("src", "/EducationalAdministration/StuTransferInfo/FormView?keyValue=" + keyValue);
$("#QueryScoreIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryScoreIndex?keyValue=" + keyValue + '&StuNo=' + StuNo);
$("#QueryScholarshipIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryScholarshipIndex?keyValue=" + keyValue + '&StuNo=' + StuNo);
$("#QueryAPStuHealthIndex").attr("src", "/EducationalAdministration/StuTransferInfo/QueryAPStuHealthIndex?keyValue=" + keyValue + '&StuNo=' + StuNo);
@@ -27,13 +28,13 @@ var bootstrap = function ($, learun) {
},
initData: function () {
if (!!keyValue) {
}
}
};
// 保存数据
acceptClick = function (callBack) {
};
page.init();
}

+ 0
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj Ver ficheiro

@@ -1379,7 +1379,6 @@
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryBasicInfo.js" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.js" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IndexQuery.js" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.js" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IntoIndex.js" />
@@ -8084,7 +8083,6 @@
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\FormView.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IndexQuery.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryBasicInfo.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryMSRMilitaryIndex.cshtml" />


Escrever Pré-visualizar
Carregando…
Cancelar
Guardar