diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml index ecb228a6b..dcef7ba10 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml @@ -35,7 +35,6 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js index d5ed8b849..5a4ee2e20 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js @@ -106,18 +106,32 @@ var bootstrap = function ($, learun) { { label: "分组名称", name: "GroupName", width: 100, align: "left"}, { label: "当前积分", name: "Integral", width: 100, align: "left"}, { - label: "证书", name: "Path", width: 100, align: "left", + label: "证书", name: "Path", width:400, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', - { - url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, - sync: true, - callback: function (_data) { - if (_data.F_FileName) { - callback('' + _data['F_FileName'] + ''); - } - } + $.ajax({ + url: top.$.rootUrl + '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + type: "GET", + dataType: "json", + async: true, + success: function (result) { + var html = ""; + result.data.forEach((_data) => { + html+=('' + _data['F_FileName'] + '、'); }); + callback(html.slice(0, -1)); + } + }); + //learun.clientdata.getAsync('custmerData', + // { + // url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + // sync: true, + // callback: function (_data) { + // console.log(_data) + // if (_data.F_FileName) { + // callback('' + _data['F_FileName'] + ''); + // } + // } + // }); } // learun.clientdata.getAsync('custmerData', // { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml index f32d640a4..fb1d01933 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml @@ -34,7 +34,6 @@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml index 6a453a0b2..4499a7f5e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml @@ -38,7 +38,6 @@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js index 3eead4a77..5afa7d346 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js @@ -56,7 +56,7 @@ var bootstrap = function ($, learun) { title: '新增', url: top.$.rootUrl + '/EducationalAdministration/CompetitionManager/Form', width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -71,7 +71,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/CompetitionManager/Form?keyValue=' + keyValue, width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js index 7292901d4..ed6f04a25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js @@ -56,7 +56,7 @@ var bootstrap = function ($, learun) { title: '新增', url: top.$.rootUrl + '/EducationalAdministration/MajorAchievement/Form', width: 600, - height: 400, + height:500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -71,7 +71,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/MajorAchievement/Form?keyValue=' + keyValue, width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js index 435384e59..0813eed68 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js @@ -27,7 +27,7 @@ var bootstrap = function ($, learun) { title: '新增', url: top.$.rootUrl + '/EducationalAdministration/VariousIsm/Form', width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -42,7 +42,7 @@ var bootstrap = function ($, learun) { title: '编辑', url: top.$.rootUrl + '/EducationalAdministration/VariousIsm/Form?keyValue=' + keyValue, width: 600, - height: 400, + height: 500, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml index a7dbb1367..6865b4edd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml @@ -13,12 +13,12 @@