From b5cb304b9cc48d63d5ecc40ceb96c7ddd7640ae3 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 11:51:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1-=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=EF=BC=9A=E8=B0=83=E5=BA=A6=E6=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrangeLessonTermController.cs | 16 ++++++ .../Views/ArrangeLessonTermAttemper/Form.js | 29 ++++------- .../ArrangeLessonTermAttemper/FormView.js | 37 +++++++------ .../ArrangeLessonTermService.cs | 52 +++++++++++++++++-- 4 files changed, 90 insertions(+), 44 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index 2b643cac9..cf57f41e4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs @@ -122,6 +122,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = arrangeLessonTermIBLL.GetEntity(keyValue); return Success(data); } + /// + /// 获取调度时间数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonDateList(string queryJson) + { + var data = arrangeLessonTermIBLL.GetList(queryJson).Where(x => x.LessonDate.HasValue).Select(x => x.LessonDate).Distinct().Select(x => new + { + text = x, + value = x + }).OrderBy(x => x.value); + + return Success(data); + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index 3bbd0b3b6..fa6eb33c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -46,16 +46,16 @@ var bootstrap = function ($, learun) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -180,20 +180,9 @@ var bootstrap = function ($, learun) { $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperStartTime').lrselect({ allowSearch: true }); //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); - + $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { if (!!keyValue) { @@ -336,7 +325,7 @@ var bootstrap = function ($, learun) { return false; } if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index fb37b83ac..aa1925fba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -46,16 +46,16 @@ var bootstrap = function ($, learun) { //调度开始时间 $('#AttemperStartTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); //调度结束时间 $('#AttemperEndTime').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify(p), - value: 'LessonDate', - text: 'LessonDate' + url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetLessonDateList?queryJson=' + JSON.stringify(p), + value: 'value', + text: 'text' }); } }, @@ -180,19 +180,9 @@ var bootstrap = function ($, learun) { $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); //调度开始时间 - $('#AttemperStartTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperStartTime').lrselect({ allowSearch: true }); //调度结束时间 - $('#AttemperEndTime').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetList?queryJson=' + JSON.stringify({}), - value: 'LessonDate', - text: 'LessonDate' - }); + $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { @@ -237,6 +227,10 @@ var bootstrap = function ($, learun) { } } page.query(); + if (!!data[id].length && data[id].length > 0) { + $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); + $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); + } } }); } @@ -314,6 +308,11 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } + page.query(); + if (!!data[id].length && data[id].length > 0) { + $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); + $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); + } } }); } @@ -336,7 +335,7 @@ var bootstrap = function ($, learun) { } } else if (formData.AttemperType == "01") { //调课：调度时间比较 if (formData.AttemperEndTime < formData.AttemperStartTime) { - learun.alert.warning("调度结束时间应该大于调度开始时间！"); + learun.alert.warning("调度结束时间不能小于调度开始时间！"); return false; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 6b07e142f..12e74d8e0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -74,15 +74,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { //参考写法 - //var queryParam = queryJson.ToJObject(); + var queryParam = queryJson.ToJObject(); // 虚拟参数 - //var dp = new DynamicParameters(new { }); - //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var dp = new DynamicParameters(new { }); + var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(fieldSql); - strSql.Append(" FROM ArrangeLessonTerm t "); - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); + strSql.Append(" FROM ArrangeLessonTerm t where 1=1 "); + + if (!queryParam["AcademicYearNo"].IsEmpty()) + { + dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String); + strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo "); + } + if (!queryParam["Semester"].IsEmpty()) + { + dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String); + strSql.Append(" AND t.Semester = @Semester "); + } + if (!queryParam["DeptNo"].IsEmpty()) + { + dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); + strSql.Append(" AND t.DeptNo = @DeptNo "); + } + if (!queryParam["MajorNo"].IsEmpty()) + { + dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String); + strSql.Append(" AND t.MajorNo = @MajorNo "); + } + if (!queryParam["LessonNo"].IsEmpty()) + { + dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String); + strSql.Append(" AND t.LessonNo = @LessonNo "); + } + if (!queryParam["TeachClassNo"].IsEmpty()) + { + dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String); + strSql.Append(" AND t.TeachClassNo like @TeachClassNo "); + } + if (!queryParam["EmpNo"].IsEmpty()) + { + dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String); + strSql.Append(" AND t.EmpNo = @EmpNo "); + } + if (!queryParam["ClassroomNo"].IsEmpty()) + { + dp.Add("ClassroomNo", queryParam["ClassroomNo"].ToString(), DbType.String); + strSql.Append(" AND t.ClassroomNo = @ClassroomNo "); + } + + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); } catch (Exception ex) { From bd2a62033edd23c26349c9af980b53ebc4553916 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 1 Apr 2022 14:53:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=8A=A1-=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E3=80=81=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E5=BA=A6=E6=97=B6=E9=97=B4=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ArrangeLessonTermAttemper/Form.js | 14 +++++-- .../ArrangeLessonTermAttemper/FormView.js | 25 +++++++------ .../Views/ArrangeLessonTermAttemper/Index.js | 37 +++++++++++++------ .../ArrangeLessonTermAttemperMethod.cs | 20 ++++++---- 4 files changed, 62 insertions(+), 34 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js index fa6eb33c9..46e63e24a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js @@ -223,7 +223,10 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } @@ -257,7 +260,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -299,9 +302,14 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -338,7 +346,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index aa1925fba..e33622b88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -41,6 +41,7 @@ var bootstrap = function ($, learun) { p.TeachClassNo = $('#TeachClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); p.ClassroomNo = $('#ClassroomNo').lrselectGet(); + //console.log(p); //if (!!p.F_SchoolId && !!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { if (!!p.AcademicYearNo && !!p.Semester && !!p.DeptNo && !!p.MajorNo && !!p.LessonNo && !!p.TeachClassNo && !!p.EmpNo && !!p.ClassroomNo) { //调度开始时间 @@ -226,11 +227,11 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); - if (!!data[id].length && data[id].length > 0) { - $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); - $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); - } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + },3000) + } }); } @@ -264,7 +265,7 @@ var bootstrap = function ($, learun) { } }; // 设置表单数据 - setFormData = function (processId) { + setFormData = function (processId, param, callback) { if (!!processId) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/GetFormDataByProcessId?processId=' + processId, function (data) { for (var id in data) { @@ -308,14 +309,14 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - page.query(); - if (!!data[id].length && data[id].length > 0) { - $('#AttemperStartTime').lrselectSet(data[id].AttemperStartTime); - $('#AttemperEndTime').lrselectSet(data[id].AttemperEndTime); - } + var timer = setTimeout(function () { + page.query(); + clearTimeout(timer); + }, 3000) } }); } + callback && callback(); } // 验证数据是否填写完整 validForm = function () { @@ -348,7 +349,7 @@ var bootstrap = function ($, learun) { $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { - callBack(res, formData, i); + callBack(res, i); } }); }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js index b390431e8..6b56aca3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js @@ -408,21 +408,36 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { - if (res.code == 200) { + //if (res.code == 200) { + // // 发起流程 + // learun.workflowapi.create({ + // isNew: true, + // schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + // processId: processId, + // processName: '课程异动申请',// 对应流程名称 + // processLevel: '1', + // description: '', + // formData: JSON.stringify(postData), + // callback: function (res, data) { + // } + // }); + // page.search(); + //} + + if (res && res.code && res.code == 200) { // 发起流程 - learun.workflowapi.create({ - isNew: true, - schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 + + var postData = { + schemeCode: 'ArrangeLessonTermAttemper',// 填写流程对应模板编号 processId: processId, - processName: '课程异动申请',// 对应流程名称 - processLevel: '1', - description: '', - formData: JSON.stringify(postData), - callback: function (res, data) { - } + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); }); - page.search(); + } + page.search(); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs index 5f0ecf4ed..d1e0e9d24 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/ArrangeLessonTermAttemperMethod.cs @@ -7,17 +7,21 @@ using System.Threading.Tasks; namespace Learun.Application.WorkFlow { - public class ArrangeLessonTermAttemperMethod : INodeMethod + public class ArrangeLessonTermAttemperMethod : IWorkFlowMethod { ArrangeLessonTermAttemperIBLL arrangeLessonTermAttemperIBLL = new ArrangeLessonTermAttemperBLL(); - public void Sucess(string processId) + + public void Execute(WfMethodParameter parameter) { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, processId); - } - - public void Fail(string processId) - { - arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, processId); + if (parameter.code == "agree") + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(2, parameter.processId); + } + else + { + arrangeLessonTermAttemperIBLL.ModifyStatusByProcessId(0, parameter.processId); + } } + } } From 3db8c35b91ac217127abef865fea308f23038185 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Sat, 2 Apr 2022 12:00:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=8E=A5=E5=8F=A3=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/XmlConfig/ioc.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index 46cbce260..3c0b6eb2c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -35,6 +35,7 @@ + @@ -80,6 +81,7 @@ + From 308cc334f3385f5edaf87f021d468329b340c0f6 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Sat, 2 Apr 2022 15:02:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=95=99=E5=AD=A6=E8=B0=83=E5=BA=A6=EF=BC=9A=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E5=BA=A6=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ArrangeLessonTermAttemper/FormView.cshtml | 4 ++-- .../Views/ArrangeLessonTermAttemper/FormView.js | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml index d7c970c4e..71071ebdb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.cshtml @@ -126,11 +126,11 @@
调度开始时间*
-
+
调度结束时间*
-
+
调度备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js index e33622b88..e0247da8f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/FormView.js @@ -180,10 +180,6 @@ var bootstrap = function ($, learun) { $('#NewEmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' }); $('#ClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); $('#NewClassroomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname' }); - //调度开始时间 - $('#AttemperStartTime').lrselect({ allowSearch: true }); - //调度结束时间 - $('#AttemperEndTime').lrselect({ allowSearch: true }); }, initData: function () { @@ -227,10 +223,6 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - var timer = setTimeout(function () { - page.query(); - clearTimeout(timer); - },3000) } }); @@ -309,10 +301,6 @@ var bootstrap = function ($, learun) { $('#NewClassroomNo').siblings('div').html('教室*'); } } - var timer = setTimeout(function () { - page.query(); - clearTimeout(timer); - }, 3000) } }); }