From 8c87926ccf9e19970db8903e92b3b02ab768fbaf Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 29 Aug 2022 14:08:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?= =?UTF-8?q?=E7=B1=8D=E5=BC=82=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasicChange/Form.js | 26 ++++++++++++++++--- .../Views/StuInfoBasicChange/Index.js | 2 +- .../Views/StuInfoBasic_ChangeLog/Index.js | 2 +- .../StuInfoBasic/StuInfoBasicService.cs | 4 +-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js index 114114e35..6dfe0411e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js @@ -40,7 +40,13 @@ var bootstrap = function ($, learun) { if (item.id === "01" || item.id === "07") { //留级、转班 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); - $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + var timer1 = setInterval(function () { + if ($("#NewDeptNo").lrselectGet()) { + $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet()); + clearInterval(timer1); + } + }, 1000); } else if (item.id === "02") {//转校 $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); @@ -55,8 +61,19 @@ var bootstrap = function ($, learun) { $(".NewSchool").show(); } else if (item.id === "03") { //复学 $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); - $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); - $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet()); + var timer2 = setInterval(function () { + if ($("#NewDeptNo").lrselectGet()) { + $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet()); + clearInterval(timer2); + } + }, 1000); + var timer3 = setInterval(function () { + if ($("#NewMajorNo").lrselectGet()) { + $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet()); + clearInterval(timer3); + } + }, 1000); } else if (item.id === "04") { //转入/进 learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); $("#StuNo").val(""); @@ -86,6 +103,7 @@ var bootstrap = function ($, learun) { $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#NewDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) { + //console.log("选择的系部为：" + JSON.stringify(item)); if (item != null && item != undefined) { $('#NewMajorNo').lrselectRefresh({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', @@ -101,6 +119,7 @@ var bootstrap = function ($, learun) { }); $('#NewMajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) { + //console.log("选择的专业为：" + JSON.stringify(item)); if (item != null && item != undefined) { $('#NewClassNo').lrselectRefresh({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', @@ -221,6 +240,7 @@ var bootstrap = function ($, learun) { }; // 保存数据 acceptClick = function (callBack) { + //console.log($('body').lrGetFormData()); if (!$('body').lrValidform()) { return false; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js index bca4b9019..76ceab8f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js @@ -218,11 +218,11 @@ var bootstrap = function ($, learun) { }); } }, + { label: "转出学校", name: "OutSchool", width: 200, align: "left" }, { label: "创建时间", name: "CreateTime", width: 130, align: "left" }, { label: "创建用户", name: "CreateUserId", width: 100, align: "left" }, { label: "审核时间", name: "CheckTime", width: 130, align: "left" }, { label: "审核用户", name: "CheckUserId", width: 100, align: "left" }, - { label: "转出学校", name: "OutSchool", width: 200, align: "left" }, { label: "备注", name: "StuChangeRemark", width: 200, align: "left" }, { label: "审核状态", name: "CheckStatus", width: 100, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js index a3cffab8a..68171d647 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js @@ -106,7 +106,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList', headData: [ { - label: "异动类型", name: "StuChangeType", width: 100, align: "left", + label: "异动类型", name: "StuChangeType", width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, 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 63c57af88..be484e3aa 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 @@ -1073,9 +1073,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { entity.Modify(keyValue); - var oldEntity = db.FindEntity(keyValue); + var oldEntity = this.BaseRepository("CollegeMIS").FindEntity(keyValue); List list = new List(); - var tableInfos = db.FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] + var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] as varchar(100)) AS [字段说明] FROM sys.tables AS t INNER JOIN sys.columns