From e734322c3007baecb9a02dd45d997591f052038c Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 21 Oct 2022 09:49:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=B2=E6=AF=95=E4=B8=9A=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E6=9F=A5=E8=AF=A2=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoGraduate/Index.cshtml | 10 +- .../Views/StuInfoGraduate/Index.js | 92 +++++++++++++++---- 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml index a9e045c36..9549fd794 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml @@ -19,14 +19,14 @@
-
班级
-
-
-
年级
-
+
+
班级
+
+
+
姓名
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js index 1ca659c35..d4e7ed0e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js @@ -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=allbjsj', + 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=allbjsj', + param: { strWhere: "1=1 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" } - }); + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjsj', + 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=allbjsj', + 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" }, - 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=allbjsj', + 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=allbjsj', + 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=allbjsj', + 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=allbjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } + + } + }); + $('#ClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjsj', + param: { strWhere: "1=1 AND CheckMark=1 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=' + 'allbjsj', key: value, keyId: 'classno', callback: function (_data) { From 3bd9e6065c6de2d11559288b72c088c04605115d Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 21 Oct 2022 10:42:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=AF=95=E4=B8=9A=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoGraduate/Index.js | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js index d4e7ed0e5..d44f4ee04 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js +++ b/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", @@ -44,28 +44,28 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + 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=allbjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + 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=allbjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + 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=allbjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND order by classno desc" } }); } } @@ -81,32 +81,32 @@ var bootstrap = function ($, learun) { if (item) { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "majorno='" + MajorNos + "' AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + 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=allbjsj', + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', param: { - strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + strWhere: "1=1 AND Grade='" + item.text + "' order by classno desc" } }); } else { $('#ClassNo').lrselectRefresh({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND order by classno desc" } }); } } @@ -115,8 +115,8 @@ var bootstrap = function ($, learun) { }); $('#ClassNo').lrselect({ allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjsj', - param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj', + param: { strWhere: "1=1 AND order by classno desc" }, value: "classno", text: "classname" }); @@ -213,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=' + 'allbjsj', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj', key: value, keyId: 'classno', callback: function (_data) { From fed652952a37a40ae8d054c6aa58d6016662f0de Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 21 Oct 2022 11:25:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Acc_DailyAssess/Form.js | 17 ++++++++++++++++- .../Views/Acc_PublicAreaHealth/Form.js | 17 ++++++++++++++++- .../Views/Acc_StuDayRoutine/Form.js | 17 ++++++++++++++++- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DailyAssess/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DailyAssess/Form.js index 2f76c5f80..44d856991 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_DailyAssess/Form.js +++ b/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(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Form.js index ffc6fdcf3..64e915ef9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_PublicAreaHealth/Form.js +++ b/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(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_StuDayRoutine/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_StuDayRoutine/Form.js index acdee64d7..6249a7d52 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_StuDayRoutine/Form.js +++ b/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();