From 90631709ea83c5dc5a3b6f8fe43eacd69996466a Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 10 Nov 2023 09:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E5=8F=96=E6=B6=88=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.cshtml | 24 ++++++ .../Views/StuInfoBasic/Index.js | 73 +++++++++++++++---- .../Views/StuInfoBasic/IndexCenter.cshtml | 24 ++++++ .../Views/StuInfoBasic/IndexCenter.js | 73 +++++++++++++++---- .../StuInfoBasic/StuInfoBasicService.cs | 36 +++++++++ 5 files changed, 198 insertions(+), 32 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index 2a9f5ea20..2a8a69ca2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -18,6 +18,18 @@
姓名
+
+
身份证号
+ +
+
+
性别
+
+
+
+
民族
+
+
系部
@@ -30,6 +42,18 @@
班级
+
+
培养层次
+
+
+
+
籍贯
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 646ec661c..391cfc3c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -10,10 +10,51 @@ var bootstrap = function ($, learun) { bind: function () { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 220, 400); + }, 420, 400); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#F_ProvinceId').lrDataSourceSelect({ + code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', + select: function (item) { + if (item) { + $('#F_CityId').lrselectRefresh({ + url: top.$.rootUrl + "/DIC_CITY/GetListByProvinceCode", + param: { ProvinceCode: item.pcode }, + value: 'CCODE', + text: 'CNAME' + }); + } else { + $('#F_CityId').lrselectRefresh({ + url: "", + data: [] + }); + } + $('#F_CountyId').lrselectRefresh({ + url: "", + data: [] + }); + } + }); + $('#F_CityId').lrselect({ + value: 'ccode', text: 'cname', + select: function (item) { + if (item) { + $('#F_CountyId').lrselectRefresh({ + url: top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", + param: { cityCode: item.CCODE }, + value: 'ACODE', + text: 'ANAME' + }); + } + } + }); + $('#F_CountyId').lrselect({ + value: 'ACODE', text: 'ANAME' + }); + $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + $('#PieceCultivateWay').lrDataItemSelect({ code: 'EducationLevel' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -404,7 +445,7 @@ var bootstrap = function ($, learun) { } }, { - label: "籍贯 (县)", name: "F_CountyId", width: 100, align: "left", + label: "籍贯 (县/区)", name: "F_CountyId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA', @@ -418,20 +459,20 @@ var bootstrap = function ($, learun) { }, { label: "邮政编码", name: "PostalCode", width: 100, align: "center" }, //{ label: "E-mail", name: "E-mail", width: 100, align: "center" }, - { - label: "开户银行", name: "DepositBank", width: 100, align: "center", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'DepositBank', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: "开户卡账号", name: "BankCard", width: 100, align: "center" }, - { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" }, + //{ + // label: "开户银行", name: "DepositBank", width: 100, align: "center", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'DepositBank', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "开户卡账号", name: "BankCard", width: 100, align: "center" }, + //{ label: "开户银行位置", name: "BankLocation", width: 100, align: "center" }, //{ // label: "是否单亲", name: "IsSingle", width: 100, align: "left", // formatter: function (value, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.cshtml index bb758e204..d50fddbe7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.cshtml @@ -18,6 +18,18 @@
姓名
+
+
身份证号
+ +
+
+
性别
+
+
+
+
民族
+
+
系部
@@ -30,6 +42,18 @@
班级
+
+
培养层次
+
+
+
+
籍贯
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js index 89b99e680..44c3f155d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js @@ -10,10 +10,51 @@ var bootstrap = function ($, learun) { bind: function () { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); - }, 220, 400); + }, 420, 400); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); + $('#F_ProvinceId').lrDataSourceSelect({ + code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', + select: function (item) { + if (item) { + $('#F_CityId').lrselectRefresh({ + url: top.$.rootUrl + "/DIC_CITY/GetListByProvinceCode", + param: { ProvinceCode: item.pcode }, + value: 'CCODE', + text: 'CNAME' + }); + } else { + $('#F_CityId').lrselectRefresh({ + url: "", + data: [] + }); + } + $('#F_CountyId').lrselectRefresh({ + url: "", + data: [] + }); + } + }); + $('#F_CityId').lrselect({ + value: 'ccode', text: 'cname', + select: function (item) { + if (item) { + $('#F_CountyId').lrselectRefresh({ + url: top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", + param: { cityCode: item.CCODE }, + value: 'ACODE', + text: 'ANAME' + }); + } + } + }); + $('#F_CountyId').lrselect({ + value: 'ACODE', text: 'ANAME' + }); + $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + $('#PieceCultivateWay').lrDataItemSelect({ code: 'EducationLevel' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -404,7 +445,7 @@ var bootstrap = function ($, learun) { } }, { - label: "籍贯 (县)", name: "F_CountyId", width: 100, align: "left", + label: "籍贯 (县/区)", name: "F_CountyId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA', @@ -418,20 +459,20 @@ var bootstrap = function ($, learun) { }, { label: "邮政编码", name: "PostalCode", width: 100, align: "center" }, //{ label: "E-mail", name: "E-mail", width: 100, align: "center" }, - { - label: "开户银行", name: "DepositBank", width: 100, align: "center", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'DepositBank', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { label: "开户卡账号", name: "BankCard", width: 100, align: "center" }, - { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" }, + //{ + // label: "开户银行", name: "DepositBank", width: 100, align: "center", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'DepositBank', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "开户卡账号", name: "BankCard", width: 100, align: "center" }, + //{ label: "开户银行位置", name: "BankLocation", width: 100, align: "center" }, //{ // label: "是否单亲", name: "IsSingle", width: 100, align: "left", // formatter: function (value, row) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index 2cdb6e93c..3932e7ed2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -80,6 +80,42 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Grade", "" + queryParam["Grade"].ToString() + "", DbType.String); strSql.Append(" AND t.Grade=@Grade "); } + if (!queryParam["IdentityCardNo"].IsEmpty()) + { + dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String); + strSql.Append(" AND t.IdentityCardNo like @IdentityCardNo "); + } + if (!queryParam["GenderNo"].IsEmpty()) + { + dp.Add("GenderNo", "" + queryParam["GenderNo"].ToString() + "", DbType.String); + strSql.Append(" AND t.GenderNo=@GenderNo "); + } + if (!queryParam["NationalityNo"].IsEmpty()) + { + dp.Add("NationalityNo", "" + queryParam["NationalityNo"].ToString() + "", DbType.String); + strSql.Append(" AND t.NationalityNo=@NationalityNo "); + } + if (!queryParam["PieceCultivateWay"].IsEmpty()) + { + dp.Add("PieceCultivateWay", "" + queryParam["PieceCultivateWay"].ToString() + "", DbType.String); + strSql.Append(" AND t.PieceCultivateWay=@PieceCultivateWay "); + } + if (!queryParam["F_ProvinceId"].IsEmpty()) + { + dp.Add("F_ProvinceId", "" + queryParam["F_ProvinceId"].ToString() + "", DbType.String); + strSql.Append(" AND t.F_ProvinceId=@F_ProvinceId "); + } + if (!queryParam["F_CityId"].IsEmpty()) + { + dp.Add("F_CityId", "" + queryParam["F_CityId"].ToString() + "", DbType.String); + strSql.Append(" AND t.F_CityId=@F_CityId "); + } + if (!queryParam["F_CountyId"].IsEmpty()) + { + dp.Add("F_CountyId", "" + queryParam["F_CountyId"].ToString() + "", DbType.String); + strSql.Append(" AND t.F_CountyId=@F_CountyId "); + } + if (!queryParam["FinishSchoolMark"].IsEmpty()) { dp.Add("FinishSchoolMark", "" + queryParam["FinishSchoolMark"].ToString() + "", DbType.String);