【增加】增加家庭经济信息（二级学院）功能；

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

@@ -25,7 +25,7 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -34,7 +34,16 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 主页面【二级学院】
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfTwo()
+        {
+            return View();
         }
         #endregion
 
@@ -47,7 +56,7 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetList( string queryJson )
+        public ActionResult GetList(string queryJson)
         {
             var data = familyEconomyIBLL.GetList(queryJson);
             return Success(data);
@@ -110,11 +119,37 @@ namespace Learun.Application.Web.Areas.StudentWork.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue,FamilyEconomyEntity entity)
+        public ActionResult SaveForm(string keyValue, FamilyEconomyEntity entity)
         {
             familyEconomyIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSubmit(string keyValue, string status, string step)
+        {
+            familyEconomyIBLL.DoSubmit(keyValue, status, step);
+            return Success("操作成功！");
+        }
+
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoBack(string keyValue, string status, string step)
+        {
+            familyEconomyIBLL.DoBack(keyValue, status, step);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

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

@@ -2,33 +2,54 @@
     ViewBag.Title = "家庭经济信息（辅导员）";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
+<style>
+    .lr-form-item-title{
+        width:155px;
+    }
+    .lr-form-item{
+        padding-left:155px;
+    }
+</style>
 <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 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>
+        <input id="StuName" type="text" class="form-control" readonly="readonly" />
+    </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>
+    <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>
+    <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"/>
     </div>
-    @*自动带出内容：姓名 院校 班级 身份证件号*@
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
-        <input id="IdCardType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div id="IdCardType" 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">申请时间<font face="宋体">*</font></div>
         <input id="ApplyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ApplyTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
-        @*默认当天*@
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">是否低保<font face="宋体">*</font></div>
-        <div id="IsLowIncome" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="IsLowIncome" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">是否孤儿<font face="宋体">*</font></div>
-        <div id="IsOrphan" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="IsOrphan" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">是否单亲家庭子女<font face="宋体">*</font></div>
-        <div id="IsSingleFamilyChildren" isvalid="yes" checkexpession="NotNull" ></div>
-        @*不能同时与“是否孤儿”同时填“是”*@
+        <div id="IsSingleFamilyChildren" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">是否残疾人子女<font face="宋体">*</font></div>
@@ -41,7 +62,6 @@
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">残疾类别</div>
         <div id="DisabledCategory"></div>
-        @*非必填项。若“本人是否残疾”项填“是”，则该项为必填。*@
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">是否父母丧失劳动能力<font face="宋体">*</font></div>
@@ -87,30 +107,29 @@
         <div class="lr-form-item-title">家庭是否遭受自然灾害<font face="宋体">*</font></div>
         <div id="FamilyIsSufferNaturalDisaster" 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">自然灾害具体情况描述</div>
-        <textarea id="SufferNaturalDisasterDescription" style="height:80px;" type="text" class="form-control"></textarea>
+        <textarea id="SufferNaturalDisasterDescription" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">家庭是否遭受突发意外事件<font face="宋体">*</font></div>
         <div id="FamilyIsSufferUnexpectEvent" 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">突发意外事件具体描述</div>
-        <textarea id="SufferUnexpectEventDescription" style="height:80px;" type="text" class="form-control"></textarea>
-        @*若“家庭是否遭受突然意外事件”项填“是”，则该项为必填项*@
+        <textarea id="SufferUnexpectEventDescription" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
     <div class="col-xs-6 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>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">家庭欠债原因</div>
-        <textarea id="FamilyOwesReason" style="height:80px;" type="text" class="form-control"></textarea>
+        <textarea id="FamilyOwesReason" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">家庭人口数<font face="宋体">*</font></div>
-        <input id="FamilyNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2"/>
+        <input id="FamilyNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2" />
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">劳动力人口数<font face="宋体">*</font></div>
@@ -124,26 +143,25 @@
         <div class="lr-form-item-title">赡养人口数<font face="宋体">*</font></div>
         <input id="SupportNumber" type="text" class="form-control" isvalid="yes" checkexpession="LenNum" length="2" />
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">其他信息</div>
-        <textarea id="OtherInformation" style="height:80px;" type="text" class="form-control"></textarea>
+        <textarea id="OtherInformation" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">是否特困供养<font face="宋体">*</font></div>
         <div id="IsSpecialPovertySupport" 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>
-        <input id="Others" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" placeholder="填写农村特困供养、农村低保户、建档立卡相关信息，内容不能超过40个字符" />
+        <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="lr-form-item-title">家庭是否遭受疫情<font face="宋体">*</font></div>
         <div id="FamilyIsSufferEpidemic" 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">家庭遭受疫情具体情况描述</div>
-        <textarea id="SufferEpidemicDescription" style="height:80px;" type="text" class="form-control"></textarea>
-        @*该项如果填写，则“认定时间”、“认定原因”也必须同时填写且同时通过校验*@
+        <textarea id="SufferEpidemicDescription" style="height:50px;" type="text" class="form-control"></textarea>
     </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">认定困难级别名称</div>
@@ -152,24 +170,22 @@
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">认定时间</div>
         <input id="IdentifyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#IdentifyTime').trigger('change'); } })" />
-        @*该项如果填写，则“认定困难级别名称”、“认定原因”也必须同时填写且同时通过校验。填写困难等级认定的日期，格式如20020112，非必填项*@
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">认定原因</div>
-        <input id="IdentifyReason" type="text" class="form-control"  placeholder="内容不能超过30个字符，例如“家庭人口众多，劳动力少”"/>
-        @*该项如果填写，则“认定困难级别名称”、“认定时间”也必须同时填写且同时通过校验。填写的认定原因，内容不能超过30个字符，例如“家庭人口众多，劳动力少”非必填项*@
+        <input id="IdentifyReason" type="text" class="form-control" isvalid="yes" checkexpession="LenStrOrNull" length="30" placeholder="内容不能超过30个字符，例如“家庭人口众多，劳动力少”" />
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">班级认定意见</div>
-        <textarea id="ClassIdentifyOpinion" type="text" class="form-control" ></textarea>
+        <textarea id="ClassIdentifyOpinion" 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">年级认定意见</div>
-        <textarea id="GradeIdentifyOpinion" type="text" class="form-control"></textarea>
+        <textarea id="GradeIdentifyOpinion" 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" id="FilesDiv">
         <div class="lr-form-item-title">附件</div>
-        <input id="Files" type="text" class="form-control"/>
+        <div id="Files"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/StudentWork/Views/FamilyEconomy/Form.js")

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

@@ -6,19 +6,37 @@
  */
 var acceptClick;
 var keyValue = request('keyValue');
+var Step = request('Step');//第几步
 var bootstrap = function ($, learun) {
     "use strict";
     var selectedRow = learun.frameTab.currentIframe().selectedRow;
     var page = {
         init: function () {
+            page.hide();
+            page.bind();
             page.initData();
         },
+        hide: function () {
+            if (Step == "2") {//第二步：二级学院审核，时附件显示且必填；
+                $('#FilesDiv').show();
+                $('#Files').attr('isvalid', 'yes');
+                $('#Files').attr('checkexpession', 'NotNull');
+                $('#Files').prev().html('附件<font face="宋体">*</font>');
+            } else {
+                $('#Files').removeAttr('isvalid');
+                $('#Files').removeAttr('checkexpession');
+                $('#Files').prev().html('附件');
+                $('#FilesDiv').hide();
+            }
+        },
         bind: function () {
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#StuNo').lrGirdSelect({
                 // 字段
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
                 param: { strWhere: " 1=1 " },
-                selectWord: 'stuno',
+                selectWord: 'stuname',
                 value: 'stuno',
                 text: 'stuno',
                 headData: [
@@ -73,10 +91,85 @@ var bootstrap = function ($, learun) {
                     { label: "年级", name: "grade", width: 100, align: "left" }
                 ],
                 select: function (item) {
-                    //$("#StuNo").val(item.stuno);
+                    //自动带出内容：姓名 院校 班级 身份证件号
+                    $("#StuName").val(item.stuname);
+                    $("#F_SchoolId").lrselectSet(item.f_schoolid);
+                    $("#ClassNo").lrselectSet(item.classno);
+                    $("#IdentityCardNo").val(item.identitycardno);
                 }
             });
-
+            $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            //申请时间：默认当天
+            $('#ApplyTime').val(getNowDate());
+            $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabledChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabled').lrDataItemSelect({
+                code: 'YesOrNoBit', select: function(item) {
+                    //“残疾类别”非必填项。若“本人是否残疾”项填“是”，则该项为必填。
+                    if (item != null && item.id == "true") {
+                        $('#DisabledCategory').attr('isvalid', 'yes');
+                        $('#DisabledCategory').attr('checkexpession', 'NotNull');
+                        $('#DisabledCategory').prev().html('残疾类别<font face="宋体">*</font>');
+                    } else {
+                        $('#DisabledCategory').removeAttr('isvalid');
+                        $('#DisabledCategory').removeAttr('checkexpession');
+                        $('#DisabledCategory').prev().html('残疾类别');
+                    }
+                }
+            });
+            $('#DisabledCategory').lrDataItemSelect({ code: 'DisabledCategory' });
+            $('#IsParentsLoseWork').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSeriouslyIllPatientInHome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOvercomePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsUnstablePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgeAcuteDifficultyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsLowIncomeFamily').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsMartyrChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIncomeSourceCategory').lrDataItemSelect({ code: 'FamilyIncomeSourceCategory' });
+            $('#FamilyIsSufferNaturalDisaster').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferUnexpectEvent').lrDataItemSelect({
+                code: 'YesOrNoBit', select: function (item) {
+                    //“突发意外事件具体描述”非必填项。若“家庭是否遭受突然意外事件”项填“是”，则该项为必填项。
+                    if (item != null && item.id == "true") {
+                        $('#SufferUnexpectEventDescription').attr('isvalid', 'yes');
+                        $('#SufferUnexpectEventDescription').attr('checkexpession', 'NotNull');
+                        $('#SufferUnexpectEventDescription').prev().html('突发意外事件具体描述<font face="宋体">*</font>');
+                    } else {
+                        $('#SufferUnexpectEventDescription').removeAttr('isvalid');
+                        $('#SufferUnexpectEventDescription').removeAttr('checkexpession');
+                        $('#SufferUnexpectEventDescription').prev().html('突发意外事件具体描述');
+                    }
+                }
+            });
+            $('#IsSpecialPovertySupport').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferEpidemic').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IdentifyDifficultyLevel').lrDataItemSelect({ code: 'DifficultyLevel' });
+            //“家庭遭受疫情具体情况描述”该项如果填写，则“认定时间”、“认定原因”、“认定困难级别名称”也必须同时填写且同时通过校验
+            $('#SufferEpidemicDescription').on('blur', function () {
+                if ($(this).val().trim() != null && $(this).val().trim() != undefined && $(this).val().trim() != "") {
+                    $('#IdentifyDifficultyLevel').attr('isvalid', 'yes');
+                    $('#IdentifyDifficultyLevel').attr('checkexpession', 'NotNull');
+                    $('#IdentifyDifficultyLevel').prev().html('认定困难级别名称<font face="宋体">*</font>');
+                    $('#IdentifyTime').attr('isvalid', 'yes');
+                    $('#IdentifyTime').attr('checkexpession', 'NotNull');
+                    $('#IdentifyTime').prev().html('认定时间<font face="宋体">*</font>');
+                    $('#IdentifyReason').attr('checkexpession', 'LenStr');
+                    $('#IdentifyReason').prev().html('认定原因<font face="宋体">*</font>');
+                } else {
+                    $('#IdentifyDifficultyLevel').removeAttr('isvalid');
+                    $('#IdentifyDifficultyLevel').removeAttr('checkexpession');
+                    $('#IdentifyDifficultyLevel').prev().html('认定困难级别名称');
+                    $('#IdentifyTime').removeAttr('isvalid');
+                    $('#IdentifyTime').removeAttr('checkexpession');
+                    $('#IdentifyTime').prev().html('认定时间');
+                    $('#IdentifyReason').attr('checkexpession', 'LenStrOrNull');
+                    $('#IdentifyReason').prev().html('认定原因');
+                }
+            });
+            $('#Files').lrUploader();
 
         },
         initData: function () {
@@ -87,9 +180,17 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     acceptClick = function (callBack) {
+        //判断：“是否单亲家庭子女”不能同时与“是否孤儿”同时填“是”
+        if ($('#IsOrphan').lrselectGet().toLowerCase() == "true") {
+            if ($('#IsSingleFamilyChildren').lrselectGet().toLowerCase() == "true") {
+                learun.alert.warning("“是否单亲家庭子女”不能同时与“是否孤儿”同时填“是”");
+                return false;
+            }
+        }
         if (!$('#form').lrValidform()) {
             return false;
         }
+
         var postData = $('#form').lrGetFormData();
         $.lrSaveForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
@@ -100,3 +201,18 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
+//获取当前时间
+function getNowDate() {
+    var myDate = new Date;
+    var year = myDate.getFullYear(); //获取当前年
+    var mon = myDate.getMonth() + 1; //获取当前月
+    var date = myDate.getDate(); //获取当前日
+    var h = myDate.getHours();//获取当前小时数(0-23)
+    var m = myDate.getMinutes();//获取当前分钟数(0-59)
+    var s = myDate.getSeconds();//获取当前秒
+    var week = myDate.getDay();
+    var weeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+    //console.log(year, mon, date, weeks[week])
+    var result = year + "-" + mon + "-" + date;
+    return result;
+}

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

@@ -2,30 +2,102 @@
     ViewBag.Title = "家庭经济信息（辅导员）";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<style>
+    .lr-form-item-title{
+        width:142px;
+    }
+    .lr-form-item{
+        padding-left:142px;
+    }
+</style>
 <div class="lr-layout" >
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-
-                                @*todo:
-        所有是否项目、申请区间*@
-
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">院系</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否低保</div>
+                                    <div id="IsLowIncome"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否孤儿</div>
+                                    <div id="IsOrphan"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否单亲家庭子女</div>
+                                    <div id="IsSingleFamilyChildren"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否残疾人子女</div>
+                                    <div id="IsDisabledChildren"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">本人是否残疾</div>
+                                    <div id="IsDisabled"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否家中有大病患者</div>
+                                    <div id="IsSeriouslyIllPatientInHome"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否脱贫家庭学生</div>
+                                    <div id="IsOvercomePovertyFamilyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否脱贫不稳定家庭学生</div>
+                                    <div id="IsUnstablePovertyFamilyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否边缘易致贫家庭学生</div>
+                                    <div id="IsEdgePovertyFamilyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否边突发严重困难学生</div>
+                                    <div id="IsEdgeAcuteDifficultyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否低收入家庭</div>
+                                    <div id="IsLowIncomeFamily"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">烈士子女</div>
+                                    <div id="IsMartyrChildren"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">家庭是否遭受自然灾害</div>
+                                    <div id="FamilyIsSufferNaturalDisaster"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">家庭是否遭受突发意外事件</div>
+                                    <div id="FamilyIsSufferUnexpectEvent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否特困供养</div>
+                                    <div id="IsSpecialPovertySupport"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">家庭是否遭受疫情</div>
+                                    <div id="FamilyIsSufferEpidemic"></div>
+                                </div>
+
                             </div>
                         </div>
                     </div>
@@ -40,7 +112,7 @@
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交二级学院审核</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交二级学院</a>
                     </div>
                 </div>
             </div>

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

@@ -8,17 +8,63 @@ var selectedRow;
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 450, 560);
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabledChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabled').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsParentsLoseWork').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSeriouslyIllPatientInHome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOvercomePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsUnstablePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgeAcuteDifficultyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsLowIncomeFamily').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsMartyrChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferNaturalDisaster').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferUnexpectEvent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSpecialPovertySupport').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferEpidemic').lrDataItemSelect({ code: 'YesOrNoBit' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -30,8 +76,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/StudentWork/FamilyEconomy/Form',
-                    width: 700,
-                    height: 400,
+                    width: 1100,
+                    height: 800,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -51,8 +97,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/StudentWork/FamilyEconomy/Form?keyValue=' + keyValue,
-                        width: 700,
-                        height: 400,
+                        width: 1100,
+                        height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -88,7 +134,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/...', { keyValue: keyValue }, function () {
+                            learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/DoSubmit', { keyValue: keyValue, status: '1', step: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -130,26 +176,125 @@ var bootstrap = function ($, learun) {
                     },
                     { label: '身份证件类型', name: 'IdCardType', width: 100, align: "left" },
                     { label: '身份证件号', name: 'IdentityCardNo', width: 100, align: "left" },
-                    { label: '申请时间', name: 'ApplyTime', width: 100, align: "left" },
-                    { label: '是否低保', name: 'IsLowIncome', width: 100, align: "left" },
-                    { label: '是否孤儿', name: 'IsOrphan', width: 100, align: "left" },
-                    { label: '是否单亲家庭子女', name: 'IsSingleFamilyChildren', width: 150, align: "left" },
-                    { label: '是否残疾人子女', name: 'IsDisabledChildren', width: 100, align: "left" },
-                    { label: '本人是否残疾', name: 'IsDisabled', width: 100, align: "left" },
-                    { label: '残疾类别', name: 'DisabledCategory', width: 100, align: "left" },
-                    { label: '是否父母丧失劳动能力', name: 'IsParentsLoseWork', width: 150, align: "left" },
-                    { label: '是否家中有大病患者', name: 'IsSeriouslyIllPatientInHome', width: 150, align: "left" },
-                    { label: '是否脱贫家庭学生', name: 'IsOvercomePovertyFamilyStudent', width: 150, align: "left" },
-                    { label: '是否脱贫不稳定家庭学生', name: 'IsUnstablePovertyFamilyStudent', width: 150, align: "left" },
-                    { label: '是否边缘易致贫家庭学生', name: 'IsEdgePovertyFamilyStudent', width: 150, align: "left" },
-                    { label: '是否边突发严重困难学生', name: 'IsEdgeAcuteDifficultyStudent', width: 150, align: "left" },
-                    { label: '是否低收入家庭', name: 'IsLowIncomeFamily', width: 100, align: "left" },
-                    { label: '烈士子女', name: 'IsMartyrChildren', width: 100, align: "left" },
+                    {
+                        label: '申请时间', name: 'ApplyTime', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue.substring(0, 11);
+                        }
+                    },
+                    {
+                        label: '是否低保', name: 'IsLowIncome', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否孤儿', name: 'IsOrphan', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否单亲家庭子女', name: 'IsSingleFamilyChildren', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否残疾人子女', name: 'IsDisabledChildren', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '本人是否残疾', name: 'IsDisabled', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '残疾类别', name: 'DisabledCategory', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DisabledCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否父母丧失劳动能力', name: 'IsParentsLoseWork', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否家中有大病患者', name: 'IsSeriouslyIllPatientInHome', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否脱贫家庭学生', name: 'IsOvercomePovertyFamilyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否脱贫不稳定家庭学生', name: 'IsUnstablePovertyFamilyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否边缘易致贫家庭学生', name: 'IsEdgePovertyFamilyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否边突发严重困难学生', name: 'IsEdgeAcuteDifficultyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否低收入家庭', name: 'IsLowIncomeFamily', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '烈士子女', name: 'IsMartyrChildren', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
                     { label: '家庭人均年收入', name: 'FamilyAverageIncome', width: 100, align: "left" },
-                    { label: '家庭主要收入来源类型', name: 'FamilyIncomeSourceCategory', width: 150, align: "left" },
-                    { label: '家庭是否遭受自然灾害', name: 'FamilyIsSufferNaturalDisaster', width: 150, align: "left" },
+                    {
+                        label: '家庭主要收入来源类型', name: 'FamilyIncomeSourceCategory', width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'FamilyIncomeSourceCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '家庭是否遭受自然灾害', name: 'FamilyIsSufferNaturalDisaster', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
                     { label: '自然灾害具体情况描述', name: 'SufferNaturalDisasterDescription', width: 150, align: "left" },
-                    { label: '家庭是否遭受突发意外事件', name: 'FamilyIsSufferUnexpectEvent', width: 200, align: "left" },
+                    {
+                        label: '家庭是否遭受突发意外事件', name: 'FamilyIsSufferUnexpectEvent', width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
                     { label: '突发意外事件具体描述', name: 'SufferUnexpectEventDescription', width: 150, align: "left" },
                     { label: '家庭欠债金额', name: 'FamilyOwesAmount', width: 100, align: "left" },
                     { label: '家庭欠债原因', name: 'FamilyOwesReason', width: 100, align: "left" },
@@ -158,12 +303,38 @@ var bootstrap = function ($, learun) {
                     { label: '家庭成员失业人数', name: 'FamilyUnemployNumber', width: 150, align: "left" },
                     { label: '赡养人口数', name: 'SupportNumber', width: 100, align: "left" },
                     { label: '其他信息', name: 'OtherInformation', width: 100, align: "left" },
-                    { label: '是否特困供养', name: 'IsSpecialPovertySupport', width: 100, align: "left" },
+                    {
+                        label: '是否特困供养', name: 'IsSpecialPovertySupport', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
                     { label: '其他', name: 'Others', width: 100, align: "left" },
-                    { label: '家庭是否遭受疫情', name: 'FamilyIsSufferEpidemic', width: 150, align: "left" },
+                    {
+                        label: '家庭是否遭受疫情', name: 'FamilyIsSufferEpidemic', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
                     { label: '家庭遭受疫情具体情况描述', name: 'SufferEpidemicDescription', width: 200, align: "left" },
-                    { label: '认定困难级别名称', name: 'IdentifyDifficultyLevel', width: 100, align: "left" },
-                    { label: '认定时间', name: 'IdentifyTime', width: 130, align: "left" },
+                    {
+                        label: '认定困难级别名称', name: 'IdentifyDifficultyLevel', width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DifficultyLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '认定时间', name: 'IdentifyTime', width: 100, align: "left", formatter: function (cellvalue) {
+                            if (cellvalue != null && cellvalue != undefined && cellvalue != "") {
+                                return cellvalue.substring(0, 11);
+                            }
+                        }
+                    },
                     { label: '认定原因', name: 'IdentifyReason', width: 100, align: "left" },
                     { label: '班级认定意见', name: 'ClassIdentifyOpinion', width: 100, align: "left" },
                     { label: '年级认定意见', name: 'GradeIdentifyOpinion', width: 100, align: "left" },
@@ -172,23 +343,69 @@ var bootstrap = function ($, learun) {
                             return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "归档" : "草稿";
                         }
                     },
-                    { label: '创建人', name: 'CreateUserId', width: 100, align: "left" },
+                    {
+                        label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
                     { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
-                    { label: '提交人', name: 'SubmitUserId', width: 100, align: "left" },
-                    { label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left" },
+                    {
+                        label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
-                    { label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left" },
+                    {
+                        label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true,
-                sidx:'CreateTime desc'
+                sidx: 'CreateTime desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -0,0 +1,122 @@
+@{
+    ViewBag.Title = "家庭经济信息（辅导员）";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-form-item-title{
+        width:142px;
+    }
+    .lr-form-item{
+        padding-left:142px;
+    }
+</style>
+<div class="lr-layout" >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <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 id="F_SchoolId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否低保</div>
+                                    <div id="IsLowIncome"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否孤儿</div>
+                                    <div id="IsOrphan"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否单亲家庭子女</div>
+                                    <div id="IsSingleFamilyChildren"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否残疾人子女</div>
+                                    <div id="IsDisabledChildren"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">本人是否残疾</div>
+                                    <div id="IsDisabled"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否家中有大病患者</div>
+                                    <div id="IsSeriouslyIllPatientInHome"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否脱贫家庭学生</div>
+                                    <div id="IsOvercomePovertyFamilyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否脱贫不稳定家庭学生</div>
+                                    <div id="IsUnstablePovertyFamilyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否边缘易致贫家庭学生</div>
+                                    <div id="IsEdgePovertyFamilyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否边突发严重困难学生</div>
+                                    <div id="IsEdgeAcuteDifficultyStudent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否低收入家庭</div>
+                                    <div id="IsLowIncomeFamily"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">烈士子女</div>
+                                    <div id="IsMartyrChildren"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">家庭是否遭受自然灾害</div>
+                                    <div id="FamilyIsSufferNaturalDisaster"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">家庭是否遭受突发意外事件</div>
+                                    <div id="FamilyIsSufferUnexpectEvent"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否特困供养</div>
+                                    <div id="IsSpecialPovertySupport"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">家庭是否遭受疫情</div>
+                                    <div id="FamilyIsSufferEpidemic"></div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交学工部</a>
+                        <a id="lr_back" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;退回辅导员</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/StudentWork/Views/FamilyEconomy/IndexOfTwo.js")

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

@@ -0,0 +1,403 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-16 17:18
+ * 描  述：家庭经济信息（辅导员）
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var startTime;
+    var endTime;
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 450, 560);
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#IsLowIncome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOrphan').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSingleFamilyChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabledChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsDisabled').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsParentsLoseWork').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSeriouslyIllPatientInHome').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsOvercomePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsUnstablePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgePovertyFamilyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsEdgeAcuteDifficultyStudent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsLowIncomeFamily').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsMartyrChildren').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferNaturalDisaster').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferUnexpectEvent').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#IsSpecialPovertySupport').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FamilyIsSufferEpidemic').lrDataItemSelect({ code: 'YesOrNoBit' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 审核
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项不属于学院审核状态，无法审核！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'formOfTwo',
+                        title: '审核',
+                        url: top.$.rootUrl + '/StudentWork/FamilyEconomy/Form?Step=2&keyValue=' + keyValue,
+                        width: 1100,
+                        height: 800,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 提交学工部审核
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项不属于学院审核状态，无法提交学工部审核！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/DoSubmit', { keyValue: keyValue, status: '2', step: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 退回辅导员
+            $('#lr_back').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项不属于学院审核状态，无法退回辅导员！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认退回该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/StudentWork/FamilyEconomy/DoBack', { keyValue: keyValue, status: '0', step: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/StudentWork/FamilyEconomy/GetPageList',
+                headData: [
+                    { label: '学号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '姓名', name: 'StuName', width: 100, align: "left" },
+                    {
+                        label: '院校', name: 'F_SchoolId', width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        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',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '身份证件类型', name: 'IdCardType', width: 100, align: "left" },
+                    { label: '身份证件号', name: 'IdentityCardNo', width: 100, align: "left" },
+                    {
+                        label: '申请时间', name: 'ApplyTime', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue.substring(0, 11);
+                        }
+                    },
+                    {
+                        label: '是否低保', name: 'IsLowIncome', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否孤儿', name: 'IsOrphan', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否单亲家庭子女', name: 'IsSingleFamilyChildren', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否残疾人子女', name: 'IsDisabledChildren', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '本人是否残疾', name: 'IsDisabled', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '残疾类别', name: 'DisabledCategory', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DisabledCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '是否父母丧失劳动能力', name: 'IsParentsLoseWork', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否家中有大病患者', name: 'IsSeriouslyIllPatientInHome', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否脱贫家庭学生', name: 'IsOvercomePovertyFamilyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否脱贫不稳定家庭学生', name: 'IsUnstablePovertyFamilyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否边缘易致贫家庭学生', name: 'IsEdgePovertyFamilyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否边突发严重困难学生', name: 'IsEdgeAcuteDifficultyStudent', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '是否低收入家庭', name: 'IsLowIncomeFamily', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    {
+                        label: '烈士子女', name: 'IsMartyrChildren', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    { label: '家庭人均年收入', name: 'FamilyAverageIncome', width: 100, align: "left" },
+                    {
+                        label: '家庭主要收入来源类型', name: 'FamilyIncomeSourceCategory', width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'FamilyIncomeSourceCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '家庭是否遭受自然灾害', name: 'FamilyIsSufferNaturalDisaster', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    { label: '自然灾害具体情况描述', name: 'SufferNaturalDisasterDescription', width: 150, align: "left" },
+                    {
+                        label: '家庭是否遭受突发意外事件', name: 'FamilyIsSufferUnexpectEvent', width: 200, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    { label: '突发意外事件具体描述', name: 'SufferUnexpectEventDescription', width: 150, align: "left" },
+                    { label: '家庭欠债金额', name: 'FamilyOwesAmount', width: 100, align: "left" },
+                    { label: '家庭欠债原因', name: 'FamilyOwesReason', width: 100, align: "left" },
+                    { label: '家庭人口数', name: 'FamilyNumber', width: 100, align: "left" },
+                    { label: '劳动力人口数', name: 'LaborNumber', width: 100, align: "left" },
+                    { label: '家庭成员失业人数', name: 'FamilyUnemployNumber', width: 150, align: "left" },
+                    { label: '赡养人口数', name: 'SupportNumber', width: 100, align: "left" },
+                    { label: '其他信息', name: 'OtherInformation', width: 100, align: "left" },
+                    {
+                        label: '是否特困供养', name: 'IsSpecialPovertySupport', width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    { label: '其他', name: 'Others', width: 100, align: "left" },
+                    {
+                        label: '家庭是否遭受疫情', name: 'FamilyIsSufferEpidemic', width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "是" : "否";
+                        }
+                    },
+                    { label: '家庭遭受疫情具体情况描述', name: 'SufferEpidemicDescription', width: 200, align: "left" },
+                    {
+                        label: '认定困难级别名称', name: 'IdentifyDifficultyLevel', width: 150, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DifficultyLevel',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '认定时间', name: 'IdentifyTime', width: 100, align: "left", formatter: function (cellvalue) {
+                            if (cellvalue != null && cellvalue != undefined && cellvalue != "") {
+                                return cellvalue.substring(0, 11);
+                            }
+                        }
+                    },
+                    { label: '认定原因', name: 'IdentifyReason', width: 100, align: "left" },
+                    { label: '班级认定意见', name: 'ClassIdentifyOpinion', width: 100, align: "left" },
+                    { label: '年级认定意见', name: 'GradeIdentifyOpinion', width: 100, align: "left" },
+                    {
+                        label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "0" ? "草稿" : cellvalue == "1" ? "学院审核中" : cellvalue == "2" ? "学工部审核中" : cellvalue == "3" ? "归档" : "草稿";
+                        }
+                    },
+                    {
+                        label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+                    { label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
+                    {
+                        label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
+                    {
+                        label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'SubmitTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
+            param.Step = "2";//第二步：二级学院审核
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1692,6 +1692,7 @@
     <Content Include="Areas\PersonnelManagement\Views\WorkStudyPositionApply\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\SalaryInfo\IndexPersonal.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\Form.js" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\IndexOfTwo.js" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\Index.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerIndex.js" />
     <Content Include="Areas\StudentWork\Views\SW_Ask_Main\AnswerQuery.js" />
@@ -8110,6 +8111,7 @@
     <Content Include="Areas\EducationalAdministration\Views\PsychologyInfo\FormView.cshtml" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\Form.cshtml" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\Index.cshtml" />
+    <Content Include="Areas\StudentWork\Views\FamilyEconomy\IndexOfTwo.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -23,7 +23,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         /// </summary>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
-        public IEnumerable<FamilyEconomyEntity> GetList( string queryJson )
+        public IEnumerable<FamilyEconomyEntity> GetList(string queryJson)
         {
             try
             {
@@ -142,6 +142,52 @@ namespace Learun.Application.TwoDevelopment.StudentWork
             }
         }
 
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string step)
+        {
+            try
+            {
+                familyEconomyService.DoSubmit(keyValue, status, step);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoBack(string keyValue, string status, string step)
+        {
+            try
+            {
+                familyEconomyService.DoBack(keyValue, status, step);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }

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

@@ -273,6 +273,12 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         [Column("CREATEUSERID")]
         public string CreateUserId { get; set; }
         /// <summary>
+        /// 创建人
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATEUSERNO")]
+        public string CreateUserNo { get; set; }
+        /// <summary>
         /// 创建时间
         /// </summary>
         /// <returns></returns>
@@ -285,6 +291,12 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         [Column("MODIFYUSERID")]
         public string ModifyUserId { get; set; }
         /// <summary>
+        /// 编辑人
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODIFYUSERNO")]
+        public string ModifyUserNo { get; set; }
+        /// <summary>
         /// 编辑时间
         /// </summary>
         /// <returns></returns>
@@ -337,6 +349,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
             this.Id = Guid.NewGuid().ToString();
             this.CreateTime = DateTime.Now;
             this.CreateUserId = LoginUserInfo.Get().userId;
+            this.CreateUserNo = LoginUserInfo.Get().account;
             this.Status = "0";//草稿
         }
         /// <summary>
@@ -348,6 +361,7 @@ namespace Learun.Application.TwoDevelopment.StudentWork
             this.Id = keyValue;
             this.ModifyTime = DateTime.Now;
             this.ModifyUserId = LoginUserInfo.Get().userId;
+            this.ModifyUserNo = LoginUserInfo.Get().account;
         }
         #endregion
 

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

@@ -49,6 +49,18 @@ namespace Learun.Application.TwoDevelopment.StudentWork
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, FamilyEconomyEntity entity);
+
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoSubmit(string keyValue, string status, string step);
+
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DoBack(string keyValue, string status, string step);
         #endregion
 
     }

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

@@ -141,6 +141,8 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                 strSql.Append("SELECT t.*,s.StuName,s.F_SchoolId,s.ClassNo,s.IdentityCardNo ");
                 strSql.Append(" FROM FamilyEconomy t ");
                 strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo ");
+                strSql.Append(" left join ClassInfo c on t.CreateUserNo=c.ClassTutorNo and s.ClassNo=c.ClassNo ");
+                strSql.Append(" left join CdDept d on c.DeptNo=d.DeptNo ");
                 strSql.Append(" where 1=1 ");
                 if (!queryParam["StuNo"].IsEmpty())
                 {
@@ -157,7 +159,97 @@ namespace Learun.Application.TwoDevelopment.StudentWork
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.ClassNo = @ClassNo ");
                 }
-                //todo:
+                if (!queryParam["IsLowIncome"].IsEmpty())
+                {
+                    dp.Add("IsLowIncome", queryParam["IsLowIncome"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsLowIncome = @IsLowIncome ");
+                }
+                if (!queryParam["IsOrphan"].IsEmpty())
+                {
+                    dp.Add("IsOrphan", queryParam["IsOrphan"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsOrphan = @IsOrphan ");
+                }
+                if (!queryParam["IsSingleFamilyChildren"].IsEmpty())
+                {
+                    dp.Add("IsSingleFamilyChildren", queryParam["IsSingleFamilyChildren"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsSingleFamilyChildren = @IsSingleFamilyChildren ");
+                }
+                if (!queryParam["IsDisabledChildren"].IsEmpty())
+                {
+                    dp.Add("IsDisabledChildren", queryParam["IsDisabledChildren"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsDisabledChildren = @IsDisabledChildren ");
+                }
+                if (!queryParam["IsDisabled"].IsEmpty())
+                {
+                    dp.Add("IsDisabled", queryParam["IsDisabled"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsDisabled = @IsDisabled ");
+                }
+                if (!queryParam["IsSeriouslyIllPatientInHome"].IsEmpty())
+                {
+                    dp.Add("IsSeriouslyIllPatientInHome", queryParam["IsSeriouslyIllPatientInHome"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsSeriouslyIllPatientInHome = @IsSeriouslyIllPatientInHome ");
+                }
+                if (!queryParam["IsOvercomePovertyFamilyStudent"].IsEmpty())
+                {
+                    dp.Add("IsOvercomePovertyFamilyStudent", queryParam["IsOvercomePovertyFamilyStudent"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsOvercomePovertyFamilyStudent = @IsOvercomePovertyFamilyStudent ");
+                }
+                if (!queryParam["IsUnstablePovertyFamilyStudent"].IsEmpty())
+                {
+                    dp.Add("IsUnstablePovertyFamilyStudent", queryParam["IsUnstablePovertyFamilyStudent"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsUnstablePovertyFamilyStudent = @IsUnstablePovertyFamilyStudent ");
+                }
+                if (!queryParam["IsEdgePovertyFamilyStudent"].IsEmpty())
+                {
+                    dp.Add("IsEdgePovertyFamilyStudent", queryParam["IsEdgePovertyFamilyStudent"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsEdgePovertyFamilyStudent = @IsEdgePovertyFamilyStudent ");
+                }
+                if (!queryParam["IsEdgeAcuteDifficultyStudent"].IsEmpty())
+                {
+                    dp.Add("IsEdgeAcuteDifficultyStudent", queryParam["IsEdgeAcuteDifficultyStudent"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsEdgeAcuteDifficultyStudent = @IsEdgeAcuteDifficultyStudent ");
+                }
+                if (!queryParam["IsLowIncomeFamily"].IsEmpty())
+                {
+                    dp.Add("IsLowIncomeFamily", queryParam["IsLowIncomeFamily"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsLowIncomeFamily = @IsLowIncomeFamily ");
+                }
+                if (!queryParam["IsMartyrChildren"].IsEmpty())
+                {
+                    dp.Add("IsMartyrChildren", queryParam["IsMartyrChildren"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsMartyrChildren = @IsMartyrChildren ");
+                }
+                if (!queryParam["FamilyIsSufferNaturalDisaster"].IsEmpty())
+                {
+                    dp.Add("FamilyIsSufferNaturalDisaster", queryParam["FamilyIsSufferNaturalDisaster"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.FamilyIsSufferNaturalDisaster = @FamilyIsSufferNaturalDisaster ");
+                }
+                if (!queryParam["FamilyIsSufferUnexpectEvent"].IsEmpty())
+                {
+                    dp.Add("FamilyIsSufferUnexpectEvent", queryParam["FamilyIsSufferUnexpectEvent"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.FamilyIsSufferUnexpectEvent = @FamilyIsSufferUnexpectEvent ");
+                }
+                if (!queryParam["IsSpecialPovertySupport"].IsEmpty())
+                {
+                    dp.Add("IsSpecialPovertySupport", queryParam["IsSpecialPovertySupport"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.IsSpecialPovertySupport = @IsSpecialPovertySupport ");
+                }
+                if (!queryParam["FamilyIsSufferEpidemic"].IsEmpty())
+                {
+                    dp.Add("FamilyIsSufferEpidemic", queryParam["FamilyIsSufferEpidemic"].ToBool(), DbType.Boolean);
+                    strSql.Append(" AND t.FamilyIsSufferEpidemic = @FamilyIsSufferEpidemic ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    strSql.Append($" AND t.ApplyTime>='{queryParam["StartTime"].ToString()}' and  t.ApplyTime<='{queryParam["EndTime"].ToString()}' ");
+                }
+                if (!queryParam["Step"].IsEmpty() && queryParam["Step"].ToString() == "2")//第二步：二级学院审核
+                {
+                    //不查看状态为草稿的记录
+                    strSql.Append(" AND t.Status > 0 ");
+                    //二级学院审核专员==系部负责人==登录用户
+                    strSql.Append($" and d.DeptDirector='{LoginUserInfo.Get().account}' ");
+                }
 
                 return this.BaseRepository("CollegeMIS").FindList<FamilyEconomyEntity>(strSql.ToString(), dp, pagination);
             }
@@ -258,6 +350,72 @@ namespace Learun.Application.TwoDevelopment.StudentWork
             }
         }
 
+        /// <summary>
+        /// 提交
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoSubmit(string keyValue, string status, string step)
+        {
+            try
+            {
+                if (step == "1")//第一步：提交二级学院审核
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update FamilyEconomy set SubmitTime='{DateTime.Now}',SubmitUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "2")//第二步：提交学工部审核
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update FamilyEconomy set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "3")//第三步：归档
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update FamilyEconomy set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DoBack(string keyValue, string status, string step)
+        {
+            try
+            {
+                if (step == "2")//第二步：退回辅导员
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update FamilyEconomy set FirstCheckTime='{DateTime.Now}',FirstCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+                else if (step == "3")//第三步：退回辅导员、退回二级学院
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update FamilyEconomy set SecondCheckTime='{DateTime.Now}',SecondCheckUserId='{LoginUserInfo.Get().userId}',Status='{status}' where Id='{keyValue}' ");
+                }
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }