系别
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js
index 392e45328..5c3b278e7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Form.js
@@ -27,33 +27,65 @@ var bootstrap = function ($, learun) {
text: 'subjectname',
maxHeight: 200
});
- $('#City').lrselect({
- url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
- param: { strWhere: " cparent= 650000 " },
- value: 'ccode',
- text: 'cname',
+ $('#Province').lrselect({
+ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
+ param: { strWhere: " 1=1 " },
+ value: 'pcode',
+ text: 'pname',
maxHeight: 200,
- select: function (item) {
- var Citys = $("#City").lrselectGet();
- if (Citys != null && Citys != "" && Citys != undefined) {
- $('#Area').lrselectRefresh({
- url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
- param: { strWhere: " 1=1 and aparent in (" + Citys + ")" },
- value: "acode",
- text: "aname",
- maxHeight: 200
- });
- } else {
- $('#Area').lrselectRefresh({
- url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
- param: { strWhere: " 1=1 and aparent ='' " },
- value: "acode",
- text: "aname",
- maxHeight: 200
- });
- }
- }
- })
+ //select: function (item) {
+ // var Province = $("#Province").lrselectGet();
+ // if (Province != null && Province != "" && Province != undefined) {
+ // $('#City').lrselectRefresh({
+ // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_CITY',
+ // param: { strWhere: " 1=1 and cparent in (" + Province + ")" },
+ // value: "ccode",
+ // text: "cname",
+ // maxHeight: 200,
+ // select: function (item) {
+ // var Citys = $("#City").lrselectGet();
+ // if (Citys != null && Citys != "" && Citys != undefined) {
+ // $('#Area').lrselectRefresh({
+ // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
+ // param: { strWhere: " 1=1 and aparent in (" + Citys + ")" },
+ // value: "acode",
+ // text: "aname",
+ // maxHeight: 200
+ // });
+ // }
+ // }
+ // });
+ // }
+ //}
+ });
+ //$('#City').lrselect({
+ // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+ // param: { strWhere: " cparent= 650000 " },
+ // value: 'ccode',
+ // text: 'cname',
+ // maxHeight: 200,
+ // select: function(item) {
+ // var Citys = $("#City").lrselectGet();
+ // if (Citys != null && Citys != "" && Citys != undefined) {
+ // $('#Area').lrselectRefresh({
+ // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
+ // param: { strWhere: " 1=1 and aparent in (" + Citys + ")" },
+ // value: "acode",
+ // text: "aname",
+ // maxHeight: 200
+ // });
+ // } else {
+ // $('#Area').lrselectRefresh({
+ // url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=DIC_AREA',
+ // param: { strWhere: " 1=1 and aparent ='' " },
+ // value: "acode",
+ // text: "aname",
+ // maxHeight: 200
+ // });
+ // }
+ // }
+ //});
+ $("#City").lrselect();
$("#Area").lrselect();
$('#SubjectSpeciesNo').lrDataItemSelect({ code: 'SubjectSpecies' });
$('#F_SchoolId').lrDataSourceSelect({
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
index 0f1128d7d..03bd0ae11 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
@@ -225,33 +225,46 @@ var bootstrap = function ($, learun) {
// });
// }
//},
- { label: "年度", name: "Year", width: 100, align: "left" },
{
- label: "地市", name: "City", width: 100, align: "left",
+ 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_CITY',
+ url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
key: value,
- keyId: 'ccode',
+ keyId: 'pcode',
callback: function (_data) {
- callback(_data['cname']);
+ callback(_data['pname']);
}
});
}
},
- {
- label: "县区", name: "Area", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
- key: value,
- keyId: 'acode',
- callback: function (_data) {
- callback(_data['aname']);
- }
- });
- }
- }
+ //{ label: "年度", name: "Year", width: 100, align: "left" },
+ //{
+ // label: "地市", name: "City", 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: "Area", width: 100, align: "left",
+ // formatterAsync: function (callback, value, row, op, $cell) {
+ // learun.clientdata.getAsync('custmerData', {
+ // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
+ // key: value,
+ // keyId: 'acode',
+ // callback: function (_data) {
+ // callback(_data['aname']);
+ // }
+ // });
+ // }
+ //}
],
mainId: 'ID',
isMultiselect: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs
index efe5f9338..26d77a1bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs
@@ -133,6 +133,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("YEAR")]
public string Year { get; set; }
///
+ /// 省份
+ ///
+ [Column("PROVINCE")]
+ public string Province { get; set; }
+ ///
/// 地市
///
[Column("CITY")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs
index 94662ce4a..6ee1898ed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorService.cs
@@ -48,7 +48,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
t.CheckMark,
t.Year,
t.City,
- t.Area
+ t.Area,
+t.Province
");
strSql.Append(" FROM CdMajor t ");
strSql.Append(" WHERE 1=1 ");