From c59c69d620b092eea7fc678bdac4c6b902ab40bc Mon Sep 17 00:00:00 2001 From: liangkun Date: Wed, 22 Jun 2022 18:20:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=BD=95=E5=85=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E5=AD=98=E5=82=A8=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/InputScoreIndex.js | 27 ++++++++++--------- .../StuScore/InputScoreIndexInTeacher.js | 27 ++++++++++--------- .../StuScore/InputScoreIndexOfElective.js | 27 ++++++++++--------- .../InputScoreIndexOfElectiveInTeacher.js | 27 ++++++++++--------- .../Views/StuScore/Monitor.js | 27 ++++++++++--------- .../Views/StuScoreNotPass/IndexBKUnpass.js | 2 +- .../Views/StuScoreNotPass/IndexUnpass.js | 2 +- .../Views/StuScoreNotPass/InputScoreIndex.js | 27 ++++++++++--------- .../InputScoreIndexInTeacher.js | 27 ++++++++++--------- .../Views/StuScoreNotPass/Monitor.js | 27 ++++++++++--------- .../StuScoreNotPassTwo/InputScoreIndex.js | 27 ++++++++++--------- .../InputScoreIndexInTeacher.js | 27 ++++++++++--------- .../Views/StuScoreNotPassTwo/Monitor.js | 27 ++++++++++--------- .../StuScore/StuScoreService.cs | 4 +-- 14 files changed, 158 insertions(+), 147 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js index 3ccd1b4bc..f03c2524b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js @@ -89,19 +89,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 40, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 40, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" } + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, ]; headDataEdit = [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js index c450a42ae..4d7f1ec44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js @@ -90,19 +90,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 40, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 40, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" } + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, ]; headDataEdit = [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js index e8edfed56..9048ad4b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js @@ -76,19 +76,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 100, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, { label: '学期', name: 'Semester', width: 80, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" }, + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, { label: '教室名称', name: 'ClassRoomNo', width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js index f38c4a386..b08598af7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js @@ -76,19 +76,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 100, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, { label: '学期', name: 'Semester', width: 80, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" }, + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, { label: '教室名称', name: 'ClassRoomNo', width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/Monitor.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/Monitor.js index 8a9445f20..171a0fb64 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/Monitor.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/Monitor.js @@ -81,19 +81,20 @@ var bootstrap = function ($, learun) { { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, { label: '学期', name: 'Semester', width: 80, align: "left" }, { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" }, + //{ + // label: '课程名称', name: 'LessonNo', width: 200, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, { label: "班级", name: "TeachClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js index 2fd7a5701..cb4f96e6a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js @@ -2,7 +2,7 @@ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 * 日 期：2021-12-16 10:14 - * 描 述：长阳迎新 + * 描 述：补考成绩名单 */ var refreshGirdData; var bootstrap = function ($, learun) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js index 13e2410ef..fe1cc34db 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js @@ -2,7 +2,7 @@ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 * 日 期：2021-12-16 10:14 - * 描 述：长阳迎新 + * 描 述：补考名单查看 */ var refreshGirdData; var bootstrap = function ($, learun) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js index 4bd90f944..ac52af15d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js @@ -89,19 +89,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 40, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 40, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" } + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, ]; headDataEdit = [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js index cbf3ad08f..e4a8d3416 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js @@ -89,19 +89,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 40, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 40, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" } + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, ]; headDataEdit = [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/Monitor.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/Monitor.js index b17ea53b7..8105ed3f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/Monitor.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/Monitor.js @@ -81,19 +81,20 @@ var bootstrap = function ($, learun) { { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, { label: '学期', name: 'Semester', width: 80, align: "left" }, { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" }, + //{ + // label: '课程名称', name: 'LessonNo', width: 200, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, { label: "班级", name: "TeachClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js index 157c776ee..b9a8afefb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js @@ -89,19 +89,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 40, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 40, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" } + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, ]; headDataEdit = [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js index 157c776ee..b9a8afefb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js @@ -89,19 +89,20 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 40, align: "left" }, { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" }, { label: '学期', name: 'Semester', width: 40, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 150, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" } + //{ + // label: '课程名称', name: 'LessonNo', width: 150, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, ]; headDataEdit = [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/Monitor.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/Monitor.js index 9661c7bb0..811f5c725 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/Monitor.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/Monitor.js @@ -81,19 +81,20 @@ var bootstrap = function ($, learun) { { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" }, { label: '学期', name: 'Semester', width: 80, align: "left" }, { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, - { - label: '课程名称', name: 'LessonNo', width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', - key: value, - keyId: 'lessonno', - callback: function (_data) { - callback(_data['lessonname']); - } - }); - } - }, + { label: '课程名称', name: 'LessonName', width: 150, align: "left" }, + //{ + // label: '课程名称', name: 'LessonNo', width: 200, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo', + // key: value, + // keyId: 'lessonno', + // callback: function (_data) { + // callback(_data['lessonname']); + // } + // }); + // } + //}, { label: "班级", name: "TeachClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index a04b3c9de..7160903a0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs @@ -91,7 +91,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration // 虚拟参数 var dp = new DynamicParameters(new { }); var strSql = new StringBuilder(); - strSql.Append("select AcademicYearNo,Semester,lessonno,TeachClassNo,EmpNo,IsEditable,EditUserId,BeginModifyDate,ModifyDate from StuScore where 1=1 "); + strSql.Append("select AcademicYearNo,Semester,lessonno,LessonName,TeachClassNo,EmpNo,IsEditable,EditUserId,BeginModifyDate,ModifyDate from StuScore where 1=1 "); if (!queryParam["AcademicYearNo"].IsEmpty()) { strSql.Append(" and AcademicYearNo = @AcademicYearNo "); @@ -102,7 +102,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(" and Semester =@Semester "); dp.Add("Semester", "" + queryParam["Semester"].ToString() + "", DbType.String); } - strSql.Append(" group by AcademicYearNo,Semester,lessonno, TeachClassNo, EmpNo, IsEditable, EditUserId, BeginModifyDate, ModifyDate order by IsEditable, BeginModifyDate, edituserid "); + strSql.Append(" group by AcademicYearNo,Semester,lessonno,LessonName, TeachClassNo, EmpNo, IsEditable, EditUserId, BeginModifyDate, ModifyDate order by IsEditable, BeginModifyDate, edituserid "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); } catch (Exception ex)