diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js
index 50edc142d..c1151eacb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollOfficial/Index.js
@@ -15,18 +15,53 @@ var bootstrap = function ($, learun) {
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
- }, 220, 400);
+ }, 350, 450);
$('#Gender').lrRadioCheckbox({
type: 'radio',
code: 'usersex',
});
$('#Nationals').lrDataItemSelect({ code: 'National' });
$('#Province').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname' });
- $('#MajorNo1').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+ $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
$('#StuType').lrDataItemSelect({ code: 'ExamineeType_tlm' });
- $('#HomeProvince').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname' });
- $('#HomeCity').lrDataSourceSelect({ code: 'DIC_CITY', value: 'ccode', text: 'cname' });
- $('#HomeCounty').lrDataSourceSelect({ code: 'DIC_AREA', value: 'acode', text: 'aname' });
+ $('#GraduateType').lrDataItemSelect({ code: 'StuGraduateType' });
+ $('#HomeProvince').lrDataSourceSelect({
+ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
+ select: function(item) {
+ if (!!item) {
+ var code = $("#HomeProvince").lrselectGet();
+
+ $('#HomeCity').lrselectRefresh({
+ allowSearch: true,
+ //type: 'multiple',
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY',
+ param: { strWhere: "1=1 and charindex(cparent,('" + code + "'))>0 " },
+ value: "ccode",
+ text: "cname",
+ maxHeight: 200,
+ select: function (item) {
+ if (!!item) {
+ var code = $("#HomeCity").lrselectGet();
+
+ $('#HomeCounty').lrselectRefresh({
+ allowSearch: true,
+ //type: 'multiple',
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
+ param: { strWhere: "1=1 and charindex(aparent,('" + code + "'))>0 " },
+ value: "acode",
+ text: "aname",
+ maxHeight: 200,
+ });
+ }
+ }
+ });
+ }
+ }
+ });
+ $('#HomeCity').lrselect();
+ $('#HomeCounty').lrselect();
+ //$('#HomeCity').lrDataSourceSelect({ code: 'DIC_CITY', value: 'ccode', text: 'cname' });
+ //$('#HomeCounty').lrDataSourceSelect({ code: 'DIC_AREA', value: 'acode', text: 'aname' });
$('#IsAdjust').lrRadioCheckbox({
type: 'radio',
code: 'YesOrNoInt',
@@ -183,59 +218,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "报考专业（一）", name: "MajorNo1", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- key: value,
- keyId: 'majorno',
- callback: function (_data) {
- callback(_data['majorname']);
- }
- });
- }
- },
- {
- label: "报考专业（二）", name: "MajorNo2", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- key: value,
- keyId: 'majorno',
- callback: function (_data) {
- callback(_data['majorname']);
- }
- });
- }
- },
- {
- label: "报考专业（三）", name: "MajorNo3", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- key: value,
- keyId: 'majorno',
- callback: function (_data) {
- callback(_data['majorname']);
- }
- });
- }
- },
- {
- label: "报考专业（四）", name: "MajorNo4", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
- key: value,
- keyId: 'majorno',
- callback: function (_data) {
- callback(_data['majorname']);
- }
- });
- }
- },
- {
- label: "报考专业（五）", name: "MajorNo5", width: 100, align: "left",
+ label: "报考专业", name: "MajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
@@ -247,34 +230,92 @@ var bootstrap = function ($, learun) {
});
}
},
+ //{
+ // label: "报考专业（二）", name: "MajorNo2", width: 100, align: "left",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('custmerData', {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ // key: value,
+ // keyId: 'majorno',
+ // callback: function (_data) {
+ // callback(_data['majorname']);
+ // }
+ // });
+ // }
+ //},
+ //{
+ // label: "报考专业（三）", name: "MajorNo3", width: 100, align: "left",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('custmerData', {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ // key: value,
+ // keyId: 'majorno',
+ // callback: function (_data) {
+ // callback(_data['majorname']);
+ // }
+ // });
+ // }
+ //},
+ //{
+ // label: "报考专业（四）", name: "MajorNo4", width: 100, align: "left",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('custmerData', {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ // key: value,
+ // keyId: 'majorno',
+ // callback: function (_data) {
+ // callback(_data['majorname']);
+ // }
+ // });
+ // }
+ //},
+ //{
+ // label: "报考专业（五）", name: "MajorNo5", width: 100, align: "left",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('custmerData', {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+ // key: value,
+ // keyId: 'majorno',
+ // callback: function (_data) {
+ // callback(_data['majorname']);
+ // }
+ // });
+ // }
+ //},
{
label: "户籍所在地", name: "HomeProvince", width: 200, align: "left",
formatter: function (value, row) {
var str = '';
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
- key: value,
- keyId: 'pcode',
- callback: function (_data) {
- str += _data['pname'];
- }
- });
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
- key: row.HomeCity,
- keyId: 'ccode',
- callback: function (_data) {
- str += _data['cname'];
- }
- });
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
- key: row.HomeCounty,
- keyId: 'acode',
- callback: function (_data) {
- str += _data['aname'];
- }
- });
+ if (!!value) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+ key: value,
+ keyId: 'pcode',
+ callback: function (_data) {
+ str += _data['pname'];
+ }
+ });
+ }
+ if (!!row.HomeCity) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+ key: row.HomeCity,
+ keyId: 'ccode',
+ callback: function (_data) {
+ str += _data['cname'];
+ }
+ });
+ }
+ if (!!row.HomeCounty) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+ key: row.HomeCounty,
+ keyId: 'acode',
+ callback: function (_data) {
+ str += _data['aname'];
+ }
+ });
+ }
if (!!row.HomeAddr) {
str += row.HomeAddr;
}
@@ -287,30 +328,36 @@ var bootstrap = function ($, learun) {
label: "录取通知书邮寄地址", name: "AcceptanceProvince", width: 200, align: "left",
formatter: function (value, row) {
var str = '';
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
- key: value,
- keyId: 'pcode',
- callback: function (_data) {
- str += _data['pname'];
- }
- });
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
- key: row.AcceptanceCity,
- keyId: 'ccode',
- callback: function (_data) {
- str += _data['cname'];
- }
- });
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
- key: row.AcceptanceCounty,
- keyId: 'acode',
- callback: function (_data) {
- str += _data['aname'];
- }
- });
+ if (!!value) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+ key: value,
+ keyId: 'pcode',
+ callback: function (_data) {
+ str += _data['pname'];
+ }
+ });
+ }
+ if (!!row.AcceptanceCity) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+ key: row.AcceptanceCity,
+ keyId: 'ccode',
+ callback: function (_data) {
+ str += _data['cname'];
+ }
+ });
+ }
+ if (!!row.AcceptanceCounty) {
+ learun.clientdata.getAsync('custmerData', {
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+ key: row.AcceptanceCounty,
+ keyId: 'acode',
+ callback: function (_data) {
+ str += _data['aname'];
+ }
+ });
+ }
if (!!row.AcceptanceAddr) {
str += row.AcceptanceAddr;
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialEntity.cs
index aa1081074..830938643 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialEntity.cs
@@ -87,28 +87,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
/// 报考专业
///
- [Column("MAJORNO1")]
- public string MajorNo1 { get; set; }
- ///
- /// 报考专业
- ///
- [Column("MAJORNO2")]
- public string MajorNo2 { get; set; }
- ///
- /// 报考专业
- ///
- [Column("MAJORNO3")]
- public string MajorNo3 { get; set; }
- ///
- /// 报考专业
- ///
- [Column("MAJORNO4")]
- public string MajorNo4 { get; set; }
- ///
- /// 报考专业
- ///
- [Column("MAJORNO5")]
- public string MajorNo5 { get; set; }
+ [Column("MAJORNO")]
+ public string MajorNo { get; set; }
///
/// 户籍省份
///
@@ -179,16 +159,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("ISADJUST")]
public int? IsAdjust { get; set; }
- ///
- /// 个人照片
- ///
- [Column("PHOTO")]
- public string Photo { get; set; }
- ///
- /// 身份证扫描件
- ///
- [Column("IDCARDPHOTO")]
- public string IdCardPhoto { get; set; }
///
/// 创建时间
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs
index d35993ac5..21fddb3a0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnrollOfficial/StuEnrollOfficialService.cs
@@ -32,20 +32,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
- t.Id,
- t.StuName,
- t.Gender,
- t.Province,
- t.MajorNo1,
- t.MajorNo2,
- t.MajorNo3,
- t.MajorNo4,
- t.MajorNo5,
- t.StuType,
- t.HomeProvince,
- t.HomeCity,
- t.HomeCounty,
- t.IsAdjust
+ t.*
");
strSql.Append(" FROM StuEnrollOfficial t ");
strSql.Append(" WHERE 1=1 ");
@@ -77,10 +64,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("Province",queryParam["Province"].ToString(), DbType.String);
strSql.Append(" AND t.Province = @Province ");
}
- if (!queryParam["MajorNo1"].IsEmpty())
+ if (!queryParam["MajorNo"].IsEmpty())
{
- dp.Add("MajorNo1",queryParam["MajorNo1"].ToString(), DbType.String);
- strSql.Append(" AND t.MajorNo1 = @MajorNo1 ");
+ dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String);
+ strSql.Append(" AND t.MajorNo = @MajorNo ");
}
if (!queryParam["StuType"].IsEmpty())
{
@@ -107,6 +94,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("HomeCounty",queryParam["HomeCounty"].ToString(), DbType.String);
strSql.Append(" AND t.HomeCounty = @HomeCounty ");
}
+ if (!queryParam["GraduateType"].IsEmpty())
+ {
+ dp.Add("GraduateType", queryParam["GraduateType"].ToString(), DbType.String);
+ strSql.Append(" AND t.GraduateType = @GraduateType ");
+ }
if (!queryParam["IsAdjust"].IsEmpty())
{
dp.Add("IsAdjust",queryParam["IsAdjust"].ToString(), DbType.String);