【修改】资助-家庭经济信息优化；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Controllers/FamilyEconomyController.cs

@@ -1,6 +1,8 @@
-using Learun.Application.TwoDevelopment.StudentWork;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.StudentWork;
 using Learun.Util;
 using System.Data;
+using System.Linq;
 using System.Web.Mvc;
 
 namespace Learun.Application.Web.Areas.StudentWork.Controllers
@@ -15,6 +17,7 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
     public class FamilyEconomyController : MvcControllerBase
     {
         private FamilyEconomyIBLL familyEconomyIBLL = new FamilyEconomyBLL();
+        private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
 
         #region 视图功能
 
@@ -34,6 +37,17 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
         [HttpGet]
         public ActionResult Form()
         {
+            var logUser = LoginUserInfo.Get();
+            var ClassNos = "";
+            var Classinfo = classInfoIBLL.GetAllClass().Where(x => x.ClassTutorNo == logUser.account).ToList();
+            if (Classinfo.Any())
+            {
+                foreach (var item in Classinfo)
+                {
+                    ClassNos += item.ClassNo + ",";
+                }
+            }
+            ViewBag.ClassNo = ClassNos.TrimEnd(',');
             return View();
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.cshtml

@@ -3,17 +3,21 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <style>
-    .lr-form-item-title{
-        width:155px;
+    .lr-form-item-title {
+        width: 155px;
     }
-    .lr-form-item{
-        padding-left:155px;
+
+    .lr-form-item {
+        padding-left: 155px;
     }
 </style>
+<script type="text/javascript">
+    var classs = "@ViewBag.ClassNo";
+</script>
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
-        <div id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">姓名</div>
@@ -21,15 +25,15 @@
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">院校</div>
-        <div id="F_SchoolId" type="text" class="form-control" readonly="readonly" ></div>
+        <div id="F_SchoolId" type="text" class="form-control" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">班级</div>
-        <div id="ClassNo" type="text" class="form-control" readonly="readonly" ></div>
+        <div id="ClassNo" type="text" class="form-control" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">身份证件号</div>
-        <input id="IdentityCardNo" type="text" class="form-control" readonly="readonly"/>
+        <input id="IdentityCardNo" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
@@ -99,11 +103,11 @@
         <div class="lr-form-item-title">家庭人均年收入<font face="宋体">*</font></div>
         <input id="FamilyAverageIncome" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">家庭主要收入来源类型<font face="宋体">*</font></div>
         <div id="FamilyIncomeSourceCategory" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">家庭是否遭受自然灾害<font face="宋体">*</font></div>
         <div id="FamilyIsSufferNaturalDisaster" isvalid="yes" checkexpession="NotNull"></div>
     </div>
@@ -111,7 +115,7 @@
         <div class="lr-form-item-title">自然灾害具体情况描述</div>
         <textarea id="SufferNaturalDisasterDescription" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">家庭是否遭受突发意外事件<font face="宋体">*</font></div>
         <div id="FamilyIsSufferUnexpectEvent" isvalid="yes" checkexpession="NotNull"></div>
     </div>
@@ -119,7 +123,7 @@
         <div class="lr-form-item-title">突发意外事件具体描述</div>
         <textarea id="SufferUnexpectEventDescription" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">家庭欠债金额<font face="宋体">*</font></div>
         <input id="FamilyOwesAmount" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
     </div>
@@ -147,7 +151,7 @@
         <div class="lr-form-item-title">其他信息</div>
         <textarea id="OtherInformation" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">是否特困供养<font face="宋体">*</font></div>
         <div id="IsSpecialPovertySupport" isvalid="yes" checkexpession="NotNull"></div>
     </div>
@@ -155,7 +159,7 @@
         <div class="lr-form-item-title">其他<font face="宋体">*</font></div>
         <input id="Others" type="text" class="form-control" isvalid="yes" checkexpession="LenStr" length="40" placeholder="填写农村特困供养、农村低保户、建档立卡相关信息，内容不能超过40个字符" />
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">家庭是否遭受疫情<font face="宋体">*</font></div>
         <div id="FamilyIsSufferEpidemic" isvalid="yes" checkexpession="NotNull"></div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Form.js

@@ -7,6 +7,10 @@
 var acceptClick;
 var keyValue = request('keyValue');
 var Step = request('Step');//第几步
+var strWhere = "";//点击学号弹出框条件
+if (classs != "" && classs != undefined && classs != null) {
+    strWhere = " and classno in (" + classs + ") ";
+}
 var bootstrap = function ($, learun) {
     "use strict";
     var selectedRow = learun.frameTab.currentIframe().selectedRow;
@@ -34,10 +38,11 @@ var bootstrap = function ($, learun) {
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
             $('#IdCardType').lrselectSet('01');
+            //判断登录用户所带班级：学生弹框显示所带班级学生
             $('#StuNo').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
-                param: { strWhere: " 1=1 " },
+                param: { strWhere: " 1=1 " + strWhere + " order by deptno,majorno,classno,grade " },
                 selectWord: 'stuname',
                 value: 'stuno',
                 text: 'stuno',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.cshtml

@@ -4,10 +4,10 @@
 }
 <style>
     .lr-form-item-title{
-        width:142px;
+        width:155px;
     }
     .lr-form-item{
-        padding-left:142px;
+        padding-left:155px;
     }
 </style>
 <div class="lr-layout" >
@@ -26,7 +26,7 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院系</div>
+                                    <div class="lr-form-item-title">院校</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/Index.js

@@ -45,7 +45,7 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 450, 560);
+            }, 450, 600);
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -147,9 +147,9 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/StudentWork/FamilyEconomy/GetPageList',
                 headData: [
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
-                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 100, align: "left",
+                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
@@ -185,7 +185,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '身份证件号', name: 'IdentityCardNo', width: 100, align: "left" },
+                    { label: '身份证件号', name: 'IdentityCardNo', width: 150, align: "left" },
                     {
                         label: '申请时间', name: 'ApplyTime', width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue.substring(0, 11);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.cshtml

@@ -4,10 +4,10 @@
 }
 <style>
     .lr-form-item-title{
-        width:142px;
+        width:155px;
     }
     .lr-form-item{
-        padding-left:142px;
+        padding-left:155px;
     }
 </style>
 <div class="lr-layout" >
@@ -26,7 +26,7 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院系</div>
+                                    <div class="lr-form-item-title">院校</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfStudent.js

@@ -45,7 +45,7 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 450, 560);
+            }, 450, 600);
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -75,9 +75,9 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/StudentWork/FamilyEconomy/GetPageList',
                 headData: [
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
-                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 100, align: "left",
+                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
@@ -113,7 +113,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '身份证件号', name: 'IdentityCardNo', width: 100, align: "left" },
+                    { label: '身份证件号', name: 'IdentityCardNo', width: 150, align: "left" },
                     {
                         label: '申请时间', name: 'ApplyTime', width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue.substring(0, 11);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.cshtml

@@ -4,10 +4,10 @@
 }
 <style>
     .lr-form-item-title{
-        width:142px;
+        width:155px;
     }
     .lr-form-item{
-        padding-left:142px;
+        padding-left:155px;
     }
 </style>
 <div class="lr-layout" >
@@ -26,7 +26,7 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院系</div>
+                                    <div class="lr-form-item-title">院校</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfThree.js

@@ -45,7 +45,7 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 450, 560);
+            }, 450, 600);
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -129,9 +129,9 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/StudentWork/FamilyEconomy/GetPageList',
                 headData: [
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
-                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 100, align: "left",
+                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
@@ -167,7 +167,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '身份证件号', name: 'IdentityCardNo', width: 100, align: "left" },
+                    { label: '身份证件号', name: 'IdentityCardNo', width: 150, align: "left" },
                     {
                         label: '申请时间', name: 'ApplyTime', width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue.substring(0, 11);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.cshtml

@@ -4,10 +4,10 @@
 }
 <style>
     .lr-form-item-title{
-        width:142px;
+        width:155px;
     }
     .lr-form-item{
-        padding-left:142px;
+        padding-left:155px;
     }
 </style>
 <div class="lr-layout" >
@@ -26,7 +26,7 @@
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">院系</div>
+                                    <div class="lr-form-item-title">院校</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.js

@@ -45,7 +45,7 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 450, 560);
+            }, 450, 600);
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
@@ -133,9 +133,9 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/StudentWork/FamilyEconomy/GetPageList',
                 headData: [
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
-                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 150, align: "left" },
                     {
-                        label: '院校', name: 'F_SchoolId', width: 100, align: "left",
+                        label: '院校', name: 'F_SchoolId', width: 120, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
@@ -171,7 +171,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '身份证件号', name: 'IdentityCardNo', width: 100, align: "left" },
+                    { label: '身份证件号', name: 'IdentityCardNo', width: 150, align: "left" },
                     {
                         label: '申请时间', name: 'ApplyTime', width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue.substring(0, 11);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/StudentWork/FamilyEconomy/FamilyEconomyEntity.cs

@@ -159,7 +159,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         [Column("SUFFERUNEXPECTEVENTDESCRIPTION")]
         public string SufferUnexpectEventDescription { get; set; }
         /// <summary>
-        /// FamilyOwesAmount
+        /// 家庭欠债金额
         /// </summary>
         /// <returns></returns>
         [Column("FAMILYOWESAMOUNT")]