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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml

@@ -19,14 +19,14 @@
                                     <div id="MajorNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
                                     <div id="Grade"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js

@@ -9,7 +9,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 320, 400);
             $('#DeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",
@@ -39,32 +39,86 @@ var bootstrap = function ($, learun) {
                 text: "majorname",
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
-                    if (item) {
-                        $('#ClassNo').lrselectRefresh({
-                            allowSearch: true,
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
-                        });
+                    var Grades = $("#Grade").lrselectGet();
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND Grade='" + Grades + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND 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" }
-                        });
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "majorno='" + item.majorno + "' order by classno desc" }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND order by classno desc" }
+                            });
+                        }
                     }
                 }
             });
-            $('#ClassNo').lrselect({
-                allowSearch: true,
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                param: { strWhere: "1=1 AND CheckMark=1" },
-                value: "classno",
-                text: "classname"
-            });
             $('#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=allbjqj',
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND order by classno desc" }
+                            });
+                        }
+                    } else {
+                        if (item) {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: {
+                                    strWhere: "1=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
+                            });
+                        } else {
+                            $('#ClassNo').lrselectRefresh({
+                                allowSearch: true,
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND order by classno desc" }
+                            });
+                        }
+                    }
+
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                param: { strWhere: "1=1 AND order by classno desc" },
+                value: "classno",
+                text: "classname"
             });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
@@ -159,7 +213,7 @@ var bootstrap = function ($, learun) {
                         label: "班级", name: "ClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj',
                                 key: value,
                                 keyId: 'classno',
                                 callback: function (_data) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DailyAssess/Form.js

@@ -105,7 +105,22 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 value: "classno",
-                text: "classname"
+                text: "classname",
+                select: function (item) {
+                    if (item) {
+                        $('#StuNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                            param: { strWhere: "classno='" + item.classno + "'" }
+                        });
+                    } else {
+                        $('#StuNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                            param: { strWhere: "1=1" }
+                        });
+                    }
+                }
             });
             $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
             $('#Files').lrUploader();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Form.js

@@ -65,7 +65,22 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 value: "classno",
-                text: "classname"
+                text: "classname",
+                select: function (item) {
+                    if (item) {
+                        $('#StuNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                            param: { strWhere: "classno='" + item.classno + "'" }
+                        });
+                    } else {
+                        $('#StuNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                            param: { strWhere: "1=1" }
+                        });
+                    }
+                }
             });
             $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
             $('#Files').lrUploader();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_StuDayRoutine/Form.js

@@ -65,7 +65,22 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 value: "classno",
-                text: "classname"
+                text: "classname",
+                select: function (item) {
+                    if (item) {
+                        $('#StuNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                            param: { strWhere: "classno='" + item.classno + "'" }
+                        });
+                    } else {
+                        $('#StuNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                            param: { strWhere: "1=1" }
+                        });
+                    }
+                }
             });
             $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname'});
             $('#Files').lrUploader();