From e118e042f63a7b9654dffe210b72e391db98afcd Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 29 Jun 2022 11:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E7=94=9F--=E6=96=B0=E7=94=9F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoFresh/Form.cshtml | 42 +++++++--- .../Views/StuInfoFresh/Form.js | 34 +++++++- .../Views/StuInfoFresh/Index.js | 41 +++++++++- .../StuInfoFresh/StuInfoFreshEntity.cs | 20 +++++ .../StuInfoFresh/StuInfoFreshService.cs | 80 +------------------ 5 files changed, 122 insertions(+), 95 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml index ede79a9a1..276cace84 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml @@ -33,7 +33,23 @@
-
系所号
+
生源地
+
+
+
+
疆内
+
+
+
+
毕业学校
+ +
+
+
毕业生类型
+
+
+
+
院系
@@ -129,18 +145,18 @@
精准贫困户
-
-
开户银行*
-
-
-
-
银行卡账号*
- -
-
-
开户银行位置
- -
+
+
开户银行*
+
+
+
+
银行卡账号*
+ +
+
+
开户银行位置
+ +
拍照
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index cc3d59d23..c0321d48e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); + $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); @@ -26,7 +26,37 @@ var bootstrap = function ($, learun) { $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' }); - + $('#GraduateType').lrDataItemSelect({ code: 'GraduateType' }); + $('#Province').lrselect({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE', + //param: { strWhere: " cparent= 650000 " }, + value: 'pcode', + text: 'pname', + maxHeight: 200, + allowSearch: true, + select: function (item) { + var Citys = $("#Province").lrselectGet(); + if (Citys != null && Citys != "" && Citys != undefined) { + $('#City').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY', + param: { strWhere: " 1=1 and cparent in (" + Citys + ")" }, + allowSearch: true, + value: "ccode", + text: "cname", + maxHeight: 200 + }); + } else { + $('#City').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY', + param: { strWhere: " 1=1 and cparent ='' " }, + value: "ccode", + text: "cname", + maxHeight: 200 + }); + } + } + }) + $("#City").lrselect(); $('#StuInfoFreshFamily').jfGrid({ headData: [ { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js index b22d61222..a4189854f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js @@ -199,7 +199,7 @@ var bootstrap = function ($, learun) { } }, { - label: '系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + label: '院系', name: 'DeptNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', key: value, @@ -279,6 +279,45 @@ var bootstrap = function ($, learun) { }); } }, + { + label: '生源地', name: 'Province', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE', + key: value, + keyId: 'pcode', + callback: function (_data) { + callback(_data['pname']); + } + }); + } + }, + { + label: '疆内', name: 'City', width: 150, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY', + key: value, + keyId: 'ccode', + callback: function (_data) { + callback(_data['cname']); + } + }); + } + }, + { label: '毕业学校', name: 'SchoolTag', width: 100, align: "left" }, + { + label: '毕业生类型', name: 'GraduateType', width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'GraduateType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: '科类', name: 'TestStuSubjectNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs index 01055cb7a..1dbafdf7c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs @@ -619,6 +619,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("BANKLOCATION")] public string BankLocation { get; set; } + /// + /// 生源地 + /// + [Column("PROVINCE")] + public string Province { get; set; } + /// + /// 疆内 + /// + [Column("CITY")] + public string City { get; set; } + /// + /// 毕业学校 + /// + [Column("SCHOOLTAG")] + public string SchoolTag { get; set; } + /// + /// 毕业生类别 + /// + [Column("GRADUATETYPE")] + public string GraduateType { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index d98219818..64b293b98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -28,85 +28,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration private string fieldSql; public StuInfoFreshService() { - fieldSql = @" - t.ID, - t.NoticeNo, - t.ksh, - t.zkzh, - t.StuNo, - t.StuName, - t.DeptNo, - t.GenderNo, - t.MajorNo, - t.MajorDetailNok, - t.MajorDetailName, - t.Birthday, - t.PartyFaceNo, - t.FamilyOriginNo, - t.NationalityNo, - t.ResidenceNo, - t.TestStuSortNo, - t.HealthStatusNo, - t.WillNo, - t.TestStuSubjectNo, - t.GraduateNo, - t.PlanFormNo, - t.HighTestSortNo, - t.HighAmountScore, - t.PoliticsScore, - t.ChineseScore, - t.MathScore, - t.PhysicsScore, - t.ChemScore, - t.BiologyScore, - t.ForeignLangScore, - t.ForeignLangOralScore, - t.ComprehensiveScore, - t.ForeignLangSpecies, - t.IsThreeGood, - t.IsExcellent, - t.IsNormalCadre, - t.IsProvinceFirstThree, - t.OverseasChineseNo, - t.MatriculateSort, - t.ProvinceNo, - t.HighSchoolNo, - t.RegionNo, - t.Remark, - t.RecruitYearDate, - t.ClassNo, - t.IdentityCardNo, - t.HighSchoolName, - t.GoodAt, - t.ArriveDate, - t.ArchivesNo, - t.telephone, - t.FamilyAddress, - t.RegisterStatus, - t.MailAddress, - t.PostalCode, - t.TransMark, - t.LogIp, - t.LogNum, - t.Logtime, - t.RecruitDeptNo, - t.RecruitMajorNo, - t.RegisterEmpNo, - t.RegisterEmpName, - t.ApprovedLeader, - t.ChangeReason, - t.ChangeDate, - t.TextNo, - t.SignUpTime, - t.OriginAddress, - t.IsAccommodate, - t.HeightWeight, - t.CreateUserId, - t.UpdateUserId, - t.IsPayUniform, - t.IsGetUniform, - t.Grade - "; + fieldSql = @" * "; } #endregion