专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/Index.js
index f931b1003..778515bfa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/Index.js
@@ -45,19 +45,6 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 280, 400);
- $('#DeptNo').lrDataSourceSelect({
- code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) {
- var deptno = "";
- if (val) {
- deptno = val.deptno;
- }
- $('#MajorNo').lrselectRefresh({
- url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno,
- text: "MajorName",
- value: "MajorNo"
- })
- }
- });
$('#MajorNo').lrDataSourceSelect({
code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select:
function (val) {
@@ -85,8 +72,8 @@ var bootstrap = function ($, learun) {
})
}
});
- $('#BId').lrDataSourceSelect({ code: 'ClassroomBuilding',value: 'classroombuildingid',text: 'classroombuildingname' });
- $('#SId').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuno',text: 'stuname' });
+ $('#BId').lrDataSourceSelect({ code: 'ClassroomBuilding', value: 'classroombuildingid', text: 'classroombuildingname' });
+ $('#SId').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
@@ -126,7 +113,7 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/DeleteForm', { keyValue: keyValue}, function () {
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/DeleteForm', { keyValue: keyValue }, function () {
refreshGirdData();
});
}
@@ -143,37 +130,28 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/R_EnterBuilding/GetPageList',
headData: [
- { label: "教学楼", name: "BId", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op,$cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassroomBuilding',
- key: value,
- keyId: 'classroombuildingid',
- callback: function (_data) {
- callback(_data['classroombuildingname']);
- }
- });
- }},
- { label: "学生名称", name: "SId", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op,$cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
- key: value,
- keyId: 'stuno',
- callback: function (_data) {
- callback(_data['stuname']);
- }
- });
- }},
{
- label: "系", name: "DeptNo", width: 100, align: "left",
+ label: "教学楼", name: "BId", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassroomBuilding',
+ key: value,
+ keyId: 'classroombuildingid',
+ callback: function (_data) {
+ callback(_data['classroombuildingname']);
+ }
+ });
+ }
+ },
+ {
+ label: "学生名称", name: "SId", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
key: value,
- keyId: 'deptno',
+ keyId: 'stuno',
callback: function (_data) {
- callback(_data['deptname']);
+ callback(_data['stuname']);
}
});
}
@@ -187,7 +165,7 @@ var bootstrap = function ($, learun) {
callback: function (_data) {
callback(_data['majorname']);
}
-
+
});
}
}, {
@@ -203,9 +181,9 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "扫描时间", name: "EnterTime", width: 100, align: "left"},
+ { label: "扫描时间", name: "EnterTime", width: 100, align: "left" },
],
- mainId:'ID',
+ mainId: 'ID',
sidx: 'EnterTime DESC',
isPage: true
});
@@ -214,7 +192,7 @@ var bootstrap = function ($, learun) {
param = param || {};
param.StartTime = startTime;
param.EndTime = endTime;
- $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/MajorReport.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/MajorReport.cshtml
index ed4309d57..dcd833e5e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/MajorReport.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/MajorReport.cshtml
@@ -13,10 +13,6 @@