diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml index cb10a9776..ae5169a3c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml @@ -57,7 +57,7 @@
校区*
*@ -
+
@*
学年*
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 2ac262302..c97154fb2 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 @@ -321,19 +321,92 @@ var bootstrap = function ($, learun) { } }, initGird: function () { + //{"AltId":"c7c2e0dc-12c5-4742-ba27-f8084fa712eb","day":"2","lessonTime":"21","lessonDate":"2024-06-11","schooldId":"207fa1a9-160c-4943-a89b-8fa4db0547ce","academicyear":"23-24","semester":"2","deptNo":"06","deptname":"","majorNo":"GZ02","lessonNo":"GZ0202999","curriculum":"音乐表演(民族乐器演奏方向)专业主课","teachClassNo":"G2306010301","className":"2301班(器乐系)","empno":"1132","teacher":"吴权喜","classRoomNo":"1012","classRoom":"音乐楼012","lessonSortNo":"1"} $('#gridtable2').jfGrid({ headData: [ - { label: "学年", name: "AcademicYearNo", width: 100, align: "left" }, - { label: "学期", name: "Semester", width: 100, align: "left" }, - { label: "系部", name: "DeptNo", width: 100, align: "left" }, - { label: "专业", name: "MajorNo", width: 100, align: "left" }, - { label: "课程", name: "LessonNo", width: 100, align: "left" }, - { label: "班级", name: "TeachClassNo", width: 100, align: "left" }, - { label: "教师", name: "EmpNo", width: 100, align: "left" }, - { label: "教室", name: "ClassroomNo", width: 100, align: "left" }, + { label: "学年", name: "academicyear", width: 100, align: "left" }, + { label: "学期", name: "semester", width: 100, align: "left" }, + { + label: "系部", name: "deptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "majorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "课程", name: "lessonNo", width: 100, 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) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { + label: "教师", name: "empno", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo', + key: value, + keyId: 'empno', + callback: function (_data) { + callback(_data['empname']); + } + }); + } + }, + { + label: "教室", name: "classRoomNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassRoomInfo', + key: value, + keyId: 'classroomno', + callback: function (_data) { + callback(_data['classroomname']); + } + }); + } + }, ], mainId: 'Id', - isPage: true, + isPage: false, //sord: 'desc', //sidx: 'CreateTime' }); @@ -383,18 +456,20 @@ var bootstrap = function ($, learun) { //$('#gridtable1').jfGridSet('refreshdata', temprow.predata); //$('#gridtable'). } else { - for (var i = 0; i < temprow.length; i++) { - //$('#F_SchoolId').lrselectSet(temprow.schooldId); - $('#AcademicYearNo').lrselectSet(temprow[i].academicyear); - $('#Semester').lrselectSet(temprow[i].semester); - $('#DeptNo').lrselectSet(temprow[i].deptNo); - $('#MajorNo').lrselectSet(temprow[i].majorNo); - $('#LessonNo').lrselectSet(temprow[i].lessonNo); - $('#TeachClassNo').lrselectSet(temprow[i].teachClassNo); - $('#EmpNo').lrselectSet(temprow[i].empno); - $('#ClassroomNo').lrselectSet(temprow[i].classRoomNo); - } + $('#gridtable2').jfGridSet('refreshdata', temprow);//.attr("data-val", temprow) + //for (var i = 0; i < temprow.length; i++) { + + // //$('#F_SchoolId').lrselectSet(temprow.schooldId); + // $('#AcademicYearNo').lrselectSet(temprow[i].academicyear); + // $('#Semester').lrselectSet(temprow[i].semester); + // $('#DeptNo').lrselectSet(temprow[i].deptNo); + // $('#MajorNo').lrselectSet(temprow[i].majorNo); + // $('#LessonNo').lrselectSet(temprow[i].lessonNo); + // $('#TeachClassNo').lrselectSet(temprow[i].teachClassNo); + // $('#EmpNo').lrselectSet(temprow[i].empno); + // $('#ClassroomNo').lrselectSet(temprow[i].classRoomNo); + //} } page.query(); } @@ -526,12 +601,12 @@ var bootstrap = function ($, learun) { var postData = { strEntity: JSON.stringify(formData) }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(res, i); - } - }); + //$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTermAttemper/SaveForm?keyValue=' + keyValue, postData, function (res) { + // // 保存成功后才回调 + // if (!!callBack) { + // callBack(res, i); + // } + //}); }; page.init(); }