diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.cshtml
index 6bb338887..989e7afd8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.cshtml
@@ -8,8 +8,8 @@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Ououtsourcing/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.js
index c5af70c61..653bed249 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.js
@@ -12,8 +12,17 @@ var bootstrap = function ($, learun) {
var page = {
init: function () {
page.initData();
+ page.bind();
},
bind: function () {
+ //年份
+ $('#IssueYear').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
+ value: 'value',
+ text: 'text'
+ });
+ $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
},
initData: function () {
if (!!selectedRow) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Index.js
index eba92cf8c..41c444a35 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Index.js
@@ -67,6 +67,7 @@ var bootstrap = function ($, learun) {
learun.layerConfirm('是否确认删除该项!', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Ououtsourcing/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
});
}
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml
index f025d5a75..700f008aa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml
@@ -8,8 +8,8 @@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WageSchedule/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.js
index 591dd67b3..e4ce479f1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.js
@@ -12,8 +12,17 @@ var bootstrap = function ($, learun) {
var page = {
init: function () {
page.initData();
+ page.bind();
},
bind: function () {
+ //年份
+ $('#IssueYear').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
+ value: 'value',
+ text: 'text'
+ });
+ $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
},
initData: function () {
if (!!selectedRow) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js
index d781932b5..9b5f02360 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js
@@ -36,8 +36,8 @@ var bootstrap = function ($, learun) {
id: 'form',
title: '新增',
url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/Form',
- width: 700,
- height: 400,
+ width: 800,
+ height: 800,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -52,8 +52,8 @@ var bootstrap = function ($, learun) {
id: 'form',
title: '编辑',
url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/Form?keyValue=' + keyValue,
- width: 700,
- height: 400,
+ width: 800,
+ height: 800,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}
@@ -67,6 +67,7 @@ var bootstrap = function ($, learun) {
learun.layerConfirm('是否确认删除该项!', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/WageSchedule/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
});
}
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml
index ab99bdcb2..c33af50e2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml
@@ -8,8 +8,8 @@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WelfarePosition/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js
index 6b5a8416d..fd69307b5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.js
@@ -12,8 +12,17 @@ var bootstrap = function ($, learun) {
var page = {
init: function () {
page.initData();
+ page.bind();
},
bind: function () {
+ //年份
+ $('#IssueYear').lrselect({
+ allowSearch: true,
+ url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
+ value: 'value',
+ text: 'text'
+ });
+ $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
},
initData: function () {
if (!!selectedRow) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js
index 33b23bcca..00cbb09dd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Index.js
@@ -67,6 +67,7 @@ var bootstrap = function ($, learun) {
learun.layerConfirm('是否确认删除该项!', function (res) {
if (res) {
learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/WelfarePosition/DeleteForm', { keyValue: keyValue }, function () {
+ refreshGirdData();
});
}
});
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingEntity.cs
index 0a1d86a58..cd82313a5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Ououtsourcing/OuoutsourcingEntity.cs
@@ -251,6 +251,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public void Create()
{
this.WPID = Guid.NewGuid().ToString();
+ this.CreateTime = DateTime.Now;
+ this.CreateUser = LoginUserInfo.Get().userId;
}
///
/// 编辑调用
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleEntity.cs
index 2851a3904..763e5b20d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleEntity.cs
@@ -287,6 +287,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public void Create()
{
this.Id = Guid.NewGuid().ToString();
+ this.CreateTime = DateTime.Now;
+ this.CreateUser = LoginUserInfo.Get().userId;
}
///
/// 编辑调用
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs
index 0c988549f..31133d6d6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WelfarePosition/WelfarePositionEntity.cs
@@ -217,7 +217,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
///
[Column("ISSUEYEAR")]
- public DateTime? IssueYear { get; set; }
+ public string IssueYear { get; set; }
///
/// CreateUser
///
@@ -251,6 +251,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public void Create()
{
this.GYID = Guid.NewGuid().ToString();
+ this.CreateTime=DateTime.Now;
+ this.CreateUser = LoginUserInfo.Get().userId;
}
///
/// 编辑调用