diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.cshtml index c878f37bb..223bbb1f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.cshtml @@ -12,10 +12,10 @@
-
考试时间段*
- +
时间段*
+    — - +
不能监考的老师*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js index 67c54304a..c8218b365 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js @@ -22,11 +22,8 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text', select: function (item) { - if (item) { + if (!!item) { $('#EmpNo').lrselectRefresh({ - //type: 'multiple', - //placeholder: "请选择老师", - //allowSearch: true, url: top.$.rootUrl + '/EducationalAdministration/Exam_InvigilateTeacher/GetList?AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + $('#Semester').lrselectGet(), value: 'EmpNo', text: 'EmpName' @@ -41,12 +38,9 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester', value: 'value', text: 'text', - select: function(item) { - if (item) { + select: function (item) { + if (!!item) { $('#EmpNo').lrselectRefresh({ - //type: 'multiple', - //placeholder: "请选择老师", - //allowSearch: true, url: top.$.rootUrl + '/EducationalAdministration/Exam_InvigilateTeacher/GetList?AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + $('#Semester').lrselectGet(), value: 'EmpNo', text: 'EmpName' @@ -56,11 +50,7 @@ var bootstrap = function ($, learun) { }); $('#EmpNo').lrselect({ type: 'multiple', - placeholder: "请选择老师", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/Exam_InvigilateTeacher/GetList', - value: 'EmpNo', - text: 'EmpName' }); }, initData: function () { @@ -73,6 +63,9 @@ var bootstrap = function ($, learun) { else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); } + //if (!!data[id] && !!data[id].EmpNo) { + // $('#EmpNo').lrselectSet(data[id].EmpNo); + //} } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.cshtml index e343e3902..c71f1a446 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.cshtml @@ -30,7 +30,6 @@  新增  编辑  删除 - @* 打印*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js index b7bb438a6..0d3fd98d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js @@ -108,10 +108,14 @@ var bootstrap = function ($, learun) { keyId: 'empno', callback: function (_data) { name += _data['empname'] + ","; + if (name.indexOf(',') != -1) { + callback(name.substring(0, name.length - 1)); + } else { + callback(name); + } } }); } - callback(name.substring(0, name.length - 1)); } else { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',