From e31e77ae9f6895dd38a6be4fc13826d8e3c48626 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 19 Aug 2022 09:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8F=AD=E7=BA=A7=E5=AD=A6?= =?UTF-8?q?=E7=B1=8D=E7=AE=A1=E7=90=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/MyClass.js | 22 ++++++++++++++----- .../Views/StuPunishment/Index.js | 11 +++++++++- .../StuInfoBasic/StuInfoBasicService.cs | 9 ++++++-- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js index b512795e8..22d037ba3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js @@ -35,8 +35,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', headData: [ - { label: "学号", name: "StuNo", width: 100, align: "left" }, - { label: "学籍号", name: "StuCode", width: 100, align: "left" }, + { label: "学号", name: "StuNo", width: 200, align: "left" }, + { label: "学籍号", name: "StuCode", width: 200, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { label: "性别", name: "GenderNo", width: 80, align: "left", @@ -120,8 +120,18 @@ var bootstrap = function ($, learun) { }); } }, - { label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, - { label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, + { + label: "报到日期", name: "RegisterDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, + { + label: "入学年月", name: "EntranceDate", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } + }, { label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", formatter: function (cellvalue) { @@ -137,7 +147,7 @@ var bootstrap = function ($, learun) { ], mainId: 'StuId', isPage: true, - isMultiselect: true, + //isMultiselect: true, //onSelectRow: function (rowdata) { // if (rowdata.CheckMark == "1") { // $("#check").hide(); @@ -153,7 +163,7 @@ var bootstrap = function ($, learun) { //} }); - //page.search(); + page.search(); }, search: function (param) { param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js index 95c8da332..beac0586f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js @@ -104,7 +104,16 @@ var bootstrap = function ($, learun) { { label: "学号", name: "StuNo", width: 200, align: "left" }, { label: "姓名", name: "StuName", width: 200, align: "left" }, { - label: "处分名称", name: "PunishName", width: 200, align: "left" + label: "处分名称", name: "PunishNo", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'Punishment', + callback: function (_data) { + callback(_data.text); + } + }); + } }, { label: "处分原因", name: "PunishReason", width: 300, align: "left" }, { label: "处分日期", name: "PunishDate", width: 200, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index aecc480d0..2613e4335 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -345,7 +345,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var ClassDiredctorNo = LoginUserInfo.Get().account; - return this.BaseRepository("CollegeMIS").FindTable($" SELECT * FROM dbo.ClassInfo where ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'"); + string sql = " SELECT * FROM dbo.ClassInfo where CheckMark=1 "; + if (ClassDiredctorNo.ToUpper() != "SYSTEM") + { + sql += $" and ClassDiredctorNo='{ClassDiredctorNo}' or ClassTutorNo='{ClassDiredctorNo}'"; + } + return this.BaseRepository("CollegeMIS").FindTable(sql); } catch (Exception ex) { @@ -512,7 +517,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void GetCard(string keyValue,string status) + public void GetCard(string keyValue, string status) { var db = this.BaseRepository("CollegeMIS").BeginTrans(); try