From 430e3f4fe72f13b04981d12690184f758ff1d784 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 24 Nov 2022 15:15:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=85=AC=E7=9B=8A=E6=80=A7=E5=B2=97=E4=BD=8D=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WelfarePosition/WelfarePositionEntity.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..7587fd039 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 /// From 1c2771650b876c39ace3f35390192a40497e3489 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 24 Nov 2022 15:26:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E6=9D=A1=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/EducationalAdministration/Views/Ououtsourcing/Index.js | 1 + .../Areas/EducationalAdministration/Views/WageSchedule/Index.js | 1 + .../EducationalAdministration/Views/WelfarePosition/Index.js | 1 + 3 files changed, 3 insertions(+) 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/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js index d781932b5..5cbb7a612 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 @@ -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/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(); }); } }); From c113956a22d21547e3d11682eed02307c5a0d18c Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 24 Nov 2022 16:04:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=BA=E4=BA=8B--=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E6=9D=A1=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ououtsourcing/Form.cshtml | 12 ++++++------ .../Views/Ououtsourcing/Form.js | 9 +++++++++ .../Views/WageSchedule/Form.cshtml | 18 ++++++++++-------- .../Views/WageSchedule/Form.js | 9 +++++++++ .../Views/WageSchedule/Index.js | 8 ++++---- .../Views/WelfarePosition/Form.cshtml | 12 ++++++------ .../Views/WelfarePosition/Form.js | 9 +++++++++ .../Ououtsourcing/OuoutsourcingEntity.cs | 2 ++ .../WageSchedule/WageScheduleEntity.cs | 2 ++ .../WelfarePosition/WelfarePositionEntity.cs | 2 ++ 10 files changed, 59 insertions(+), 24 deletions(-) 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 @@
-
姓名
- +
姓名*
+
身份证号
@@ -128,12 +128,12 @@
-
发放年份
- +
发放年份*
+
-
发放月份
- +
发放月份*
+
@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/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 @@
-
姓名
- +
姓名*
+
身份证号
@@ -96,8 +96,8 @@
-
特级教师津贴和乡镇补贴
- +
特级教师津贴和乡镇补贴
+
扣款小计
@@ -152,12 +152,14 @@
-
发放月份
- +
发放年份*
+
+ @**@
-
发放年份
- +
发放月份*
+
+ @**@
@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 5cbb7a612..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); } 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 @@
-
姓名
- +
姓名*
+
身份证号
@@ -128,12 +128,12 @@
-
发放年份
- +
发放年份*
+
-
发放月份
- +
发放月份*
+
@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.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 7587fd039..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 @@ -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; } /// /// 编辑调用