备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js
index dc23b2a78..55ef9d04f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js
@@ -72,6 +72,9 @@ var bootstrap = function ($, learun) {
},
bind: function () {
$('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
+ $('#StuPlaceCode').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname' });
+ $('#IsArchives').lrDataItemSelect({ code: 'YesOrNoInt' });
+ $('#PieceCultivateWay').lrDataItemSelect({ code: 'EducationLevel' });
$('#F_ProvinceId').lrDataSourceSelect({
code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
select: function (item) {
@@ -119,7 +122,7 @@ var bootstrap = function ($, learun) {
value: 'value',
text: 'text'
});
- $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
+ $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
$('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
$('#NationalityNo').lrDataItemSelect({ code: 'National' });
$('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
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 f6436a682..ee8d095a3 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
@@ -235,10 +235,8 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
headData: [
- { label: "学号", name: "StuNo", width: 100, align: "left" },
- //{ label: "学籍号", name: "StuCode", width: 100, align: "left" },
{ label: "考生号", name: "ksh", width: 100, align: "left" },
- { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
+ { label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -334,14 +332,39 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+ //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
//{ label: "余额", name: "Balance", width: 100, align: "left" },
{ label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
{ label: "联系电话", name: "mobile", width: 100, align: "left" },
- { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
- { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+ {
+ label: "生源地", name: "StuPlaceCode", width: 100, 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: "FatherUnit", width: 100, align: "left" },
+ //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
{ label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
+ {
+ label: "档案是否自带", name: "IsArchives", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'YesOrNoInt',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
{
label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -393,6 +416,7 @@ var bootstrap = function ($, learun) {
});
}
},
+ { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
//{ label: "E-mail", name: "E-mail", width: 100, align: "center" },
{
label: "开户银行", name: "DepositBank", width: 100, align: "center",
@@ -408,32 +432,31 @@ var bootstrap = function ($, learun) {
},
{ label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
{ label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
- { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
- {
- label: "是否单亲", name: "IsSingle", width: 100, align: "left",
- formatter: function (value, row) {
- if (value == true) {
- return '是';
- }
- else if (value == false) {
- return '否';
- }
- }
- },
+ //{
+ // label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+ // formatter: function (value, row) {
+ // if (value == true) {
+ // return '是';
+ // }
+ // else if (value == false) {
+ // return '否';
+ // }
+ // }
+ //},
{ label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
{ label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
{ label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
- { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
- { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+ //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+ //{ label: "现住址", name: "OneAddress", width: 100, align: "center" },
{ label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
{ label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
{ label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
- { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
- { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+ //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+ //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" },
{ label: "监护人姓名", name: "GuardianName", width: 100, align: "center" },
{ label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" },
{ label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" },
- { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
+ //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
{ label: "现住址", name: "GuardianAddress", width: 100, align: "center" },
{
label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
@@ -460,24 +483,37 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "本专科", name: "GraduateNo", width: 100, align: "center",
+ label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'CollegeType',
+ code: 'EducationLevel',
callback: function (_data) {
callback(_data.text);
}
});
}
},
- { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+
+ //{
+ // label: "本专科", name: "GraduateNo", width: 100, align: "center",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('dataItem', {
+ // key: value,
+ // code: 'CollegeType',
+ // callback: function (_data) {
+ // callback(_data.text);
+ // }
+ // });
+ // }
+ //},
{
label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
+ { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
{ label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
//{
// label: "入党时间", name: "BankCard", width: 100, align: "center",
@@ -491,10 +527,10 @@ var bootstrap = function ($, learun) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
- { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
- { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
- { label: "QQ", name: "QQ", width: 100, align: "center" },
- { label: "特长", name: "GoodAt", width: 100, align: "center" },
+ //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+ //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+ //{ label: "QQ", name: "QQ", width: 100, align: "center" },
+ //{ label: "特长", name: "GoodAt", width: 100, align: "center" },
{ label: "备注", name: "Remark", width: 200, align: "center" },
{
label: "异动状态", name: "MoveStatus", width: 80, align: "center",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js
index d59f83dd8..b3bcae8d6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js
@@ -235,10 +235,8 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
headData: [
- { label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "学籍号", name: "StuCode", width: 100, align: "left" },
- //{ label: "考生号", name: "ksh", width: 100, align: "left" },
- { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
+ { label: "学号", name: "StuNo", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -334,14 +332,39 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+ //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
//{ label: "余额", name: "Balance", width: 100, align: "left" },
{ label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
{ label: "联系电话", name: "mobile", width: 100, align: "left" },
- { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
- { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+ {
+ label: "生源地", name: "StuPlaceCode", width: 100, 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: "FatherUnit", width: 100, align: "left" },
+ //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
{ label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
+ {
+ label: "档案是否自带", name: "IsArchives", width: 100, align: "left",
+ formatterAsync: function (callback, value, row, op, $cell) {
+ learun.clientdata.getAsync('dataItem', {
+ key: value,
+ code: 'YesOrNoInt',
+ callback: function (_data) {
+ callback(_data.text);
+ }
+ });
+ }
+ },
{
label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
@@ -393,6 +416,7 @@ var bootstrap = function ($, learun) {
});
}
},
+ { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
//{ label: "E-mail", name: "E-mail", width: 100, align: "center" },
{
label: "开户银行", name: "DepositBank", width: 100, align: "center",
@@ -408,32 +432,31 @@ var bootstrap = function ($, learun) {
},
{ label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
{ label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
- { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
- {
- label: "是否单亲", name: "IsSingle", width: 100, align: "left",
- formatter: function (value, row) {
- if (value == true) {
- return '是';
- }
- else if (value == false) {
- return '否';
- }
- }
- },
+ //{
+ // label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+ // formatter: function (value, row) {
+ // if (value == true) {
+ // return '是';
+ // }
+ // else if (value == false) {
+ // return '否';
+ // }
+ // }
+ //},
{ label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
{ label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
{ label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
- { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
- { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+ //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+ //{ label: "现住址", name: "OneAddress", width: 100, align: "center" },
{ label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
{ label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
{ label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
- { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
- { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+ //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+ //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" },
{ label: "监护人姓名", name: "GuardianName", width: 100, align: "center" },
{ label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" },
{ label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" },
- { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
+ //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
{ label: "现住址", name: "GuardianAddress", width: 100, align: "center" },
{
label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
@@ -460,24 +483,36 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "本专科", name: "GraduateNo", width: 100, align: "center",
+ label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
- code: 'CollegeType',
+ code: 'EducationLevel',
callback: function (_data) {
callback(_data.text);
}
});
}
},
- { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+ //{
+ // label: "本专科", name: "GraduateNo", width: 100, align: "center",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('dataItem', {
+ // key: value,
+ // code: 'CollegeType',
+ // callback: function (_data) {
+ // callback(_data.text);
+ // }
+ // });
+ // }
+ //},
{
label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
+ { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
{ label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
//{
// label: "入党时间", name: "BankCard", width: 100, align: "center",
@@ -491,10 +526,10 @@ var bootstrap = function ($, learun) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
- { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
- { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
- { label: "QQ", name: "QQ", width: 100, align: "center" },
- { label: "特长", name: "GoodAt", width: 100, align: "center" },
+ //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+ //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+ //{ label: "QQ", name: "QQ", width: 100, align: "center" },
+ //{ label: "特长", name: "GoodAt", width: 100, align: "center" },
{ label: "备注", name: "Remark", width: 200, align: "center" },
{
label: "异动状态", name: "MoveStatus", width: 80, align: "center",
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 5b84f0ab5..a9e1f5794 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
@@ -377,6 +377,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("MATHERNAME")]
public string MatherName { get; set; }
///
+ /// 档案是否自带
+ ///
+ [Column("ISARCHIVES")]
+ public string IsArchives { get; set; }
+ ///
/// 档案所在地
///
[Column("MATHERUNIT")]