解绑微信
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml
index 439bd249c..7fb91d9e1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml
@@ -4,7 +4,7 @@
}
+
+
-
数量单位
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
index 4f8b2df85..6badb154c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutItemApply/Form.js
@@ -67,6 +67,27 @@ var bootstrap = function ($, learun) {
grid: [
{ label: '资产编号', name: 'aicodenumjy', width: 150, align: 'left' },
{ label: '资产名称', name: 'aiassname', width: 150, align: 'left' },
+ {
+ label: '使用部门', name: 'aidepartment', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('department', {
+ key: value,
+ callback: function (_data) {
+ callback(_data.name);
+ }
+ });
+ }
+ },
+ {
+ label: '使用人员', name: 'aiusepeople', width: 150, align: 'left',
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('user', {
+ key: value,
+ callback: function (_data) {
+ callback(_data.name);
+ }
+ });
+ }
+ },
{
label: '所在库房', name: 'aiistorageid', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js
index e1c462623..73e5764cc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js
@@ -39,7 +39,10 @@ var bootstrap = function ($, learun) {
},
{
- label: "数量", name: "ANum", width: 100, align: "left",
+ label: "库存数量", name: "ACNum", width: 100, align: "left",
+ },
+ {
+ label: "领取数量", name: "ANum", width: 100, align: "left",
edit: {
type: 'input',
inputType: 'number',
@@ -111,6 +114,10 @@ var bootstrap = function ($, learun) {
$('.jfgrid-data-cell[colname="AID"][rowIndex="' + rowIndex + '"]').attr('title', data.AId).html(data.AId);
$('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AID'] = data.AId;
+ $('jfgrid_edit_Ass_ReceiveItem_' + 'ACNum').val(data.AId);
+ $('.jfgrid-data-cell[colname="ACNum"][rowIndex="' + rowIndex + '"]').attr('title', data.AStock).html(data.AStock);
+ $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ACNum'] = data.AStock;
+
});
}
},
@@ -151,7 +158,7 @@ var bootstrap = function ($, learun) {
}
});
}
- callback && callback();
+ callback && callback();
}
// 验证数据是否填写完整
validForm = function () {
@@ -174,7 +181,11 @@ var bootstrap = function ($, learun) {
$.each(itemList, function (i, item) {
if (item.ANum <= 0) {
learun.alert.warning("请填写<" + item.AName + ">的申请数量");
- num++
+ num++;
+ }
+ if (item.ANum > item.ACNum) {
+ learun.alert.warning("领取数量不能大于库存数量！");
+ num++;
}
})
if (num > 0) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs
index b1985e593..bd26f7a65 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuAttendanceLeaveController.cs
@@ -40,14 +40,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
return View();
}
-
-
-
[HttpGet]
public ActionResult CheckForm()
{
return View();
}
+ ///
+ /// 主页面【学子在线】
+ ///
+ ///
+ [HttpGet]
+ public ActionResult IndexInStudent()
+ {
+ return View();
+ }
#endregion
#region 获取数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs
new file mode 100644
index 000000000..222db3064
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuLeaveManagementController.cs
@@ -0,0 +1,176 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+using System.Linq;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+ ///
+ /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+ /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ /// 创 建：超级管理员
+ /// 日 期：2020-11-27 10:05
+ /// 描 述：学生请假管理
+ ///
+ public class StuLeaveManagementController : MvcControllerBase
+ {
+ private StuLeaveManagementIBLL stuLeaveManagementIBLL = new StuLeaveManagementBLL();
+
+ #region 视图功能
+
+ ///
+ /// 主页面
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Index()
+ {
+ return View();
+ }
+ ///
+ /// 表单页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult Form()
+ {
+ return View();
+ }
+
+ ///
+ /// 主页面【学工信息管理】
+ ///
+ ///
+ [HttpGet]
+ public ActionResult CheckIndex()
+ {
+ ViewBag.IsDeptDirector = false; //登录用户是否是系主任标识
+ var deptDirectorRoleId = Config.GetValue("DeptDirectorRoleId");
+ var loginInfoRoleIds = LoginUserInfo.Get().roleIds;
+ if (loginInfoRoleIds.IndexOf(',') == -1)
+ {
+ if (loginInfoRoleIds == deptDirectorRoleId)
+ {
+ ViewBag.IsDeptDirector = true;
+ }
+ }
+ else
+ {
+ if (loginInfoRoleIds.Split(',').Contains(deptDirectorRoleId))
+ {
+ ViewBag.IsDeptDirector = true;
+ }
+ }
+ return View();
+ }
+ ///
+ /// 表单页【学工信息管理】
+ ///
+ ///
+ [HttpGet]
+ public ActionResult CheckForm()
+ {
+ return View();
+ }
+ #endregion
+
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表数据
+ ///
+ /// 分页参数
+ /// 查询参数
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetPageList(string pagination, string queryJson)
+ {
+ Pagination paginationobj = pagination.ToObject();
+ var data = stuLeaveManagementIBLL.GetPageList(paginationobj, queryJson);
+ var jsonData = new
+ {
+ rows = data,
+ total = paginationobj.total,
+ page = paginationobj.page,
+ records = paginationobj.records
+ };
+ return Success(jsonData);
+ }
+ ///
+ /// 获取表单数据
+ ///
+ /// 主键
+ ///
+ [HttpGet]
+ [AjaxOnly]
+ public ActionResult GetFormData(string keyValue)
+ {
+ var StuLeaveManagementData = stuLeaveManagementIBLL.GetStuLeaveManagementEntity(keyValue);
+ var jsonData = new
+ {
+ StuLeaveManagement = StuLeaveManagementData,
+ };
+ return Success(jsonData);
+ }
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ /// 主键
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DeleteForm(string keyValue)
+ {
+ stuLeaveManagementIBLL.DeleteEntity(keyValue);
+ return Success("删除成功！");
+ }
+ ///
+ /// 保存实体数据（新增、修改）
+ ///
+ /// 主键
+ /// 实体
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [AjaxOnly]
+ public ActionResult SaveForm(string keyValue, string strEntity)
+ {
+ var loginInfo = LoginUserInfo.Get();
+ StuLeaveManagementEntity entity = strEntity.ToObject();
+ entity.CreateUserId = loginInfo.userId;
+ entity.CreateUserNo = loginInfo.account;
+ entity.CreateTime = DateTime.Now;
+ stuLeaveManagementIBLL.SaveEntity(keyValue, entity);
+ return Success("保存成功！");
+ }
+ ///
+ /// 保存实体数据（新增、修改）
+ ///
+ /// 主键
+ /// 实体
+ ///
+ [HttpPost]
+ [ValidateAntiForgeryToken]
+ [AjaxOnly]
+ public ActionResult SaveCheckForm(string keyValue, string strEntity)
+ {
+ var loginInfo = LoginUserInfo.Get();
+ StuLeaveManagementEntity entity = strEntity.ToObject();
+ entity.CheckUserId = loginInfo.userId;
+ entity.CheckUserNo = loginInfo.account;
+ entity.CheckTime = DateTime.Now;
+ stuLeaveManagementIBLL.SaveEntity(keyValue, entity);
+ return Success("保存成功！");
+ }
+ #endregion
+
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs
index a545c1b9d..569c7f202 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuPunishmentController.cs
@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[HttpGet]
public ActionResult Index()
{
- return View();
+ return View();
}
///
/// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[HttpGet]
public ActionResult Form()
{
- return View();
+ return View();
}
#endregion
@@ -69,8 +69,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
- var StuPunishmentData = stuPunishmentIBLL.GetStuPunishmentEntity( keyValue );
- var jsonData = new {
+ var StuPunishmentData = stuPunishmentIBLL.GetStuPunishmentEntity(keyValue);
+ var jsonData = new
+ {
StuPunishment = StuPunishmentData,
};
return Success(jsonData);
@@ -102,9 +103,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public ActionResult SaveForm(string keyValue, string strEntity)
{
StuPunishmentEntity entity = strEntity.ToObject();
- stuPunishmentIBLL.SaveEntity(keyValue,entity);
+ stuPunishmentIBLL.SaveEntity(keyValue, entity);
return Success("保存成功！");
}
+
+ ///
+ /// 解除处分
+ /// 主键
+ ///
+ ///
+ [HttpPost]
+ [AjaxOnly]
+ public ActionResult DoCancelPunish(string keyValue, bool status)
+ {
+ stuPunishmentIBLL.DoCancelPunish(keyValue, status);
+ return Success("操作成功！");
+ }
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.cshtml
index 61a8721a1..e030f4e13 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.cshtml
@@ -38,10 +38,10 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.js
index 931605daa..41d9d0be8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/Index.js
@@ -16,33 +16,33 @@ var bootstrap = function ($, learun) {
},
bind: function () {
page.search();
- //// 时间搜索框
- //$('#datesearch').lrdate({
- // dfdata: [
- // { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
- // { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
- // { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
- // { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
- // ],
- // // 月
- // mShow: false,
- // premShow: false,
- // // 季度
- // jShow: false,
- // prejShow: false,
- // // 年
- // ysShow: false,
- // yxShow: false,
- // preyShow: false,
- // yShow: false,
- // // 默认
- // dfvalue: '1',
- // selectfn: function (begin, end) {
- // startTime = begin;
- // endTime = end;
- // page.search();
- // }
- //});
+ // 时间搜索框
+ $('#datesearch').lrdate({
+ dfdata: [
+ { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+ ],
+ // 月
+ mShow: false,
+ premShow: false,
+ // 季度
+ jShow: false,
+ prejShow: false,
+ // 年
+ ysShow: false,
+ yxShow: false,
+ preyShow: false,
+ yShow: false,
+ // 默认
+ dfvalue: '1',
+ selectfn: function (begin, end) {
+ startTime = begin;
+ endTime = end;
+ page.search();
+ }
+ });
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
@@ -97,16 +97,16 @@ var bootstrap = function ($, learun) {
var keyValue = $("#gridtable").jfGridValue('ID');
if (learun.checkrow(keyValue)) {
var check = $("#gridtable").jfGridValue('IsCheck');
- if (check != null) {
- learun.alert.warning("已经审核过了");
+ if (check == "1") {
+ learun.alert.warning("该项已审核同意！");
return false;
} else {
learun.layerForm({
- id: 'form',
+ id: 'checkform',
title: '审核',
url: top.$.rootUrl + '/EducationalAdministration/StuAttendanceLeave/CheckForm?keyValue=' + keyValue,
- width: 600,
- height: 400,
+ width: 1200,
+ height: 800,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -126,7 +126,7 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuAttendanceLeave/GetPageList',
headData: [
- { label: "学年度", name: "AcademicYearNo", width: 100, align: "left" },
+ { label: "申请时间", name: "UpdateDate", width: 100, align: "left" },
{
label: "审核状态", name: "IsCheck", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -134,11 +134,25 @@ var bootstrap = function ($, learun) {
key: value,
code: 'LeaveCheck',
callback: function (_data) {
- callback(_data.text ? _data.text : "未审核");
+ callback(_data.text ? _data.text : "申请中");
}
});
}
},
+ { label: "审核备注", name: "TecRemark", width: 100, align: "left" },
+ {
+ label: "请假类型", name: "LeaveType", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LeaveType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
{ label: "学期", name: "Semester", width: 100, align: "left" },
{ label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
@@ -155,18 +169,20 @@ var bootstrap = function ($, learun) {
{ label: "课程类别", name: "LessonSortName", width: 100, align: "left" },
{ label: "原上课日期", name: "LessonDate", width: 100, align: "left" },
{ label: "上课时间", name: "LessonTime", width: 100, align: "left" },
- { label: "请假类型", name: "LeaveType", width: 100, align: "left" },
{ label: "教师号", name: "EmpNo", width: 100, align: "left" },
{ label: "备注", name: "Remark", width: 100, align: "left" },
],
mainId: 'ID',
- isPage: true
+ isPage: true,
+ sord: 'UpdateDate desc'
});
+ page.search();
},
search: function (param) {
param = param || {};
param.StartTime = startTime;
param.EndTime = endTime;
+ param.ClassManagerNo = learun.clientdata.get(['userinfo']).account;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/IndexInStudent.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/IndexInStudent.cshtml
new file mode 100644
index 000000000..214bbfa4f
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/IndexInStudent.cshtml
@@ -0,0 +1,53 @@
+@{
+ ViewBag.Title = "学生请假记录";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuAttendanceLeave/IndexInStudent.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/IndexInStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/IndexInStudent.js
new file mode 100644
index 000000000..725b721ab
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuAttendanceLeave/IndexInStudent.js
@@ -0,0 +1,193 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：超级管理员
+ * 日 期：2019-05-24 15:40
+ * 描 述：学生请假记录
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var startTime;
+ var endTime;
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ page.search();
+ // 时间搜索框
+ $('#datesearch').lrdate({
+ dfdata: [
+ { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+ { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+ ],
+ // 月
+ mShow: false,
+ premShow: false,
+ // 季度
+ jShow: false,
+ prejShow: false,
+ // 年
+ ysShow: false,
+ yxShow: false,
+ preyShow: false,
+ yShow: false,
+ // 默认
+ dfvalue: '1',
+ selectfn: function (begin, end) {
+ startTime = begin;
+ endTime = end;
+ page.search();
+ }
+ });
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 新增
+ $('#lr_add').on('click', function () {
+ learun.layerForm({
+ id: 'form',
+ title: '新增',
+ url: top.$.rootUrl + '/EducationalAdministration/StuAttendanceLeave/Form',
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ });
+ // 编辑
+ $('#lr_edit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerForm({
+ id: 'form',
+ title: '编辑',
+ url: top.$.rootUrl + '/EducationalAdministration/StuAttendanceLeave/Form?keyValue=' + keyValue,
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ });
+ // 删除
+ $('#lr_delete').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ learun.layerConfirm('是否确认删除该项！', function (res) {
+ if (res) {
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuAttendanceLeave/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ //审核
+ $("#lr_check").on('click', function () {
+ var keyValue = $("#gridtable").jfGridValue('ID');
+ if (learun.checkrow(keyValue)) {
+ var check = $("#gridtable").jfGridValue('IsCheck');
+ if (check == "1") {
+ learun.alert.warning("该项已审核同意！");
+ return false;
+ } else {
+ learun.layerForm({
+ id: 'checkform',
+ title: '审核',
+ url: top.$.rootUrl + '/EducationalAdministration/StuAttendanceLeave/CheckForm?keyValue=' + keyValue,
+ width: 1200,
+ height: 800,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+
+ }
+ }
+
+ })
+ // 打印
+ $('#lr_print').on('click', function () {
+ $('#gridtable').jqprintTable();
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuAttendanceLeave/GetPageList',
+ headData: [
+ { label: "申请时间", name: "UpdateDate", width: 100, align: "left" },
+ {
+ label: "审核状态", name: "IsCheck", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LeaveCheck',
+ callback: function (_data) {
+ callback(_data.text ? _data.text : "申请中");
+ }
+ });
+ }
+ },
+ { label: "审核备注", name: "TecRemark", width: 100, align: "left" },
+ {
+ label: "请假类型", name: "LeaveType", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LeaveType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
+ { label: "学期", name: "Semester", width: 100, align: "left" },
+ { label: "学号", name: "StuNo", width: 100, align: "left" },
+ { label: "姓名", name: "StuName", width: 100, align: "left" },
+ { label: "年级", name: "Grade", width: 100, align: "left" },
+ { label: "系所码", name: "DeptNo", width: 100, align: "left" },
+ { label: "系名", name: "DeptName", width: 100, align: "left" },
+ { label: "专业码", name: "MajorNo", width: 100, align: "left" },
+ { label: "专业名", name: "MajorName", width: 100, align: "left" },
+ { label: "所在行政班号 ", name: "ClassNo", width: 100, align: "left" },
+ { label: "班级名称", name: "ClassName", width: 100, align: "left" },
+ { label: "课程号", name: "LessonNo", width: 100, align: "left" },
+ { label: "课程名称", name: "LessonName", width: 100, align: "left" },
+ { label: "课程类别码", name: "LessonSortNo", width: 100, align: "left" },
+ { label: "课程类别", name: "LessonSortName", width: 100, align: "left" },
+ { label: "原上课日期", name: "LessonDate", width: 100, align: "left" },
+ { label: "上课时间", name: "LessonTime", width: 100, align: "left" },
+ { label: "教师号", name: "EmpNo", width: 100, align: "left" },
+ { label: "备注", name: "Remark", width: 100, align: "left" },
+ ],
+ mainId: 'ID',
+ isPage: true,
+ sord: 'UpdateDate desc'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ param.StartTime = startTime;
+ param.EndTime = endTime;
+ param.StuNo = learun.clientdata.get(['userinfo']).account;
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ page.search();
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 66696492e..367bc0204 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
@@ -337,6 +337,9 @@ var bootstrap = function ($, learun) {
{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
{ label: "余额", name: "Balance", width: 100, align: "left" },
{ label: "通信地址", name: "MailAddress", width: 100, align: "left" },
+ { label: "联系电话", name: "mobile", width: 100, align: "left" },
+ { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+ { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
{
label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
formatter: function (cellvalue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml
new file mode 100644
index 000000000..3e466ce5d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml
@@ -0,0 +1,35 @@
+@{
+ ViewBag.Title = "学生请假管理";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js
new file mode 100644
index 000000000..25ff742de
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.js
@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日 期：2020-11-27 10:05
+ * 描 述：学生请假管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ $('.lr-form-wrap').lrscroll();
+ page.bind();
+ page.initData();
+ },
+ bind: function () {
+ $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
+ $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetFormData?keyValue=' + keyValue, function (data) {
+ for (var id in data) {
+ if (!!data[id].length && data[id].length > 0) {
+ $('#' + id ).jfGridSet('refreshdata', data[id]);
+ }
+ else {
+ $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ }
+ }
+ });
+ }
+ }
+ };
+ // 保存数据
+ acceptClick = function (callBack) {
+ if (!$('body').lrValidform()) {
+ return false;
+ }
+ var postData = {
+ strEntity: JSON.stringify($('body').lrGetFormData())
+ };
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/SaveCheckForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack();
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml
new file mode 100644
index 000000000..8565e691a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml
@@ -0,0 +1,41 @@
+@{
+ ViewBag.Title = "学生请假管理";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js")
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js
new file mode 100644
index 000000000..a2cf48498
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js
@@ -0,0 +1,182 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日 期：2020-11-27 10:05
+ * 描 述：学生请假管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
+ $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 审核
+ $('#lr_check').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('Id');
+ if (learun.checkrow(keyValue)) {
+ //判断是否可以审核：请假天数大于2天且登录用户不是系主任，提示无法审核；
+ var day = $('#gridtable').jfGridValue('LeaveDay');
+ if (day > 2 && IsDeptDirector.toLowerCase() == "false") {
+ learun.alert.warning("该请假申请大于2天，需要由系主任审核！");
+ return false;
+ }
+ learun.layerForm({
+ id: 'checkform',
+ title: '审核',
+ url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/CheckForm?keyValue=' + keyValue,
+ width: 800,
+ height: 600,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetPageList',
+ headData: [
+ {
+ label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LeaveCheck',
+ callback: function (_data) {
+ callback(_data.text ? _data.text : "申请中");
+ }
+ });
+ }
+ },
+ { label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
+ { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
+ {
+ label: "审核人", name: "CheckUserNo", 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: "LeaveType", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LeaveType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "开始时间", name: "StartTime", width: 100, align: "left" },
+ { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+ { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
+ { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
+ { label: "学号", name: "CreateUserNo", width: 100, align: "left" },
+ { label: "姓名", name: "CreateUserName", width: 100, align: "left" },
+ { label: "申请时间", name: "CreateTime", width: 130, align: "left" },
+ {
+ label: "班级", name: "ClassNo", 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: "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: "ClassDiredctorNo", 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: "ClassTutorNo", 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']);
+ }
+ });
+ }
+ },
+
+ ],
+ mainId: 'Id',
+ isPage: true,
+ sord: 'CreateTime desc'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ param.ClassManagerNo = learun.clientdata.get(['userinfo']).account;
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml
new file mode 100644
index 000000000..2ecde1b38
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml
@@ -0,0 +1,27 @@
+@{
+ ViewBag.Title = "学生请假管理";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.js
new file mode 100644
index 000000000..339169c36
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.js
@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日 期：2020-11-27 10:05
+ * 描 述：学生请假管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ $('.lr-form-wrap').lrscroll();
+ page.bind();
+ page.initData();
+ },
+ bind: function () {
+ $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
+ $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+ },
+ initData: function () {
+ if (!!keyValue) {
+ $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetFormData?keyValue=' + keyValue, function (data) {
+ for (var id in data) {
+ if (!!data[id].length && data[id].length > 0) {
+ $('#' + id ).jfGridSet('refreshdata', data[id]);
+ }
+ else {
+ $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+ }
+ }
+ });
+ }
+ }
+ };
+ // 保存数据
+ acceptClick = function (callBack) {
+ if (!$('body').lrValidform()) {
+ return false;
+ }
+ var postData = {
+ strEntity: JSON.stringify($('body').lrGetFormData())
+ };
+ $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+ // 保存成功后才回调
+ if (!!callBack) {
+ callBack();
+ }
+ });
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.cshtml
new file mode 100644
index 000000000..565a7cd58
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.cshtml
@@ -0,0 +1,40 @@
+@{
+ ViewBag.Title = "学生请假管理";
+ Layout = "~/Views/Shared/_Index.cshtml";
+}
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js
new file mode 100644
index 000000000..d0d41a159
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js
@@ -0,0 +1,212 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日 期：2020-11-27 10:05
+ * 描 述：学生请假管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+ "use strict";
+ var page = {
+ init: function () {
+ page.initGird();
+ page.bind();
+ },
+ bind: function () {
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
+ $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
+ $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+ // 刷新
+ $('#lr_refresh').on('click', function () {
+ location.reload();
+ });
+ // 新增
+ $('#lr_add').on('click', function () {
+ learun.layerForm({
+ id: 'form',
+ title: '新增',
+ url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/Form',
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ });
+ // 编辑
+ $('#lr_edit').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('Id');
+ if (learun.checkrow(keyValue)) {
+ var status = $('#gridtable').jfGridValue('CheckStatus');
+ if (status == "1" || status == "2") {
+ learun.alert.warning("该项已审核无法编辑！");
+ return false;
+ }
+ learun.layerForm({
+ id: 'form',
+ title: '编辑',
+ url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/Form?keyValue=' + keyValue,
+ width: 600,
+ height: 400,
+ callBack: function (id) {
+ return top[id].acceptClick(refreshGirdData);
+ }
+ });
+ }
+ });
+ // 删除
+ $('#lr_delete').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('Id');
+ if (learun.checkrow(keyValue)) {
+ var status = $('#gridtable').jfGridValue('CheckStatus');
+ if (status == "1") {
+ learun.alert.warning("该项已审核通过无法删除！");
+ return false;
+ }
+ learun.layerConfirm('是否确认删除该项！', function (res) {
+ if (res) {
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ },
+ // 初始化列表
+ initGird: function () {
+ $('#gridtable').lrAuthorizeJfGrid({
+ url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetPageList',
+ headData: [
+ {
+ label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LeaveCheck',
+ callback: function (_data) {
+ callback(_data.text ? _data.text : "申请中");
+ }
+ });
+ }
+ },
+ { label: "审核备注", name: "CheckRemark", width: 100, align: "left" },
+ { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
+ {
+ label: "审核人", name: "CheckUserNo", 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: "LeaveType", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'LeaveType',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
+ { label: "开始时间", name: "StartTime", width: 100, align: "left" },
+ { label: "结束时间", name: "EndTime", width: 100, align: "left" },
+ { label: "请假天数", name: "LeaveDay", width: 100, align: "left" },
+ { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
+ { label: "学号", name: "CreateUserNo", width: 100, align: "left" },
+ { label: "姓名", name: "CreateUserName", width: 100, align: "left" },
+ { label: "申请时间", name: "CreateTime", width: 130, align: "left" },
+ {
+ label: "班级", name: "ClassNo", 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: "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: "ClassDiredctorNo", 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: "ClassTutorNo", 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']);
+ }
+ });
+ }
+ },
+
+ ],
+ mainId: 'Id',
+ isPage: true,
+ sord: 'CreateTime desc'
+ });
+ page.search();
+ },
+ search: function (param) {
+ param = param || {};
+ param.StuNo = learun.clientdata.get(['userinfo']).account;
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+ }
+ };
+ refreshGirdData = function () {
+ $('#gridtable').jfGridSet('reload');
+ };
+ page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml
index ed49f1d91..ca70f343d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.cshtml
@@ -16,6 +16,8 @@
录入
修改
删除
+
解除处分
+
取消解除处分
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js
index 36441a127..bbf1a4f12 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuPunishment/Index.js
@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
});
// 新增
$('#lr_add').on('click', function () {
- learun.layerForm({
+ learun.layerForm({
id: 'form',
title: '新增',
url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/Form',
@@ -50,9 +50,45 @@ var bootstrap = function ($, learun) {
$('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) {
- learun.layerConfirm('是否确认删除该项！', function (res) {
+ learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
- learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DeleteForm', { keyValue: keyValue}, function () {
+ learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 解除处分
+ $('#lr_cancelPunish').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('Id');
+ if (learun.checkrow(keyValue)) {
+ var status = $('#gridtable').jfGridValue('IsCancelPunish');
+ if (status == true) {
+ learun.alert.warning("该项已解除处分！");
+ return false;
+ }
+ learun.layerConfirm('是否确认解除处分该项！', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: true }, function () {
+ refreshGirdData();
+ });
+ }
+ });
+ }
+ });
+ // 取消解除处分
+ $('#lr_cancelPunishNot').on('click', function () {
+ var keyValue = $('#gridtable').jfGridValue('Id');
+ if (learun.checkrow(keyValue)) {
+ var status = $('#gridtable').jfGridValue('IsCancelPunish');
+ if (status != true) {
+ learun.alert.warning("该项未解除处分，无法取消解除！");
+ return false;
+ }
+ learun.layerConfirm('是否确认取消解除处分该项！', function (res) {
+ if (res) {
+ learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuPunishment/DoCancelPunish', { keyValue: keyValue, status: false }, function () {
refreshGirdData();
});
}
@@ -65,23 +101,29 @@ var bootstrap = function ($, learun) {
$('#gridtable').lrAuthorizeJfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuPunishment/GetPageList',
headData: [
- { label: "学号", name: "StuNo", width: 100, align: "left"},
- { label: "姓名", name: "StuName", width: 100, align: "left"},
+ { label: "学号", name: "StuNo", width: 100, align: "left" },
+ { label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "处分名称", name: "PunishName", width: 100, align: "left"
},
- { label: "处分原因", name: "PunishReason", width: 100, align: "left"},
- { label: "处分日期", name: "PunishDate", width: 100, align: "left"},
- { label: "处分文号", name: "FileNo", width: 100, align: "left"},
+ { label: "处分原因", name: "PunishReason", width: 100, align: "left" },
+ { label: "处分日期", name: "PunishDate", width: 100, align: "left" },
+ { label: "处分文号", name: "FileNo", width: 100, align: "left" },
+ {
+ label: "是否解除处分", name: "IsCancelPunish", width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == true ? "是" : "否";
+ }
+ },
+ { label: "解除处分日期", name: "CancelPunishDate", width: 100, align: "left" },
],
- mainId:'Id',
+ mainId: 'Id',
isPage: true
});
page.search();
},
search: function (param) {
param = param || {};
- $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+ $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index f28456852..e127f6d05 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -790,6 +790,7 @@