From 2b72bc37209282f688736d16de418c160eae2df5 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 8 Sep 2022 16:18:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=96=AB=E8=8B=97=E7=B1=BB=E5=9E=8B=E4=B8=BA=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=20=E7=8F=AD=E4=B8=BB=E4=BB=BB=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=87=AA=E5=B7=B1=E7=8F=AD=E7=BA=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BD=99=E7=94=A8=E6=88=B7=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/VaccinationInfo/Form.cshtml | 2 +- .../Views/VaccinationInfo/Form.js | 2 +- .../Views/VaccinationInfo/Index.cshtml | 4 ++-- .../Views/VaccinationInfo/Index.js | 20 +++++++++---------- .../VaccinationInfo/VaccinationInfoService.cs | 18 +++++++++++++---- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml index 7c1cc3174..17e697f49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.cshtml @@ -18,7 +18,7 @@
疫苗类型
-
+
第一针时间
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js index db719b6e8..522bf0a2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Form.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); + //$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml index d901b249f..07224363b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.cshtml @@ -31,8 +31,8 @@
-
接种类型
-
+
疫苗类型
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js index d1e183a34..a21dccf60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/Index.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); + //$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); $('#DeptNo').lrselect({ value: "deptno", text: "deptname", @@ -181,15 +181,15 @@ var bootstrap = function ($, learun) { { label: "电话号码", name: "Mobile", width: 120, align: "left" }, { label: "疫苗类型", name: "VaccineType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'VaccineType', - callback: function (_data) { - callback(_data.text); - } - }); - } + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'VaccineType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} }, { label: "接种地", name: "VaccineAddress", width: 100, align: "left" }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs index f2a09f89c..b137614c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs @@ -1,4 +1,5 @@ using Dapper; +using Learun.Application.Organization; using Learun.DataBase.Repository; using Learun.Util; using System; @@ -80,17 +81,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["VaccineType"].IsEmpty()) { - dp.Add("VaccineType", queryParam["VaccineType"].ToString(), DbType.String); - strSql.Append(" AND t.VaccineType =@VaccineType "); + dp.Add("VaccineType", "%" + queryParam["VaccineType"].ToString() + "%", DbType.String); + strSql.Append(" AND t.VaccineType like @VaccineType "); } if (!queryParam["Mobile"].IsEmpty()) { dp.Add("Mobile", "%" + queryParam["Mobile"].ToString() + "%", DbType.String); strSql.Append(" AND t.Mobile like @Mobile "); } - if (login.Description == "教师") + //if (login.Description == "教师") + //{ + // strSql.Append(" AND c.ClassDiredctorno = '" + login.account + "' "); + //} + //班主任查看自己班的学生数据 + var roleid = this.BaseRepository().FindEntity(a => a.F_FullName == "班主任")?.F_RoleId; + if (!string.IsNullOrEmpty(roleid)) { - strSql.Append(" AND c.ClassDiredctorno = '" + login.account + "' "); + if (login.roleIds.Contains(roleid)) + { + strSql.Append(" AND c.ClassDiredctorno = '" + login.account + "' "); + } } } else if (StuOrTeach == "1")