【修改】财政、公益、外聘工资条：表单加必填验证，年份月份回显；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OuoutsourcingController.cs

@@ -82,8 +82,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var data = ououtsourcingIBLL.GetEntity(keyValue);
-            return Success(data);
+            var OuoutsourcingData = ououtsourcingIBLL.GetEntity(keyValue);
+            var jsonData = new
+            {
+                Ououtsourcing = OuoutsourcingData,
+            };
+            return Success(jsonData);
         }
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WageScheduleController.cs

@@ -82,8 +82,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var data = wageScheduleIBLL.GetEntity(keyValue);
-            return Success(data);
+            var WageScheduleData = wageScheduleIBLL.GetEntity(keyValue);
+            var jsonData = new
+            {
+                WageSchedule = WageScheduleData,
+            };
+            return Success(jsonData);
         }
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs

@@ -82,8 +82,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var data = welfarePositionIBLL.GetEntity(keyValue);
-            return Success(data);
+            var WelfarePositionData = welfarePositionIBLL.GetEntity(keyValue);
+            var jsonData = new
+            {
+                WelfarePosition = WelfarePositionData,
+            };
+            return Success(jsonData);
         }
         #endregion
 

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

@@ -12,8 +12,8 @@
         <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>
-        <input id="IdCardNo" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="IdCardNo" 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>

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

@@ -25,8 +25,21 @@ var bootstrap = function ($, learun) {
             $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
         },
         initData: function () {
-            if (!!selectedRow) {
-                $('#form').lrSetFormData(selectedRow);
+            //if (!!selectedRow) {
+            //    $('#form').lrSetFormData(selectedRow);
+            //}
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Ououtsourcing/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]);
+                            $('#form').lrSetFormData(data[id]);
+                        }
+                    }
+                });
             }
         }
     };

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

@@ -12,8 +12,8 @@
         <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>
-        <input id="IdCardNo" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="IdCardNo" 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>

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

@@ -9,6 +9,7 @@ var keyValue = request('keyValue');
 var bootstrap = function ($, learun) {
     "use strict";
     var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    console.log(selectedRow);
     var page = {
         init: function () {
             page.initData();
@@ -25,8 +26,21 @@ var bootstrap = function ($, learun) {
             $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
         },
         initData: function () {
-            if (!!selectedRow) {
-                $('#form').lrSetFormData(selectedRow);
+            //if (!!selectedRow) {
+            //    $('#form').lrSetFormData(selectedRow);
+            //}
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/WageSchedule/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]);
+                            $('#form').lrSetFormData(data[id]);
+                        }
+                    }
+                });
             }
         }
     };

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

@@ -12,8 +12,8 @@
         <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>
-        <input id="IdCardNo" type="text" class="form-control" />
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="IdCardNo" 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>

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

@@ -25,8 +25,21 @@ var bootstrap = function ($, learun) {
             $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
         },
         initData: function () {
-            if (!!selectedRow) {
-                $('#form').lrSetFormData(selectedRow);
+            //if (!!selectedRow) {
+            //    $('#form').lrSetFormData(selectedRow);
+            //}
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/WelfarePosition/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]);
+                            $('#form').lrSetFormData(data[id]);
+                        }
+                    }
+                });
             }
         }
     };