diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml
index 8f011d1cd..99e50689b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml	
@@ -30,11 +30,7 @@
                     <ul class="userSec1R">
                         <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>
                     </ul>
                 </div>
             </div>
@@ -47,23 +43,16 @@
                         <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.FatherPhone}} </li>
-                        <li>母亲姓名 : {{studentInfo.MatherName}}</li>
-                        <li> 母亲电话 : {{studentInfo.MatherPhone}}</li>
-                        <li>港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}  </li>
-                        <li>健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}</li>
+                        <li>监护人姓名 : {{studentInfo.Guardian}}</li>
+                        <li>监护人联系电话 : {{studentInfo.GuardianPhone}}</li>
+                        <li>与监护人关系 : {{studentInfo.GuardianType |guardiantype}}</li>
                         <li>邮政编码 : {{studentInfo.PostalCode}}</li>
                         <li>家庭地址 : {{studentInfo.MailAddress}}</li>
                     </ul>
@@ -72,25 +61,25 @@
                 <div class="userSec2Box">
                     <div class="userSec2T">学籍信息  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>通知书号 : {{studentInfo.NoticeNo}}</li>
-                        <li> 考  生  号 : {{studentInfo.ksh}}</li>
-                        <li>系所 : {{studentInfo.DeptNo | deptNo}}  </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.RegisterDate | date}} </li>
-                        <li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
-                        <li>入党时间 : {{studentInfo.JoinPartyDate | date}}</li>
                         <li>入团时间 : {{studentInfo.JoinLeagueDate | date}}  </li>
-                        <li>档案地址 : {{studentInfo.MatherUnit}}</li>
+                        <li>现有学历 : {{studentInfo.GraduateNo | graduateNo}}</li>
+                        <li>报到日期 : {{studentInfo.RegisterDate | date}}</li>
+                        <li>入学年月 : {{studentInfo.EntranceDate | date}}</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>校内电话 : {{studentInfo.InSchoolTelephone}}</li>
+                        <li>E-mail : {{studentInfo.EMail}}</li>
                     </ul>
                 </div>
             </div>
@@ -110,12 +99,14 @@
             },
             methods: {
                 getData: function () {
-                    $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue, function (ref) {
-                        this.studentInfo = ref.data.userInfo;
-                        this.baseInfo = ref.data.basicInfo;
-                        this.headUrl = ref.data.userInfo.Photo;
+                    $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue,
+                        function (ref) {
+                            this.studentInfo = ref.data.userInfo;
+                            this.baseInfo = ref.data.basicInfo;
+                            this.headUrl = ref.data.userInfo.Photo;
 
-                    }.bind(this), "json");
+                        }.bind(this),
+                        "json");
                 },
                 getUrl: function () {
                     var loginInfo = top.learun.clientdata.get(['userinfo']);
@@ -133,26 +124,28 @@
                 },
                 company: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        sync: true,
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                        key: value,
-                        keyId: 'f_companyid',
-                        callback: function (_data) {
-                            result = _data.f_fullname;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('custmerData',
+                        {
+                            sync: true,
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                            key: value,
+                            keyId: 'f_companyid',
+                            callback: function (_data) {
+                                result = _data.f_fullname;
+                            }
+                        });
                     return result;
                 },
                 graduateNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('dataItem', {
-                        key: value,
-                        code: 'CollegeType',
-                        callback: function (_data) {
-                            result = _data.text;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('dataItem',
+                        {
+                            key: value,
+                            code: 'CollegeType',
+                            callback: function (_data) {
+                                result = _data.text;
+                            }
+                        });
                     return result;
                 },
                 date: function (value) {
@@ -166,24 +159,38 @@
                 },
                 nationalityNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('dataItem', {
-                        key: value,
-                        code: 'National',
-                        callback: function (_data) {
-                            result = _data.text;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('dataItem',
+                        {
+                            key: value,
+                            code: 'National',
+                            callback: function (_data) {
+                                result = _data.text;
+                            }
+                        });
                     return result;
                 },
                 partyFaceNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('dataItem', {
-                        key: value,
-                        code: 'BCdPartyFace',
-                        callback: function (_data) {
-                            result = _data.text;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('dataItem',
+                        {
+                            key: value,
+                            code: 'PolityStatus',
+                            callback: function (_data) {
+                                result = _data.text;
+                            }
+                        });
+                    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) {
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 658244de8..7e6cf302f 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	
@@ -159,7 +159,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerForm({
                         id: 'form',
-                        title: '编辑',
+                        title: '查看',
                         url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue,
                         width: 1162,
                         height: 600,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml
index c7ae00fc7..cd74ce967 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml	
@@ -31,6 +31,7 @@
                         <div id="datesearch" class="datetime"></div>
                     </div>
                     <div class="lr-layout-tool-item">
+                        <span type="text" style="cursor:pointer;">文件大小不能超过200M</span>
                         <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
                     </div>
                     <div class="lr-layout-tool-item">