diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js index 8db57fdb1..1b1988ec4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/Index.js @@ -76,7 +76,13 @@ var bootstrap = function ($, learun) { //下拉框绑定 $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); - $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + + //判断助学金类型:1国家助学金,2校级助学金 + if (types == "1") { + $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + } else { + $('#SubsidizeType').lrDataItemSelect({ code: 'SchoolStipend' }); + } // 刷新 $('#lr_refresh').on('click', function () { @@ -203,7 +209,7 @@ var bootstrap = function ($, learun) { , formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'StateStipend', + code: types == "1" ? 'StateStipend' : 'SchoolStipend', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfStudent.js index cf4db2ab9..8c9fa2741 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfStudent.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfStudent.js @@ -76,7 +76,13 @@ var bootstrap = function ($, learun) { //下拉框绑定 $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); - $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + + //判断助学金类型:1国家助学金,2校级助学金 + if (types == "1") { + $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + } else { + $('#SubsidizeType').lrDataItemSelect({ code: 'SchoolStipend' }); + } // 刷新 $('#lr_refresh').on('click', function () { @@ -133,7 +139,7 @@ var bootstrap = function ($, learun) { , formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'StateStipend', + code: types == "1" ? 'StateStipend' : 'SchoolStipend', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfThree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfThree.js index 29f08d0f6..fcde37371 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfThree.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfThree.js @@ -76,7 +76,13 @@ var bootstrap = function ($, learun) { //下拉框绑定 $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); - $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + + //判断助学金类型:1国家助学金,2校级助学金 + if (types == "1") { + $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + } else { + $('#SubsidizeType').lrDataItemSelect({ code: 'SchoolStipend' }); + } // 刷新 $('#lr_refresh').on('click', function () { @@ -187,7 +193,7 @@ var bootstrap = function ($, learun) { , formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'StateStipend', + code: types == "1" ? 'StateStipend' : 'SchoolStipend', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js index c9d5662dd..ebfb276c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuFellowship/IndexOfTwo.js @@ -76,7 +76,13 @@ var bootstrap = function ($, learun) { //下拉框绑定 $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); - $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + + //判断助学金类型:1国家助学金,2校级助学金 + if (types == "1") { + $('#SubsidizeType').lrDataItemSelect({ code: 'StateStipend' }); + } else { + $('#SubsidizeType').lrDataItemSelect({ code: 'SchoolStipend' }); + } // 刷新 $('#lr_refresh').on('click', function () { @@ -190,7 +196,7 @@ var bootstrap = function ($, learun) { , formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'StateStipend', + code: types == "1" ? 'StateStipend' : 'SchoolStipend', callback: function (_data) { callback(_data.text); }