From a98115dc9c4bd39fae3616b95dfc025c928fc659 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 15 Apr 2022 15:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.js | 88 ++++++++++++++++++- .../StuInfoBasic/StuInfoBasicEntity.cs | 16 ++++ 2 files changed, 102 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 184fb3287..e2a4f12d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -463,10 +463,94 @@ var bootstrap = function ($, learun) { if (cellvalue != null && cellvalue != "" && cellvalue != undefined) { return cellvalue = "是"; } else { - return cellvalue= "否"; + return cellvalue = "否"; } } - } + }, + { label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: true }, + { label: "就读方式", name: "StudyingWay", width: 100, align: "left", ishide: true }, + { + label: "国籍", name: "CountryNo", width: 100, align: "left", ishide: true, + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'BCdCountry', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: true, + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'BCdOverseasChinese', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: true, + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'BCdOverseasChinese', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true,}, + { label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left" ,ishide: true, }, + { label: "生源地行政区划码", n联系电话ame: "StuPlaceCode", width: 100, align: "left" ,ishide: true, }, + { label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left" ,ishide: true, }, + { label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left" ,ishide: true, }, + { label: "所属派出所", name: "BelongPolice", width: 100, align: "left" ,ishide: true, }, + { label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left" ,ishide: true, }, + { label: "是否农户", name: "ResidenceNo", width: 100, align: "left" ,ishide: true, }, + { label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left" ,ishide: true, }, + { label: "健康状况", name: "HealthStatusNo", width: 100, align: "left" ,ishide: true, }, + { label: "学生来源", name: "StuOrigin", width: 100, align: "left" ,ishide: true, }, + { label: "招生对象", name: "RecruitObject", width: 100, align: "left" ,ishide: true, }, + { label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left" ,ishide: true, }, + { label: "招生方式", name: "RecruitWay", width: 100, align: "left" ,ishide: true, }, + { label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left" ,ishide: true, }, + { label: "准考证号", name: "AdmissionNo", width: 100, align: "left" ,ishide: true, }, + { label: "考生号", name: "ksh", width: 100, align: "left" ,ishide: true, }, + { label: "考试总分", name: "ExamScore", width: 100, align: "left" ,ishide: true, }, + { label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left" ,ishide: true, }, + { label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left" ,ishide: true, }, + { label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left" ,ishide: true, }, + { label: "英文姓名", name: "EnglishName", width: 100, align: "left" ,ishide: true, }, + { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left" ,ishide: true, }, + { label: "其他联系方式", name: "OtherContact", width: 100, align: "left" ,ishide: true, }, + { label: "成员1姓名", name: "OneName", width: 100, align: "left" ,ishide: true, }, + { label: "成员1关系", name: "OneMembership", width: 100, align: "left" ,ishide: true, }, + { label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left" ,ishide: true, }, + { label: "成员1联系电话", name: "PieceCultivateWay", width: 100, align: "left" ,ishide: true, }, + { label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left" ,ishide: true, }, + { label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left" ,ishide: true, }, + { label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left" ,ishide: true, }, + { label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left" ,ishide: true, }, + { label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left" ,ishide: true, }, + { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left" ,ishide: true, }, + { label: "成员2职务", name: "TwoPosition", width: 100, align: "left" ,ishide: true, }, + { label: "成员2姓名", name: "TwoName", width: 100, align: "left" ,ishide: true, }, + { label: "成员2关系", name: "TwoMembership", width: 100, align: "left" ,ishide: true, }, + { label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left" ,ishide: true, }, + { label: "成员2联系电话", name: "PieceCultivateWay", width: 100, align: "left" ,ishide: true, }, + { label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left" ,ishide: true, }, + { label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left" ,ishide: true, }, + { label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left" ,ishide: true, }, + { label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left" ,ishide: true, }, + { label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left" ,ishide: true, }, + { label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left" ,ishide: true, }, + { label: "成员2职务", name: "TwoPosition", width: 100, align: "left" ,ishide: true, }, ], mainId: 'StuId', diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 483a17480..79a9b2230 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -773,6 +773,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("ISRESTUDY")] public string IsRestudy { get; set; } + + /// + /// 成员1名称 + /// + [Column("OneName")] + public string OneName { get; set; } + /// + /// 成员2名称 + /// + [Column("TWONAME")] + public string TwoName { get; set; } + /// + /// 其他联系方式 + /// + [Column("OTHERCONTACT")] + public string OtherContact { get; set; } #endregion #region 扩展操作