Merge branch '长阳分支中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js

@@ -98,11 +98,6 @@ var bootstrap = function ($, learun) {
                 value: "classno",
                 text: "classname"
             });
-            $('#Grade').lrselect({
-                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
-                value: 'value',
-                text: 'text'
-            });
             $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' }); 
             $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
@@ -118,58 +113,115 @@ var bootstrap = function ($, learun) {
             $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
             $('#DeptNo').lrselect({
+                allowSearch: true,
                 value: "deptno",
                 text: "deptname",
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
                 select: function (item) {
                     if (item) {
                         $('#MajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
                         });
-                    }
-                    else {
+                    } else {
                         $('#MajorNo').lrselectRefresh({
-                            url: "",
-                            data: []
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
                         });
                     }
-                    $('#ClassNo').lrselectRefresh({
-                        url: "",
-                        data: []
-                    });
+
                 }
             });
             $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                 value: "majorno",
                 text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
-                    if (item) {
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
-                        });
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
                     }
-
                 }
             });
-
-
-            $('#MajorNo').on("click",
-                function () {
-                    var data = $('#DeptNo').lrselectGet();
-                    if (!data) {
-                        learun.alert.error('请先选择系');
-                    }
-                });
-            $('#ClassNo').on("click",
-                function () {
-                    var data1 = $('#DeptNo').lrselectGet();
-                    var data2 = $('#MajorNo').lrselectGet();
-                    if (!data1 || !data2) {
-                        learun.alert.error('请先选择系和专业');
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
                     }
-                });
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
+            });
             $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsLeft').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsDisability').lrDataItemSelect({ code: 'YesOrNoBit' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js

@@ -98,11 +98,7 @@ var bootstrap = function ($, learun) {
                 value: "classno",
                 text: "classname"
             });
-            $('#Grade').lrselect({
-                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
-                value: 'value',
-                text: 'text'
-            });
+            
             $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
@@ -117,58 +113,115 @@ var bootstrap = function ($, learun) {
             $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
             $('#DeptNo').lrselect({
+                allowSearch: true,
                 value: "deptno",
                 text: "deptname",
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
                 select: function (item) {
                     if (item) {
                         $('#MajorNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
                         });
-                    }
-                    else {
+                    } else {
                         $('#MajorNo').lrselectRefresh({
-                            url: "",
-                            data: []
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
                         });
                     }
-                    $('#ClassNo').lrselectRefresh({
-                        url: "",
-                        data: []
-                    });
+
                 }
             });
             $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                 value: "majorno",
                 text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
-                    if (item) {
-                        $('#ClassNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
-                        });
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
                     }
-
                 }
             });
-
-
-            $('#MajorNo').on("click",
-                function () {
-                    var data = $('#DeptNo').lrselectGet();
-                    if (!data) {
-                        learun.alert.error('请先选择系');
-                    }
-                });
-            $('#ClassNo').on("click",
-                function () {
-                    var data1 = $('#DeptNo').lrselectGet();
-                    var data2 = $('#MajorNo').lrselectGet();
-                    if (!data1 || !data2) {
-                        learun.alert.error('请先选择系和专业');
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: "value",
+                text: "text",
+                select: function (item) {
+                    var MajorNos = $("#MajorNo").lrselectGet();
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                            });
+                        }
                     }
-                });
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                value: "classno",
+                text: "classname"
+            });
             $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' });
             $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsLeft').lrDataItemSelect({ code: 'YesOrNoBit' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml

@@ -92,7 +92,7 @@
                                         </div>
                                         <div class="col-xs-12 lr-form-item">
                                             <div class="lr-form-item-title">学号</div>
-                                            <input id="StuNo" type="text" class="form-control" />
+                                            <input id="ProvinceCode" type="text" class="form-control" />
                                         </div>
                                     </div>
                                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml

@@ -36,7 +36,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
+                                    <input id="ProvinceCode" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml

@@ -93,7 +93,7 @@
                                         </div>
                                         <div class="col-xs-12 lr-form-item">
                                             <div class="lr-form-item-title">学号</div>
-                                            <input id="StuNo" type="text" class="form-control" />
+                                            <input id="ProvinceCode" type="text" class="form-control" />
                                         </div>
                                     </div>
                                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml

@@ -36,7 +36,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
+                                    <input id="ProvinceCode" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -51,6 +51,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.StuNo Like @StuNo ");
                 }
+                if (!queryParam["ProvinceCode"].IsEmpty())
+                {
+                    dp.Add("ProvinceCode", "%" + queryParam["ProvinceCode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ProvinceCode Like @ProvinceCode ");
+                }
                 if (!queryParam["StuName"].IsEmpty())
                 {
                     dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);