+
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js
index 7b69b0b28..428081eb0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormAudit.js
@@ -2,7 +2,7 @@
* Copyright (c) 2013-2018 北京泉江科技有限公司
* 创建人:超级管理员
* 日 期:2019-05-15 10:33
- * 描 述:选修课报名审核表单
+ * 描 述:教务意见
*/
var acceptClick;
var keyValue = request('keyValue');
@@ -15,10 +15,25 @@ var bootstrap = function ($, learun) {
page.initData();
},
bind: function () {
- $('#CheckStatus').lrRadioCheckbox({
- type: 'radio',
- code: 'YesOrNoInt',
+ $('#AcademicYearNo').lrselect({
+ placeholder: "请选择学年",
+ allowSearch: true,
+ url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+ value: 'value',
+ text: 'text'
});
+ //学期
+ $('#Semester').lrselect({
+ placeholder: "请选择学年",
+ allowSearch: true,
+ url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+ value: 'value',
+ text: 'text'
+ });
+ $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+ $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorno' });
+ $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+ $('#FilePath').lrUploader();
},
initData: function () {
if (!!keyValue) {
@@ -43,7 +58,7 @@ var bootstrap = function ($, learun) {
var postData = {
strEntity: JSON.stringify($('body').lrGetFormData())
};
- $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/AuditFrom?keyValue=' + keyValue, postData, function (res) {
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SaveTeachForm?keyValue=' + keyValue, postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack();
@@ -51,4 +66,4 @@ var bootstrap = function ($, learun) {
});
};
page.init();
-}
+}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml
index 5b1812e4b..478894994 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/FormGene.cshtml
@@ -1,5 +1,5 @@
@{
- ViewBag.Title = "学业成绩考核记录表";
+ ViewBag.Title = "一键生成";
Layout = "~/Views/Shared/_Form.cshtml";
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js
index 00b8c8f8c..2017e0539 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/Index.js
@@ -105,15 +105,6 @@ var bootstrap = function ($, learun) {
$('#lr_edit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
- if (keyValue.indexOf(',') != -1) {
- learun.alert.warning("只能选择一条记录进行编辑!");
- return;
- }
- var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
- if (CheckMark == "1" || CheckMark == "2") {
- learun.alert.warning("当前项目已提交不能编辑!");
- return;
- }
learun.layerForm({
id: 'form',
title: '编辑',
@@ -130,11 +121,6 @@ var bootstrap = function ($, learun) {
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
- var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
- if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
- learun.alert.warning("选中记录中包含已审核项目,不可删除!");
- return;
- }
learun.layerConfirm('是否确认删除该项!', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/DeleteForm', { keyValue: keyValue }, function () {
@@ -144,46 +130,34 @@ var bootstrap = function ($, learun) {
});
}
});
- // 审核
- $('#lr_lock').on('click', function () {
+
+ //教师评语
+ $('#lr_Coordinator').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
- var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
- //if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
- // learun.alert.warning("选中记录中包含已审核项目,请勿重复提交!");
- // return;
- //}
learun.layerForm({
id: 'formTeach',
- title: '编辑',
- url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormAudit?keyValue=' + keyValue,
- width: 800,
- height: 600,
+ title: '教师评语',
+ url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormTeach?keyValue=' + keyValue,
+ width: 1000,
+ height: 800,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
});
}
});
- // 教师评语
- $('#lr_Coordinator').on('click', function () {
+
+ //教务意见
+ $('#lr_Opinion').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
- if (keyValue.indexOf(',') != -1) {
- learun.alert.warning("只能选择一条记录进行编辑!");
- return;
- }
- //var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
- //if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
- // learun.alert.warning("选中记录中包含已审核项目,请勿重复提交!");
- // return;
- //}
learun.layerForm({
- id: 'formTeach',
- title: '编辑',
- url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormTeach?keyValue=' + keyValue,
- width: 800,
- height: 600,
+ id: 'formAudit',
+ title: '教务意见',
+ url: top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/FormAudit?keyValue=' + keyValue,
+ width: 1000,
+ height: 800,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -204,24 +178,6 @@ var bootstrap = function ($, learun) {
}
});
});
- // 提交
- $('#lr_submit').on('click', function () {
- var keyValue = $('#gridtable').jfGridValue('ID');
- if (learun.checkrow(keyValue)) {
- var CheckMark = $('#gridtable').jfGridValue('CheckStatus');
- if (CheckMark.indexOf('1') > -1 || CheckMark.indexOf('2') > -1) {
- learun.alert.warning("选中记录中包含已审核项目,请勿重复提交!");
- return;
- }
- learun.layerConfirm('是否确认提交选择项!', function (res) {
- if (res) {
- learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/ScoreCheckInfo/SubmitFrom', { keyValue: keyValue }, function () {
- refreshGirdData();
- });
- }
- });
- }
- });
//学业成绩考核记载表打印
$('#lr_print').on('click', function () {
@@ -292,20 +248,10 @@ var bootstrap = function ($, learun) {
{ label: "班主任评语", name: "TeacherDemo", width: 100, align: "left" },
{
- label: "评语日期", name: "TDate", width: 130, align: "left"
+ label: "评语日期", name: "TDate", width: 90, align: "left"
},
{
- label: "评语填写人", name: "Signed", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
- key: value,
- keyId: 'f_account',
- callback: function (_data) {
- callback(_data['f_realname']);
- }
- });
- }
+ label: "评语填写人", name: "Signed", width: 100, align: "left"
},
{
label: "操作等级", name: "OperatingLevel", width: 60, align: "left",
@@ -321,20 +267,10 @@ var bootstrap = function ($, learun) {
},
{ label: "学校教务部门审核意见", name: "CheckOpinion", width: 150, align: "left" },
{
- label: "意见日期", name: "CheckTime", width: 130, align: "left"
+ label: "意见日期", name: "CheckTime", width: 90, align: "left"
},
{
- label: "意见填写人", name: "CheckUser", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
- key: value,
- keyId: 'f_userid',
- callback: function (_data) {
- callback(_data['f_realname']);
- }
- });
- }
+ label: "意见填写人", name: "CheckUser", width: 100, align: "left"
},
],
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml
index b1fb5379f..ee726a169 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml
@@ -428,7 +428,7 @@
return;
};
GetDataItemStr("OperatingLevel", "@Model.OperatingLevel","#OperatingLevel");
- GetDataSourceStr("BaseUser", "f_account", "f_realname", "@Model.Signed", "#Signed");
+ //GetDataSourceStr("BaseUser", "f_account", "f_realname", "@Model.Signed", "#Signed");
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs
index 690e778ba..8291fd7c2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoBLL.cs
@@ -185,52 +185,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}
- ///