From 76918a1d2b8c5346d037ed905853a328175ab66a Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 16 Mar 2022 10:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=B8=AA=E4=BA=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E7=9C=8B=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=20=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E7=9C=8B=E6=98=AF=E5=90=A6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=85=A7=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Index.js               | 11 ++++
 .../Views/UserCenter/Index.cshtml             | 53 ++++++++++++++++---
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 7e6cf302f..22171f71c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
@@ -437,7 +437,18 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                         }
+                    },
+                    {
+                        label: "是否上传头像", name: "Photo", width: 80, align: "center",
+                        formatter: function (cellvalue) {
+                            if (cellvalue != null && cellvalue != "" && cellvalue != undefined) {
+                                return cellvalue = "<span class=\"label label-success\">是</span>";
+                            } else {
+                                return cellvalue= "<span class=\"label label-danger\">否</span>";
+                            }
+                        }
                     }
+
                 ],
                 mainId: 'StuId',
                 isPage: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml
index abe15e070..dfd60aa8d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml	
@@ -95,11 +95,14 @@
                                         <ul class="userSec1R">
                                             <li>性 &nbsp; &nbsp; &nbsp; 别 : {{studentInfo.GenderNo | sex}}</li>
                                             <li>出生日期 : {{studentInfo.Birthday | date}}</li>
+                                            <li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
+                                            @*<li>性 &nbsp; &nbsp; &nbsp; 别 : {{studentInfo.GenderNo | sex}}</li>
+                                            <li>出生日期 : {{studentInfo.Birthday | date}}</li>
                                             <li>联系电话 : {{studentInfo.mobile}}</li>
                                             <li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
                                             <li>学 &nbsp; &nbsp; &nbsp; 号 : {{studentInfo.StuNo}}</li>
                                             <li>本 &nbsp;专 &nbsp;科 : {{studentInfo.GraduateNo | graduateNo}}</li>
-                                            <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
+                                            <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>*@
                                         </ul>
                                     </div>
                                 </div>
@@ -112,32 +115,51 @@
                                             <li>民  族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
                                             <li>政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
                                             <li>身份证号 : {{studentInfo.IdentityCardNo}}  </li>
+                                            <li>户口所在地 : {{studentInfo.FatherUnit}}</li>
+                                            @*<li>民  族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
+                                            <li>政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
+                                            <li>身份证号 : {{studentInfo.IdentityCardNo}}  </li>
                                             <li>E-mail : {{studentInfo.EMail}}</li>
                                             <li>户 籍  省 : {{studentInfo.F_ProvinceId | province}} </li>
                                             <li>户籍地市 : {{studentInfo.F_CityId | city}} </li>
                                             <li>户籍县区 : {{studentInfo.F_CountyId | area}}    </li>
-                                            <li>户籍地址 : {{studentInfo.FatherUnit}}</li>
+                                            <li>户籍地址 : {{studentInfo.FatherUnit}}</li>*@
                                         </ul>
                                     </div>
 
                                     <div class="userSec2Box">
                                         <div class="userSec2T">家庭情况  <i class="fa fa-angle-right"></i></div>
                                         <ul class="userSec2List">
-                                            <li>父亲姓名 : {{studentInfo.FatherName}} </li>
+                                            <li>监护人姓名 : {{studentInfo.Guardian}}</li>
+                                            <li>监护人联系电话 : {{studentInfo.GuardianPhone}}</li>
+                                            <li>与监护人关系 : {{studentInfo.GuardianType |guardiantype}}</li>
+                                            <li>邮政编码 : {{studentInfo.PostalCode}}</li>
+                                            <li>家庭地址 : {{studentInfo.MailAddress}}</li>
+                                            @*<li>父亲姓名 : {{studentInfo.FatherName}} </li>
                                             <li>父亲电话 : {{studentInfo.FatherPhone}} </li>
                                             <li>母亲姓名 : {{studentInfo.MatherName}}</li>
                                             <li> 母亲电话 : {{studentInfo.MatherPhone}}</li>
                                             <li>港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}  </li>
                                             <li>健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}</li>
                                             <li>邮政编码 : {{studentInfo.PostalCode}}</li>
-                                            <li>通信地址 : {{studentInfo.MailAddress}}</li>
+                                            <li>通信地址 : {{studentInfo.MailAddress}}</li>*@
                                         </ul>
                                     </div>
 
                                     <div class="userSec2Box">
                                         <div class="userSec2T">学籍信息  <i class="fa fa-angle-right"></i></div>
                                         <ul class="userSec2List">
-                                            <li>通知书号 : {{studentInfo.NoticeNo}}</li>
+                                            <li>学 &nbsp; 籍 &nbsp; 号 : {{studentInfo.StuCode}}</li>
+                                            <li>学  号 : {{studentInfo.StuNo}}</li>
+                                            <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
+                                            <li>系 部 : {{studentInfo.DeptNo | deptNo}}  </li>
+                                            <li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
+                                            <li>班       级 : {{studentInfo.ClassNo | class}}   </li>
+                                            <li>入团时间 : {{studentInfo.JoinLeagueDate | date}}  </li>
+                                            <li>现有学历 : {{studentInfo.GraduateNo | graduateNo}}</li>
+                                            <li>报到日期 : {{studentInfo.RegisterDate | date}}</li>
+                                            <li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
+                                            @*<li>通知书号 : {{studentInfo.NoticeNo}}</li>
                                             <li> 考  生  号 : {{studentInfo.ksh}}</li>
                                             <li>系所 : {{studentInfo.DeptNo | deptNo}}  </li>
                                             <li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
@@ -146,16 +168,19 @@
                                             <li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
                                             <li>入党时间 : {{studentInfo.JoinPartyDate | date}}</li>
                                             <li>入团时间 : {{studentInfo.JoinLeagueDate | date}}  </li>
-                                            <li>档案地址 : {{studentInfo.MatherUnit}}</li>
+                                            <li>档案地址 : {{studentInfo.MatherUnit}}</li>*@
                                         </ul>
                                     </div>
 
                                     <div class="userSec2Box">
                                         <div class="userSec2T">联系方式  <i class="fa fa-angle-right"></i></div>
                                         <ul class="userSec2List">
-                                            <li>校内地址 : {{studentInfo.InSchoolAddress}}</li>
+                                            <li>联系电话 : {{studentInfo.mobile}}</li>
+                                            <li> QQ : {{studentInfo.QQ}}</li>
+                                            <li>E-mail : {{studentInfo.EMail}}</li>
+                                            @*<li>校内地址 : {{studentInfo.InSchoolAddress}}</li>
                                             <li> QQ : {{studentInfo.QQ}}</li>
-                                            <li>校内电话 : {{studentInfo.InSchoolTelephone}}</li>
+                                            <li>校内电话 : {{studentInfo.InSchoolTelephone}}</li>*@
                                         </ul>
                                     </div>
                                 </div>
@@ -247,6 +272,18 @@
                                         });
                                         return result;
                                     },
+                                    guardiantype: function (value) {
+                                        var result;
+                                        top.learun.clientdata.getAsync('dataItem',
+                                            {
+                                                key: value,
+                                                code: 'GuardianType',
+                                                callback: function (_data) {
+                                                    result = _data.text;
+                                                }
+                                            });
+                                        return result;
+                                    },
                                     province: function (value) {
                                         var result;
                                         top.learun.clientdata.getAsync('custmerData', {