From 5fad8e905d4a9c4b8425e2c4be8d49baa4c7daba Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 25 Nov 2022 15:39:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=B4=A2?= =?UTF-8?q?=E6=94=BF=E3=80=81=E5=85=AC=E7=9B=8A=E3=80=81=E5=A4=96=E8=81=98?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E6=9D=A1=EF=BC=9A=E8=A1=A8=E5=8D=95=E5=8A=A0?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=AA=8C=E8=AF=81=EF=BC=8C=E5=B9=B4=E4=BB=BD?= =?UTF-8?q?=E6=9C=88=E4=BB=BD=E5=9B=9E=E6=98=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/OuoutsourcingController.cs | 8 ++++++-- .../Controllers/WageScheduleController.cs | 8 ++++++-- .../Controllers/WelfarePositionController.cs | 8 ++++++-- .../Views/Ououtsourcing/Form.cshtml | 4 ++-- .../Views/Ououtsourcing/Form.js | 17 +++++++++++++++-- .../Views/WageSchedule/Form.cshtml | 4 ++-- .../Views/WageSchedule/Form.js | 18 ++++++++++++++++-- .../Views/WelfarePosition/Form.cshtml | 4 ++-- .../Views/WelfarePosition/Form.js | 17 +++++++++++++++-- 9 files changed, 70 insertions(+), 18 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OuoutsourcingController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OuoutsourcingController.cs index e5b424a3d..eaa48e33c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OuoutsourcingController.cs +++ b/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 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WageScheduleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WageScheduleController.cs index 7721703d0..e81f03a92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WageScheduleController.cs +++ b/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 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs index 04f306ced..da46762d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WelfarePositionController.cs +++ b/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 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 989e7afd8..e1ea38cff 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 @@ -12,8 +12,8 @@
-
身份证号
- +
身份证号*
+
工资卡号
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 653bed249..ae8e94b09 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 @@ -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]); + } + } + }); } } }; 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 700f008aa..6cbca223d 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 @@ -12,8 +12,8 @@
-
身份证号
- +
身份证号*
+
人员类别
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 e4ce479f1..a787df44b 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 @@ -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]); + } + } + }); } } }; 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 c33af50e2..98321e2c3 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 @@ -12,8 +12,8 @@
-
身份证号
- +
身份证号*
+
工资卡号
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 fd69307b5..7b0b05d18 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 @@ -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]); + } + } + }); } } };