迎新修改，去掉贷款审核

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html

@@ -1,13 +1,14 @@
 <div class="welcome">
     
     <div class="welBox2">
-        <div class="welInput">
+        <!-- <div class="welInput">
             <span>贷款回执码</span>
             <input id="ID" type="hidden"/>
             <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" value=""/>
-        </div>
+        </div> -->
 		<div class="welInput">
 			<span>办理贷款状态</span>
+			<input id="ID" type="hidden"/>
 			<div id="StudentLoanBLStatus"></div>
 		</div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js

@@ -5,12 +5,12 @@
             //数据绑定 
             learun.layer.loading(true, '获取数据中');
             learun.httpget(config.webapi + "StuInfoFresh/stuInfoFresh", {}, (data) => {
-				console.log(data);
                 if (data) {
                     for (var id in data) {
                         if (id == "StuInfoFreshEntity") {
                             $page.find("#ID").val(data[id].ID);
-                            $page.find("#StudentLoan").val(data[id].StudentLoan);
+							$page.find("#StudentLoanBLStatus").lrpickerSet(data[id].StudentLoanBLStatus);
+                            //$page.find("#StudentLoan").val(data[id].StudentLoan);
                             if (data[id].StudentLoanStatus == "1") {
                                 learun.layer.loading(false);
                                 learun.layer.confirm('新生助学贷款已审核！', function (_index) {
@@ -29,14 +29,15 @@
             $page.find('#saveBtn').on('tap', function () {
                 var postdata = {
                     ID: $('#ID').val(),
-                    StudentLoan: $('#StudentLoan').val(),
+                    // StudentLoan: $('#StudentLoan').val(),
+					StudentLoan: '',
                     StudentLoanStatus: "0",
-					StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet()
+					StudentLoanBLStatus:$("#StudentLoanBLStatus").lrpickerGet()
                 };
-                if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
-                    postdata.StudentLoanStatus = "1";
-                }
-				if ($('#StudentLoanBLStatus').lrselectGet().trim() != null && $('#StudentLoanBLStatus').lrselectGet().trim() != "" && $('#StudentLoanBLStatus').lrselectGet().trim() != undefined) {
+                // if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
+                //     postdata.StudentLoanStatus = "1";
+                // }
+				if ($('#StudentLoanBLStatus').lrpickerGet().trim() != null && $('#StudentLoanBLStatus').lrpickerGet().trim() != "" && $('#StudentLoanBLStatus').lrpickerGet().trim() != undefined) {
 				    postdata.StudentLoanBLStatus = "2";
 				}
                 learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html

@@ -3,7 +3,7 @@
     <!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
     <!-- 可以点击类名  sSec1Tap -->
     <div class="ensHeader">
-        <div class="ensTime">2020</div>
+        <div class="ensTime">2021</div>
         <div class="ensHeadT">新生入校流程</div>
     </div>
     <div class="ensSec1">
@@ -32,7 +32,7 @@
                 <img src="images/enter2-3.png" alt="">
                 <div class="sSec1Txt">
                     助学贷款
-                    <span>( 填写贷款回执码 )</span>
+                    <span>( 选择办理贷款状态 )</span>
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js

@@ -24,7 +24,7 @@
                     } else {
                         notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
                     }
-                    if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") {
+                    if (data["StuInfoFreshEntity"].StudentLoanBLStatus) {
                         completeStyle("#StudentLoan", "images/enter1-3.png");
                     } else {
                         notCompleteStyle("#StudentLoan", "images/enter2-3.png");

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml

@@ -25,9 +25,11 @@
                         @*<a id="lr_payFee" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;缴费</a>*@
                         <a id="lr_pay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;线上缴费</a>
                         <a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消线上缴费</a>
-                        <a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;填写贷款回执码</a>
-                        <a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核助学贷款</a>
-                        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;去审核助学贷款</a>
+                        @*<a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;填写贷款回执码</a>*@
+                        @*<a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核助学贷款</a>
+                        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;去审核助学贷款</a>*@
+                        <a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;已办理贷款</a>
+                        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;正在办理贷款</a>
                         <a id="lr_onsitePay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;现场缴费</a>
                         <a id="lr_otherPay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;其他费用缴费</a>
                         <a id="lr_cancelOtherPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消其他费用缴费</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js

@@ -115,16 +115,23 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.StudentLoanStatus == "1") {
-                        learun.alert.warning("当前新生助学贷款已审核！");
-                        return;
-                    }
-                    if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) {
-                        learun.alert.warning("贷款回执码为空！");
-                        return;
-                    }
+                    //if (selectedRow.StudentLoanStatus == "1") {
+                    //    learun.alert.warning("当前新生助学贷款已审核！");
+                    //    return;
+                    //}
+                    //if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) {
+                    //    learun.alert.warning("贷款回执码为空！");
+                    //    return;
+                    //}
 
-                    learun.layerConfirm('是否确认审核助学贷款！', function (res) {
+                    //learun.layerConfirm('是否确认审核助学贷款！', function (res) {
+                    //    if (res) {
+                    //        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () {
+                    //            refreshGirdData();
+                    //        });
+                    //    }
+                    //});
+                    learun.layerConfirm('是否确认已办理贷款！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () {
                                 refreshGirdData();
@@ -138,13 +145,20 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.StudentLoanStatus != "1") {
-                        learun.alert.warning("当前新生助学贷款未审核！");
-                        return;
-                    }
-                    learun.layerConfirm('是否确认去审核助学贷款！', function (res) {
+                    //if (selectedRow.StudentLoanStatus != "1") {
+                    //    learun.alert.warning("当前新生助学贷款未审核！");
+                    //    return;
+                    //}
+                    //learun.layerConfirm('是否确认去审核助学贷款！', function (res) {
+                    //    if (res) {
+                    //        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () {
+                    //            refreshGirdData();
+                    //        });
+                    //    }
+                    //});
+                    learun.layerConfirm('是否确认正在办理贷款！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 2 }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -231,12 +245,12 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
-                    {
-                        label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {
-                            return value == 1 ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-warning\">未审核</span>";
-                        }
-                    },
+                    //{ label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
+                    //{
+                    //    label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {
+                    //        return value == 1 ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-warning\">未审核</span>";
+                    //    }
+                    //},
                     {
                         label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs

@@ -202,7 +202,7 @@ namespace Learun.Application.WebApi.Modules
             var entity = stuInfoFreshIBLL.GetStuInfoFreshEntity(model.ID);
             entity.StudentLoan = model.StudentLoan;
             entity.StudentLoanStatus = model.StudentLoanStatus;
-
+            entity.StudentLoanBLStatus = model.StudentLoanBLStatus;
             stuInfoFreshIBLL.SaveEntity(entity.ID, entity);
 
             return Success("保存成功");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -1148,13 +1148,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                if (status == "1")//通过
+                //if (status == "1")//通过
+                //{
+                //    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' ");
+                //}
+                //else
+                //{
+                //    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' ");
+                //}
+                if (status == "1")//已办理
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='1' where ID='" + keyValue + "' ");
                 }
                 else
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='2' where ID='" + keyValue + "' ");
                 }
             }
             catch (Exception ex)