From 699411148418691149c30d22a4c30f4130e277af Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 17 Jul 2023 10:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=AD=A6=E6=AF=94=E8=B5=9B=20?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/TeachingCompetition/Form.cshtml | 38 ++++++++++--------- .../Views/TeachingCompetition/Form.js | 1 + .../Views/TeachingCompetition/Index.js | 26 +++++++++---- .../TeachingCompetitionEntity.cs | 2 + 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.cshtml index 83a4f4536..989b10c7d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.cshtml @@ -3,41 +3,45 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
部门*
-
+
-
+
获奖教师*
-
+
-
+
获奖内容*
- +
-
+
时间*
- +
-
+
发奖单位*
-
+
级别*
-
+
-
+
类别*
-
+
-
+
+
类型*
+
+
+
奖励金额
- +
-
+
备注
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingCompetition/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.js index 13d816f75..b84198e94 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Form.js @@ -19,6 +19,7 @@ var bootstrap = function ($, learun) { $('#TeachNo').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' }); $('#Grade').lrDataItemSelect({ code: 'Level' }); $('#Classes').lrDataItemSelect({ code: 'Classes' }); + $('#TType').lrDataItemSelect({ code: 'TType' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js index 1f752a79c..d15ece5c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingCompetition/Index.js @@ -150,17 +150,14 @@ var bootstrap = function ($, learun) { }); } }, - { label: "奖励金额", name: "Money", width: 100, align: "left" }, - { label: "备注", name: "Remark", width: 100, align: "left" }, { - label: "评价教师", name: "EvaluateTeacher", width: 100, align: "left", + label: "类型", name: "TType", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'f_userid', + code: 'TType', callback: function (_data) { - callback(_data['f_realname']); + callback(_data.text); } }); } @@ -177,6 +174,21 @@ var bootstrap = function ($, learun) { }); } }, + { label: "奖励金额", name: "Money", width: 100, align: "left" }, + { label: "备注", name: "Remark", width: 100, align: "left" }, + { + label: "评价教师", name: "EvaluateTeacher", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, { label: "评价时间", name: "EvaluateTime", width: 100, align: "left" , formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionEntity.cs index 39cacc3b0..1e1b63518 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingCompetition/TeachingCompetitionEntity.cs @@ -93,6 +93,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("EVALUATEREMARK")] public string EvaluateRemark { get; set; } + [Column("TType")] + public string TType { get; set; } #endregion #region 扩展操作