diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/ClassReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/ClassReport.js index 2f7422694..ca9212a94 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/ClassReport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterBuilding/ClassReport.js @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, 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 ba0e0e35d..f931b1003 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 @@ -63,7 +63,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/ClassReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/ClassReport.js index 414a60abc..4ca2c0328 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/ClassReport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/ClassReport.js @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/Index.js index 2d58bf7cb..b88a9213d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/R_EnterSchool/Index.js @@ -63,7 +63,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js index c261905c8..afd093ebf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/CreateGraduateNo.js @@ -28,7 +28,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js index 413dbe927..87b834a7d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js @@ -28,7 +28,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.js index af33594a3..dd8a63d39 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/GraduateScoreQueryAllIndex.js @@ -78,7 +78,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js index b733415fb..fcded83b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js @@ -87,7 +87,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js index d9aed5d45..de04cb568 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/Index.js @@ -64,7 +64,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js index b29544089..88893e075 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Thermography/IndexResult.js @@ -64,7 +64,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Form.js index fb7318a9d..ccda33c14 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Form.js @@ -16,7 +16,6 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#PStuNo').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuno',text: 'stuname' }); - $('#PDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); $('#PMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' }); $('#PClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' }); $('#PEmpNo').lrDataSourceSelect({ code: 'Psychology',value: 'f_account',text: 'f_realname' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.cshtml index d20bcfd57..5c44e886e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.cshtml @@ -13,10 +13,6 @@
-
-
系
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.js index eed6de449..70d1fdd44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APAppointmentPsychologist/Index.js @@ -45,25 +45,12 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 250, 400); - $('#PDeptNo').lrDataSourceSelect({ - code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { - var deptno = ""; - if (val) { - deptno = val.deptno; - } - $('#PMajorNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, - text: "MajorName", - value: "MajorNo" - }) - } - }); $('#PMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#PClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, @@ -168,19 +155,6 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "系", name: "PDeptNo", 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: "PMajorNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml index 6a9bc7f27..4e05e0026 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml @@ -3,10 +3,6 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
-
系
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.js index 51519e682..507c343f9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.js @@ -15,25 +15,12 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#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) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.cshtml index 74f14b8f5..293cc651e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.cshtml @@ -10,10 +10,6 @@
-
-
系
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.js index 218ed3105..0f996dcb8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Index.js @@ -16,25 +16,12 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 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) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, @@ -63,7 +50,7 @@ var bootstrap = function ($, learun) { }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/LogisticsManagement/APStuHealthRecords/Form', @@ -94,9 +81,9 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/APStuHealthRecords/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/APStuHealthRecords/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -109,61 +96,56 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/LogisticsManagement/APStuHealthRecords/GetPageList', headData: [ - { 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: "MajorNo", 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: "ClassNo", 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: "Stuno", 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: "MajorNo", 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: "ClassNo", 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: "Stuno", 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: "Remark", width: 100, align: "left"}, + { label: "描述", name: "Remark", width: 100, align: "left" }, ], - mainId:'ID', + mainId: 'ID', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#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/LogisticsManagement/Views/Accommodation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js index c2917124b..107d6bf53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js @@ -236,19 +236,6 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "系", name: "Dept", 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: "Major", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Form.js index 8b594dd42..4d88327d9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Form.js @@ -33,7 +33,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Index.js index f37d8cd6e..880f47c6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ListenClassRecord/Index.js @@ -63,7 +63,7 @@ var bootstrap = function ($, learun) { function (val) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.js index fab07c899..4528eda06 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Form.js @@ -15,61 +15,14 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#YearNo').lrselect({ - placeholder: "请选择学年", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', - value: 'value', - text: 'text' - }); - $('#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) { - var majorNo = ''; - if (val) { - majorNo = val.MajorNo; - } - $('#ClassNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, - text: "ClassName", - value: "ClassNo" - }) - } - }); - $('#ClassNo').lrDataSourceSelect({ - code: 'bjsj', value: 'classno', text: 'classname', select: function (val) { - var classNo = ''; - if (val) { - classNo = val.ClassNo; - } - $('#StuNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfoByClassNo?classNo=' + classNo, - text: "StuName", - value: "StuNo" - }) - } - }); - $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); + }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/MSRIntentionManagement/GetFormData?keyValue=' + keyValue, function (data) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); + $('#' + id).jfGridSet('refreshdata', data[id]); } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.cshtml index c2153b472..e0d55abdc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.cshtml @@ -10,10 +10,6 @@
-
-
系
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.js index 30a0bba7c..929af036b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRIntentionManagement/Index.js @@ -16,32 +16,19 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#YearNo').lrselect({ + $('#YearNo').lrselect({ placeholder: "请选择学年", allowSearch: true, url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', value: 'value', text: 'text' }); - $('#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) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, @@ -63,14 +50,14 @@ var bootstrap = function ($, learun) { }) } }); - $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); + $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/LogisticsManagement/MSRIntentionManagement/Form', @@ -101,9 +88,9 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/MSRIntentionManagement/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/MSRIntentionManagement/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -116,64 +103,59 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/LogisticsManagement/MSRIntentionManagement/GetPageList', headData: [ - { 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: 'deptname', - callback: function (_data) { - callback(_data['deptname']); - } - }); - }}, - { label: "专业", name: "MajorNo", 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: "ClassNo", 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: "StuNo", 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: "Mobile", width: 100, align: "left"}, - { label: "年龄", name: "Age", width: 100, align: "left"}, - { label: "身高", name: "High", width: 100, align: "left"}, - { label: "体重", name: "Weight", width: 100, align: "left"}, - { label: "视力", name: "Vision", width: 100, align: "left"}, + { + label: "专业", name: "MajorNo", 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: "ClassNo", 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: "StuNo", 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: "Mobile", width: 100, align: "left" }, + { label: "年龄", name: "Age", width: 100, align: "left" }, + { label: "身高", name: "High", width: 100, align: "left" }, + { label: "体重", name: "Weight", width: 100, align: "left" }, + { label: "视力", name: "Vision", width: 100, align: "left" }, ], - mainId:'ID', + mainId: 'ID', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#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/LogisticsManagement/Views/MSRMilitaryRecord/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.js index 44437c6ed..44c9fccb9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Form.js @@ -15,61 +15,13 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#YearNo').lrselect({ - placeholder: "请选择学年", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo', - value: 'value', - text: 'text' - }); - $('#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) { - var majorNo = ''; - if (val) { - majorNo = val.MajorNo; - } - $('#ClassNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, - text: "ClassName", - value: "ClassNo" - }) - } - }); - $('#ClassNo').lrDataSourceSelect({ - code: 'bjsj', value: 'classno', text: 'classname', select: function (val) { - var classNo = ''; - if (val) { - classNo = val.ClassNo; - } - $('#StuNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetStuInfoByClassNo?classNo=' + classNo, - text: "StuName", - value: "StuNo" - }) - } - }); - $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/MSRMilitaryRecord/GetFormData?keyValue=' + keyValue, function (data) { for (var id in data) { if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); + $('#' + id).jfGridSet('refreshdata', data[id]); } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.cshtml index 28bcaa398..4fdcadc6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.cshtml @@ -10,10 +10,6 @@
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.js index 7d7e404ec..030f70619 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryRecord/Index.js @@ -23,25 +23,12 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#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) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, @@ -63,14 +50,14 @@ var bootstrap = function ($, learun) { }) } }); - $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); + $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/LogisticsManagement/MSRMilitaryRecord/Form', @@ -101,9 +88,9 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/MSRMilitaryRecord/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/MSRMilitaryRecord/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -116,61 +103,56 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/LogisticsManagement/MSRMilitaryRecord/GetPageList', headData: [ - { 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: "MajorNo", 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: "ClassNo", 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: "StuNo", 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: "Record", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, + { + label: "专业", name: "MajorNo", 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: "ClassNo", 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: "StuNo", 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: "Record", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, ], - mainId:'ID', + mainId: 'ID', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#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/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.cshtml index ae24e8741..c6113faf1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.cshtml @@ -14,10 +14,6 @@
学年
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.js index 7232ab63f..07101a604 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/MSRMilitaryServiceRegistration/Index.js @@ -23,25 +23,12 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#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) { var majorNo = ''; if (val) { - majorNo = val.MajorNo; + majorNo = val.majorno; } $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GetClassByMajorNo?majorNo=' + majorNo, @@ -70,7 +57,7 @@ var bootstrap = function ($, learun) { }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/LogisticsManagement/MSRMilitaryServiceRegistration/Form', @@ -101,9 +88,9 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { - learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/MSRMilitaryServiceRegistration/DeleteForm', { keyValue: keyValue}, function () { + learun.deleteForm(top.$.rootUrl + '/LogisticsManagement/MSRMilitaryServiceRegistration/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); }); } @@ -116,42 +103,36 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/LogisticsManagement/MSRMilitaryServiceRegistration/GetPageList', headData: [ - { label: "学年", name: "YearNo", width: 100, align: "left"}, - { 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: "MajorNo", 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: "ClassNo", 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: "StuNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op,$cell) { + { label: "学年", name: "YearNo", width: 100, align: "left" }, + { + label: "专业", name: "MajorNo", 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: "ClassNo", 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: "StuNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic', key: value, @@ -160,18 +141,19 @@ var bootstrap = function ($, learun) { callback(_data['stuname']); } }); - }}, - { label: "截图上传", name: "Screenshot", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, + } + }, + { label: "截图上传", name: "Screenshot", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, ], - mainId:'ID', + mainId: 'ID', isPage: true }); page.search(); }, search: function (param) { param = param || {}; - $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; refreshGirdData = function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistEntity.cs index 086edd504..090029dd4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistEntity.cs @@ -25,11 +25,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("PSTUNO")] public string PStuNo { get; set; } /// - /// 系 - /// - [Column("PDEPTNO")] - public string PDeptNo { get; set; } - /// /// 专业 /// [Column("PMAJORNO")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistService.cs index 11dda8e4a..313fc2def 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APAppointmentPsychologist/APAppointmentPsychologistService.cs @@ -34,7 +34,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement strSql.Append(@" t.PID, t.PStuNo, - t.PDeptNo, t.PMajorNo, t.PClassNo, t.PTime, @@ -53,11 +52,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); strSql.Append(" AND ( t.PTime >= @startTime AND t.PTime <= @endTime ) "); } - if (!queryParam["PDeptNo"].IsEmpty()) - { - dp.Add("PDeptNo", queryParam["PDeptNo"].ToString(), DbType.String); - strSql.Append(" AND t.PDeptNo = @PDeptNo "); - } if (!queryParam["PMajorNo"].IsEmpty()) { dp.Add("PMajorNo", queryParam["PMajorNo"].ToString(), DbType.String); @@ -195,7 +189,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var userEntity = this.BaseRepository("CollegeMIS") .FindEntity(a => a.StuNo == loginUser.account); entity.PStuNo = userEntity?.StuNo; - entity.PDeptNo = userEntity?.DeptNo; entity.PMajorNo = userEntity?.MajorNo; entity.PClassNo = userEntity?.ClassNo; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsEntity.cs index 185d3ef69..2c0bee9b1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsEntity.cs @@ -20,11 +20,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("ID")] public string ID { get; set; } /// - /// 系 - /// - [Column("DEPTNO")] - public string DeptNo { get; set; } - /// /// 专业 /// [Column("MAJORNO")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsService.cs index 5474b6a4c..0dd2b6c89 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/APStuHealthRecords/APStuHealthRecordsService.cs @@ -32,7 +32,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement strSql.Append("SELECT "); strSql.Append(@" t.ID, - t.DeptNo, t.MajorNo, t.ClassNo, t.Stuno, @@ -43,11 +42,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - if (!queryParam["DeptNo"].IsEmpty()) - { - dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String); - strSql.Append(" AND t.DeptNo = @DeptNo "); - } if (!queryParam["MajorNo"].IsEmpty()) { dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs index 8dfc1bb3a..1a4299943 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/Acc_DormitoryBuildEntity.cs @@ -85,11 +85,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("CAMPUS")] public string Campus { get; set; } /// - /// 系 - /// - [Column("DEPT")] - public string Dept { get; set; } - /// /// 专业 /// [Column("MAJOR")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index 72d6b7479..da2eee02f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -37,7 +37,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.Name, t.Address, t.Campus, - t.Dept, t.BuildType, t.Major, t.Class, @@ -74,11 +73,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("Campus", "%" + queryParam["Campus"].ToString() + "%", DbType.String); strSql.Append(" AND t.Campus Like @Campus "); } - if (!queryParam["Dept"].IsEmpty()) - { - dp.Add("Dept", "%" + queryParam["Dept"].ToString() + "%", DbType.String); - strSql.Append(" AND t.Dept Like @Dept "); - } if (!queryParam["Class"].IsEmpty()) { dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String); @@ -849,7 +843,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement Campus = dormitory.Campus, CreateBy = currentUser.realName, CreateTime = DateTime.Now, - Dept = dormitory.Dept, Class = dormitory.Class, Functionary = dormitory.Functionary, Major = dormitory.Major, @@ -876,7 +869,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement Campus = dormitory.Campus, CreateBy = currentUser.realName, CreateTime = DateTime.Now, - Dept = dormitory.Dept, Class = dormitory.Class, Functionary = dormitory.Functionary, Major = dormitory.Major, @@ -903,7 +895,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement Campus = dormitory.Campus, CreateBy = currentUser.realName, CreateTime = DateTime.Now, - Dept = dormitory.Dept, Class = dormitory.Class, Functionary = dormitory.Functionary, Major = dormitory.Major, @@ -932,7 +923,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement Campus = dormitory.Campus, CreateBy = currentUser.realName, CreateTime = DateTime.Now, - Dept = dormitory.Dept, Class = dormitory.Class, Functionary = dormitory.Functionary, Major = dormitory.Major, @@ -1261,7 +1251,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement foreach (var childItem in childList) { childItem.Campus = entity.Campus; - childItem.Dept = entity.Dept; childItem.Major = entity.Major; childItem.Class = entity.Class; childItem.Sex = entity.Sex; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementEntity.cs index dfc499055..80e9b86e9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementEntity.cs @@ -20,11 +20,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("ID")] public string ID { get; set; } /// - /// 系 - /// - [Column("DEPTNO")] - public string DeptNo { get; set; } - /// /// 专业 /// [Column("MAJORNO")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementService.cs index 0a0963193..5fd43b29c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRIntentionManagement/MSRIntentionManagementService.cs @@ -33,7 +33,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement strSql.Append("SELECT "); strSql.Append(@" t.ID, - t.DeptNo, t.MajorNo, t.ClassNo, t.StuNo, @@ -48,11 +47,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - if (!queryParam["DeptNo"].IsEmpty()) - { - dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String); - strSql.Append(" AND t.DeptNo = @DeptNo "); - } if (!queryParam["MajorNo"].IsEmpty()) { dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String); @@ -157,7 +151,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var userEntity = this.BaseRepository("CollegeMIS") .FindEntity(a => a.StuNo == loginUser.account); entity.StuNo = userEntity?.StuNo; - entity.DeptNo = userEntity?.DeptNo; entity.MajorNo = userEntity?.MajorNo; entity.ClassNo = userEntity?.ClassNo; entity.Create(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordEntity.cs index 230ebb819..14b9c78b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordEntity.cs @@ -20,11 +20,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("ID")] public string ID { get; set; } /// - /// 系 - /// - [Column("DEPTNO")] - public string DeptNo { get; set; } - /// /// 专业 /// [Column("MAJORNO")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordService.cs index ee3b5d926..e9786d82e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryRecord/MSRMilitaryRecordService.cs @@ -33,7 +33,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement strSql.Append("SELECT "); strSql.Append(@" t.ID, - t.DeptNo, t.MajorNo, t.ClassNo, t.StuNo, @@ -45,11 +44,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - if (!queryParam["DeptNo"].IsEmpty()) - { - dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String); - strSql.Append(" AND t.DeptNo = @DeptNo "); - } if (!queryParam["MajorNo"].IsEmpty()) { dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String); @@ -153,7 +147,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement var userEntity = this.BaseRepository("CollegeMIS") .FindEntity(a => a.StuNo == loginUser.account); entity.StuNo = userEntity?.StuNo; - entity.DeptNo = userEntity?.DeptNo; entity.MajorNo = userEntity?.MajorNo; entity.ClassNo = userEntity?.ClassNo; entity.Create(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationEntity.cs index 6e75c702a..0aaf90a64 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationEntity.cs @@ -20,11 +20,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement [Column("ID")] public string ID { get; set; } /// - /// 系 - /// - [Column("DEPTNO")] - public string DeptNo { get; set; } - /// /// 专业 /// [Column("MAJORNO")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationService.cs index 8a81b3dcd..523725283 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/MSRMilitaryServiceRegistration/MSRMilitaryServiceRegistrationService.cs @@ -33,7 +33,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement strSql.Append("SELECT "); strSql.Append(@" t.ID, - t.DeptNo, t.MajorNo, t.ClassNo, t.StuNo, @@ -51,11 +50,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("YearNo", "%" + queryParam["YearNo"].ToString() + "%", DbType.String); strSql.Append(" AND t.YearNo Like @YearNo "); } - if (!queryParam["DeptNo"].IsEmpty()) - { - dp.Add("DeptNo",queryParam["DeptNo"].ToString(), DbType.String); - strSql.Append(" AND t.DeptNo = @DeptNo "); - } if (!queryParam["MajorNo"].IsEmpty()) { dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String); @@ -160,7 +154,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement .FindEntity(a => a.StuNo == loginUser.account); var aa = Common.GetSemesterAndYear(); entity.StuNo = userEntity?.StuNo; - entity.DeptNo = userEntity?.DeptNo; entity.MajorNo = userEntity?.MajorNo; entity.ClassNo = userEntity?.ClassNo; entity.YearNo = aa.AcademicYearShort;