Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js

@@ -33,15 +33,16 @@ var bootstrap = function ($, learun) {
         },
         query: function () {
             var p = {};
+            var datas = $('#gridtable2').jfGridGet('rowdatas');
             //p.F_SchoolId = $('#F_SchoolId').lrselectGet();
-            p.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
-            p.Semester = $('#Semester').lrselectGet();
-            p.DeptNo = $('#DeptNo').lrselectGet();
-            p.MajorNo = $('#MajorNo').lrselectGet();
-            p.LessonNo = $('#LessonNo').lrselectGet();
-            p.TeachClassNo = $('#TeachClassNo').lrselectGet();
-            p.EmpNo = $('#EmpNo').lrselectGet();
-            p.ClassroomNo = $('#ClassroomNo').lrselectGet();
+            p.AcademicYearNo = datas[0].Academicyear;// $('#AcademicYearNo').lrselectGet();
+            p.Semester = datas[0].Semester;//$('#Semester').lrselectGet();
+            p.DeptNo = datas[0].DeptNo;//$('#DeptNo').lrselectGet();
+            p.MajorNo = datas[0].MajorNo;//$('#MajorNo').lrselectGet();
+            p.LessonNo = datas[0].LessonNo;//$('#LessonNo').lrselectGet();
+            p.TeachClassNo = datas[0].TeachClassNo;//$('#TeachClassNo').lrselectGet();
+            p.EmpNo = datas[0].Empno;// $('#EmpNo').lrselectGet();
+            p.ClassroomNo = datas[0].ClassRoomNo;//$('#ClassroomNo').lrselectGet();
             //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) {
                 //调度开始时间

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Index.js

@@ -570,9 +570,9 @@ var bootstrap = function ($, learun) {
                 processId: processId,
                 level: '1',
             };
-            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
-                learun.loading(false);
-            });
+            //learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+            //    learun.loading(false);
+            //});
 
         }
         page.search();