学籍添加查询条件 取消字段

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

@@ -18,6 +18,18 @@
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证号</div>
+                                    <input id="IdentityCardNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="GenderNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">民族</div>
+                                    <div id="NationalityNo"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -30,6 +42,18 @@
                                     <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>
+                                    <div id="PieceCultivateWay"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">籍贯</div>
+                                    <div class="col-xs-12 lr-form-area">
+                                        <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
+                                        <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
+                                        <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.cshtml

@@ -18,6 +18,18 @@
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">身份证号</div>
+                                    <input id="IdentityCardNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="GenderNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">民族</div>
+                                    <div id="NationalityNo"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
@@ -30,6 +42,18 @@
                                     <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>
+                                    <div id="PieceCultivateWay"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">籍贯</div>
+                                    <div class="col-xs-12 lr-form-area">
+                                        <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
+                                        <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
+                                        <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>

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) {

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);