Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Ououtsourcing/Form.cshtml

@@ -8,8 +8,8 @@
         <input id="No" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">姓名</div>
-        <input id="EmpName" type="text" class="form-control" />
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="EmpName" type="text" class="form-control"   isvalid="yes" checkexpession="NotNull"/>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">身份证号</div>
@@ -128,12 +128,12 @@
         <input id="NetCombined" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放年份</div>
-        <input id="IssueYear" type="text" class="form-control" />
+        <div class="lr-form-item-title">发放年份<font face="宋体">*</font></div>
+        <div id="IssueYear" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放月份</div>
-        <input id="IssueMonth" type="text" class="form-control" />
+        <div class="lr-form-item-title">发放月份<font face="宋体">*</font></div>
+        <div id="IssueMonth" isvalid="yes" checkexpession="NotNull"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Ououtsourcing/Form.js")

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) {

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();
                             });
                         }
                     });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml

@@ -8,8 +8,8 @@
         <input id="No" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">姓名</div>
-        <input id="EmpName" type="text" class="form-control" />
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="EmpName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">身份证号</div>
@@ -96,8 +96,8 @@
         <input id="HousingFundAllowance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">特级教师津贴和乡镇补贴</div>
-        <input id="TeacherAndTown" type="text" class="form-control" />
+        <div class="lr-form-item-title" style="width: 40%;">特级教师津贴和乡镇补贴</div>
+        <input id="TeacherAndTown" type="text" class="form-control" style="width: 80%; float: right;" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">扣款小计</div>
@@ -152,12 +152,14 @@
         <input id="WageCardNo" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放月份</div>
-        <input id="IssueMonth" type="text" class="form-control" />
+        <div class="lr-form-item-title">发放年份<font face="宋体">*</font></div>
+        <div id="IssueYear" isvalid="yes" checkexpession="NotNull"></div>
+        @*<input id="IssueYear" type="number" class="form-control" checkexpession="NotNull" />*@
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放年份</div>
-        <input id="IssueYear" type="text" class="form-control" />
+        <div class="lr-form-item-title">发放月份<font face="宋体">*</font></div>
+        <div id="IssueMonth" isvalid="yes" checkexpession="NotNull"></div>
+        @*<input id="IssueMonth" type="number" class="form-control" checkexpession="NotNull" />*@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/WageSchedule/Form.js")

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) {

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();
                             });
                         }
                     });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfarePosition/Form.cshtml

@@ -8,8 +8,8 @@
         <input id="No" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">姓名</div>
-        <input id="EmpName" type="text" class="form-control" />
+        <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
+        <input id="EmpName" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull"/>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">身份证号</div>
@@ -128,12 +128,12 @@
         <input id="NetCombined" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放年份</div>
-        <input id="IssueYear" type="text" class="form-control" />
+        <div class="lr-form-item-title">发放年份<font face="宋体">*</font></div>
+        <div id="IssueYear" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放月份</div>
-        <input id="IssueMonth" type="text" class="form-control" />
+        <div class="lr-form-item-title">发放月份<font face="宋体">*</font></div>
+        <div id="IssueMonth" isvalid="yes" checkexpession="NotNull"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/WelfarePosition/Form.js")

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) {

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();
                             });
                         }
                     });

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;
         }
         /// <summary>
         /// 编辑调用

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;
         }
         /// <summary>
         /// 编辑调用

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
         /// </summary>
         /// <returns></returns>
         [Column("ISSUEYEAR")]
-        public DateTime? IssueYear { get; set; }
+        public string IssueYear { get; set; }
         /// <summary>
         /// CreateUser
         /// </summary>
@@ -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;
         }
         /// <summary>
         /// 编辑调用