招生模块调整

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

@@ -17,11 +17,13 @@
                 <div><span>专业</span><strong></strong></div>
                 <div><span>班级</span><strong></strong></div>
                 <div><span>教室</span><strong></strong></div>
+				<div><span>学号</span><strong></strong></div>
+				<div><span>寝室号</span><strong></strong></div>
             </div>
-			<div class="sQrText">
+			<!-- <div class="sQrText">
 				<div>班主任姓名 <span></span></div>
 				<div>班主任电话 <span></span></div>
-			</div>
+			</div> -->
 			<div class="sQrText">
 				<div>辅导员姓名 <span></span></div>
 				<div>辅导员电话 <span></span></div>

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

@@ -42,9 +42,11 @@
                     $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo);
                     $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo);
                     $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName);
+					$('.sQrList strong').eq(5).html(data.StuInfoFreshEntity.StuNo);
+					$('.sQrList strong').eq(6).html(data.StuInfoFreshEntity.DormitoryName);
                     //班主任
-                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
-                    $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
+                    // $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
+                    // $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
                     //辅导员
                     $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "");
                     $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile);

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

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

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

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var page = {
         isScroll: false,
         init: function ($page) {
@@ -29,11 +29,15 @@
                 var postdata = {
                     ID: $('#ID').val(),
                     StudentLoan: $('#StudentLoan').val(),
-                    StudentLoanStatus: "0"
+                    StudentLoanStatus: "0",
+					StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet();
                 };
                 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) {
+				    postdata.StudentLoanBLStatus = "2";
+				}
                 learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => {
                     if (data) {
                         learun.layer.toast('保存成功');
@@ -47,7 +51,11 @@
 
         },
         bind: function ($page) {
-
+			$page.find('#StudentLoanBLStatus').lrselect({
+			    type: 'StudentLoanBLStatus', 
+			    needPre:false
+			}); 
+			
         }
     };
 

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

@@ -24,7 +24,7 @@
                 <img src="images/enter2-2.png" alt="">
                 <div class="sSec1Txt">
                     线上缴费
-                    <span>( 已缴费、未缴费 )</span>
+                    <span>(地址：http://onlinepay.xcmzyz.com/)</span>
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>
@@ -36,14 +36,14 @@
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>
-            <div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
+            <!-- <div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
                 <img src="images/enter2-4.png" alt="">
                 <div class="sSec1Txt">
                     现场缴费
                     <span>( 已缴费、缓交、部分缴费、未缴费 )</span>
                 </div>
                 <div class="sSec1State">未完成</div>
-            </div>
+            </div> -->
         </div>
         <div class="eSec1Box">
             <img src="images/enter1-6.png" alt="" class="sSecDown">

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

@@ -29,11 +29,11 @@
                     } else {
                         notCompleteStyle("#StudentLoan", "images/enter2-3.png");
                     }
-                    if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
-                        completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
-                    } else {
-                        notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
-                    }
+                    // if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
+                    //     completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+                    // } else {
+                    //     notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+                    // }
                     if (data["StuInfoFreshEntity"].RegisterStatus == "1") {
                         completeStyle("#RegisterStatus", "images/enter1-5.png");
                     } else {

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

@@ -102,7 +102,7 @@
 					</div>
 					<div class="welInput">
 						<span>联系电话</span>
-						<input class="welInputs" id="telephone" type="text" placeholder="请填写联系电话(重要)" />
+						<input class="welInputs" id="telephone" type="text"  onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" placeholder="请填写联系电话(重要)" />
 					</div>
 				</div>
 				<div class="welT2">紧急联系人</div>

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

@@ -220,6 +220,17 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
+                    {
+                        label: '办理贷款状态', name: 'StudentLoanBLStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StudentLoanBLStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
                     {
                         label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {

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

@@ -382,7 +382,11 @@ namespace Learun.Application.WebApi.Modules
             /// <summary>
             /// 贷款回执码状态
             /// </summary>
-            public string StudentLoanStatus { get; set; }
+            public string StudentLoanStatus { get; set; }    
+            /// <summary>
+            /// 办理贷款状态
+            /// </summary>
+            public string StudentLoanBLStatus { get; set; }
             /// <summary>
             /// 家庭成员
             /// </summary>

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

@@ -507,6 +507,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUDENTLOAN")]
         public string StudentLoan { get; set; }
         /// <summary> 
+        /// 助学贷款：办理贷款状态
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("STUDENTLOANBLSTATUS")]
+        public string StudentLoanBLStatus { get; set; }
+        /// <summary> 
         /// 助学贷款状态：1已审核0未审核
         /// </summary> 
         /// <returns></returns>