+
-
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCancelLeaveManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCancelLeaveManagement/Index.js
index 16892a560..8088126c0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCancelLeaveManagement/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCancelLeaveManagement/Index.js
@@ -17,47 +17,26 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
- $('#CancelLeaveType').lrDataItemSelect({ code: 'LeaveType' });
+ $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
$('#CreateUserId').lrUserSelect(0);
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
- // 新增
- $('#lr_add').on('click', function () {
- learun.layerForm({
- id: 'form',
- title: '新增',
- url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/Form',
- width: 1000,
- height: 800,
- callBack: function (id) {
- var res = false;
- // 验证数据
- res = top[id].validForm();
- // 保存数据
- if (res) {
- res = top[id].save('', function () {
- page.search();
- });
- }
- return res;
- }
- });
- });
// 编辑
$('#lr_edit').on('click', function () {
- var keyValue = $('#gridtable').jfGridValue('Id');
- if (learun.checkrow(keyValue)) {
+ var keyValueInLeave = $('#gridtable').jfGridValue('IdInLeave');
+ if (learun.checkrow(keyValueInLeave)) {
+ var keyValue = $('#gridtable').jfGridValue('Id');
var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
- if (CheckStatus != "0") {
- learun.alert.warning("当前项已提交！");
+ if (keyValue != null && CheckStatus != "0") {
+ learun.alert.warning("当前项已提交销假！");
return false;
}
learun.layerForm({
id: 'form',
title: '编辑',
- url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/Form?keyValue=' + keyValue,
+ url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/Form?keyValue=' + keyValue + '&keyValueInLeave=' + keyValueInLeave,
width: 1000,
height: 800,
callBack: function (id) {
@@ -81,13 +60,13 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
if (CheckStatus != "0") {
- learun.alert.warning("当前项已提交！");
+ learun.alert.warning("当前项已提交销假！");
return false;
}
learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/DeleteForm', { keyValue: keyValue }, function () {
- refreshGirdData();
+ page.search();
});
}
});
@@ -113,7 +92,7 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
if (CheckStatus != "0") {
- learun.alert.warning("当前项已提交！");
+ learun.alert.warning("当前项已提交销假！");
return false;
}
learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -129,49 +108,83 @@ var bootstrap = function ($, learun) {
},
// 初始化列表
initGird: function () {
- $('#gridtable').lrAuthorizeJfGrid({
+ $('#gridtable').jfGrid({
url: top.$.rootUrl + '/PersonnelManagement/TeacherCancelLeaveManagement/GetPageList',
headData: [
+ //{
+ // label: "请假姓名", name: "CreateUserIdInLeave", width: 100, align: "left",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('user', {
+ // key: value,
+ // callback: function (_data) {
+ // callback(_data.name);
+ // }
+ // });
+ // }
+ //},
+ //{ label: "请假填表时间", name: "CreateTimeInLeave", width: 130, align: "left" },
+ { label: "联系电话", name: "Telephone", width: 100, align: "left" },
{
- label: "姓名", name: "CreateUserId", width: 100, align: "left",
+ label: "请假种类", name: "LeaveType", width: 60, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('user', {
+ learun.clientdata.getAsync('dataItem', {
key: value,
+ code: 'LeaveType',
callback: function (_data) {
- callback(_data.name);
+ callback(_data.text);
}
});
}
},
- { label: "填表时间", name: "CreateTime", width: 130, align: "left" },
+ { label: "请假开始时间", name: "StartTime", width: 120, align: "left" },
+ { label: "请假结束时间", name: "EndTime", width: 120, align: "left" },
{
- label: "销假类型", name: "CancelLeaveType", width: 100, align: "left",
+ label: "请假天数", name: "LeaveDay", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'LeaveType',
+ code: 'LeaveDay',
callback: function (_data) {
callback(_data.text);
}
});
}
},
- { label: "到岗时间", name: "WorkTime", width: 120, align: "left" },
- { label: "销假事由", name: "CancelLeaveReason", width: 200, align: "left" },
+ { label: "请假事由", name: "LeaveReason", width: 100, align: "left" },
{
- label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+ label: "请假审核状态", name: "CheckStatusInLeave", width: 80, align: "left", formatter: function (cellvalue) {
return cellvalue == "1" ? "审核中" : cellvalue == "2" ? "审核通过" : cellvalue == "3" ? "审核未通过" : "草稿";
}
},
+ {
+ label: "姓名", name: "CreateUserId", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('user', {
+ key: value,
+ callback: function (_data) {
+ callback(_data.name);
+ }
+ });
+ }
+ },
+ { label: "销假填表时间", name: "CreateTime", width: 130, align: "left" },
+ { label: "到岗时间", name: "WorkTime", width: 120, align: "left" },
+ { label: "销假事由", name: "CancelLeaveReason", width: 150, align: "left" },
+ {
+ label: "销假审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+ return cellvalue == "1" ? "审核中" : cellvalue == "2" ? "审核通过" : cellvalue == "3" ? "审核未通过" : cellvalue == "0" ? "草稿" : "";
+ }
+ },
],
mainId: 'Id',
isPage: true,
- sidx: 'CreateTime desc'
+ sidx: 'CreateTimeInLeave desc'
});
page.search();
},
search: function (param) {
param = param || {};
+ param.CreateUserIdInLeave = learun.clientdata.get(['userinfo']).userId; //登录用户的已审核通过的请假单
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementEntity.cs
index 9607f8fe8..6df61fa0d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementEntity.cs
@@ -74,6 +74,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
///
[Column("REMARK")]
public string Remark { get; set; }
+ ///
+ /// 销假请假单Id
+ ///
+ [Column("LEAVEID")]
+ public string LeaveId { get; set; }
#endregion
#region 扩展操作
@@ -94,6 +99,56 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
}
#endregion
#region 扩展字段
+ ///
+ /// Id
+ ///
+ [NotMapped]
+ public string IdInLeave { get; set; }
+ ///
+ /// 请假类型
+ ///
+ [NotMapped]
+ public string LeaveType { get; set; }
+ ///
+ /// 请假开始时间
+ ///
+ [NotMapped]
+ public DateTime? StartTime { get; set; }
+ ///
+ /// 请假结束时间
+ ///
+ [NotMapped]
+ public DateTime? EndTime { get; set; }
+ ///
+ /// 请假天数
+ ///
+ [NotMapped]
+ public string LeaveDay { get; set; }
+ ///
+ /// 请假事由
+ ///
+ [NotMapped]
+ public string LeaveReason { get; set; }
+ ///
+ /// 联系电话
+ ///
+ [NotMapped]
+ public string Telephone { get; set; }
+ ///
+ /// 申请人
+ ///
+ [NotMapped]
+ public string CreateUserIdInLeave { get; set; }
+ ///
+ /// 申请时间
+ ///
+ [NotMapped]
+ public DateTime? CreateTimeInLeave { get; set; }
+ ///
+ /// 审核状态（0草稿，1审核中，2审核通过，3,审核不通过）
+ ///
+ [NotMapped]
+ public string CheckStatusInLeave { get; set; }
#endregion
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementService.cs
index 07c18835a..daba8fea1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCancelLeaveManagement/TeacherCancelLeaveManagementService.cs
@@ -30,21 +30,37 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
try
{
var strSql = new StringBuilder();
- strSql.Append("SELECT t.* ");
- strSql.Append(" FROM TeacherCancelLeaveManagement t ");
- strSql.Append(" WHERE 1=1 ");
+ strSql.Append("SELECT t.Id as IdInLeave,t.LeaveType,t.StartTime,t.EndTime,t.LeaveDay,t.LeaveReason,t.Telephone,t.CreateUserId as CreateUserIdInLeave,t.CreateTime as CreateTimeInLeave,t.CheckStatus as CheckStatusInLeave,t2.* ");
+ strSql.Append(" FROM TeacherLeaveManagement t ");
+ strSql.Append(" left join TeacherCancelLeaveManagement t2 on t.Id=t2.LeaveId ");
+ strSql.Append(" WHERE 1=1 and t.CheckStatus='2' ");
var queryParam = queryJson.ToJObject();
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!queryParam["CancelLeaveType"].IsEmpty())
{
dp.Add("CancelLeaveType",queryParam["CancelLeaveType"].ToString(), DbType.String);
- strSql.Append(" AND t.CancelLeaveType = @CancelLeaveType ");
+ strSql.Append(" AND t2.CancelLeaveType = @CancelLeaveType ");
}
if (!queryParam["CreateUserId"].IsEmpty())
{
dp.Add("CreateUserId",queryParam["CreateUserId"].ToString(), DbType.String);
- strSql.Append(" AND t.CreateUserId = @CreateUserId ");
+ strSql.Append(" AND t2.CreateUserId = @CreateUserId ");
+ }
+ if (!queryParam["LeaveType"].IsEmpty())
+ {
+ dp.Add("LeaveType", queryParam["LeaveType"].ToString(), DbType.String);
+ strSql.Append(" AND t.LeaveType = @LeaveType ");
+ }
+ if (!queryParam["Telephone"].IsEmpty())
+ {
+ dp.Add("Telephone", "%" + queryParam["Telephone"].ToString() + "%", DbType.String);
+ strSql.Append(" AND t.Telephone Like @Telephone ");
+ }
+ if (!queryParam["CreateUserIdInLeave"].IsEmpty())
+ {
+ dp.Add("CreateUserIdInLeave", queryParam["CreateUserIdInLeave"].ToString(), DbType.String);
+ strSql.Append(" AND t.CreateUserId = @CreateUserIdInLeave ");
}
return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination);
}