From 6ec6fc7f456233fd8b8a59e547bed26427ae3e71 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 8 Mar 2022 16:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=83=A9=E7=BD=9A=E5=92=8C=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E6=8B=89=E6=A1=86=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AwardAndPunishment/Index.js | 2 +- .../AwardAndPunishment/IndexPunishment.cshtml | 4 ++-- .../AwardAndPunishment/IndexPunishment.js | 2 +- .../Views/AwardPunishInfo/AwardIndex.cshtml | 4 ++-- .../Views/AwardPunishInfo/AwardIndex.js | 18 +++++++++++++++--- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js index 79ded0fee..800100f84 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#AwardType').lrDataItemSelect({ code: 'AwardType' }); + $('#AwardType').lrDataItemSelect({ code: 'EncouragementDegree' }); $('#NatureType').lrselect({ data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }], text: "text", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml index 20b47b916..b9b3e2929 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.cshtml @@ -14,10 +14,10 @@
惩罚名称
-
+ @*
惩罚级别
-
+
*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js index 29e51a7ec..38b1b45dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardAndPunishment/IndexPunishment.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#AwardType').lrDataItemSelect({ code: 'AwardType' }); + //$('#AwardType').lrDataItemSelect({ code: 'EncouragementDegree' }); $('#NatureType').lrselect({ data: [{ text: "集体", value: "0" }, { text: "个人", value: "1" }], text: "text", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.cshtml index 37ecb59a1..1ab607db8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.cshtml @@ -14,10 +14,10 @@
奖励类型
-
+ @*
奖励对象
-
+
*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.js index e8d801245..e7f17efc3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/AwardPunishInfo/AwardIndex.js @@ -40,7 +40,7 @@ var bootstrap = function ($, learun) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'AwardType', + code: 'EncouragementDegree', callback: function(_data) { callback(_data.text); } @@ -54,7 +54,7 @@ var bootstrap = function ($, learun) { $("#awardtype").val(item.awardtype); } }); - $('#RewardObjects').lrGirdSelect({ + $('#StuName').lrGirdSelect({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic', selectWord: 'stuno', value: 'stuno', @@ -63,7 +63,19 @@ var bootstrap = function ($, learun) { [ { label: "学号", name: "stuno", width: 100, align: "left" }, { label: "姓名", name: "stuname", width: 100, align: "left" }, - { label: "班级", name: "classno", width: 100, align: "left" }, + { + 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']); + } + }); + } + }, ], select: function (item) { $("#StuId").val(item.stuno);