diff --git a/labs/Teacher/TeacherExt/Controllers/HomeController.cs b/labs/Teacher/TeacherExt/Controllers/HomeController.cs
index 3cfa7890..2bced4f7 100644
--- a/labs/Teacher/TeacherExt/Controllers/HomeController.cs
+++ b/labs/Teacher/TeacherExt/Controllers/HomeController.cs
@@ -121,36 +121,6 @@ namespace TeacherExt.Controllers
             return result;
         }
 
-        [HttpGet]
-        public IActionResult Edit(int id)
-        {
-            var person = this._personRepo.ReadOnlyTable().Where(o => o.Id == id).FirstOrDefault();
-            var organ = this._organizationRepo.ReadOnlyTable().Where(o => o.Id == person.OrganId).FirstOrDefault();
-
-            var model = person.To<EditTeacherModel>();
-            model.OrganName = organ.Name;
-            this.EntityToModel(person, model);
-            this.ToEditModel(person, model);
-            return Result<EditTeacherModel>(model);
-        }
-
-        [HttpPost]
-        public IActionResult Edit([FromForm] EditTeacherModel model)
-        {
-            ValidEditModel(model);
-            var entity = this._personRepo.Table().Where(o => o.Id == model.Id).FirstOrDefault();
-            if (ModelState.IsValid)
-            {
-                entity.From(model);
-                this.ModelToEntity(model,entity);
-                this._personRepo.SaveChanges();
-                return Success();
-            }
-            this.EntityToModel(entity, model);
-            this.ToEditModel(entity, model);
-            return View(model);
-        }
-
         private void ModelToEntity(EditTeacherModel model, Person entity)
         {
             if(!string.IsNullOrWhiteSpace(entity.IdNumber))
@@ -163,42 +133,6 @@ namespace TeacherExt.Controllers
             }
         }
 
-        [HttpGet]
-        public IActionResult Details(int id)
-        {
-            return this.Edit(id);
-        }
-
-        [HttpPost]
-        public IActionResult Details([FromForm] EditTeacherModel model)
-        {
-            ValidEditModel(model);
-            var entity = this._personRepo.Table().Where(o => o.Id == model.Id).FirstOrDefault();
-            var login = this._loginRepo.ReadOnlyTable().Where(o => o.PersonId == model.Id).FirstOrDefault();
-            if (ModelState.IsValid)
-            {
-                if (entity.CheckStatus != model.CheckStatus)
-                {
-                    this._checkLogRepo.Add(new CheckLog
-                    {
-                        UpdateBy = User.Identity.Name,
-                        UpdateAt = DateTime.Now,
-                        LoginName = login.LoginName,
-                        RealName = login.RealName,
-                        FromStatus = entity.CheckStatus,
-                        ToStatus = model.CheckStatus
-                    });
-                }
-                entity.From(model);
-                this.ModelToEntity(model, entity);
-                this._personRepo.SaveChanges();
-                return Success();
-            }
-            this.EntityToModel(entity, model);
-            this.ToEditModel(entity, model);
-            return Result<EditTeacherModel>(model);
-        }
-
         [HttpGet]
 
         public IActionResult Update(int id)
diff --git a/labs/Teacher/TeacherExt/Startup.cs b/labs/Teacher/TeacherExt/Startup.cs
index 6a944730..3d0e4c1f 100644
--- a/labs/Teacher/TeacherExt/Startup.cs
+++ b/labs/Teacher/TeacherExt/Startup.cs
@@ -14,6 +14,7 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
 using System;
+using System.Reflection;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
@@ -60,9 +61,19 @@ namespace TeacherExt
             services.AddTransient<SettingService>();
             services.AddTransient<ISettingService, CachedSettingService>();
             services.AddTransient<IUserService, UserService>();
+
+            services.AddLocalization(options => options.ResourcesPath = null);
             services.AddMvc()
                 .AddNewtonsoftJson()
-                .AddControllersAsServices();
+                .AddControllersAsServices()
+                .AddDataAnnotationsLocalization(options =>
+                {
+                    options.DataAnnotationLocalizerProvider = (type, factory) =>
+                    {
+                        var localizer = factory.Create("Resources.Resource", Assembly.GetEntryAssembly().GetName().Name);
+                        return localizer;
+                    };
+                });
             services.AddControllers()
                 .ConfigureApiBehaviorOptions(options =>
                 {
diff --git a/labs/Teacher/TeacherExt/Views/Account/Login.cshtml b/labs/Teacher/TeacherExt/Views/Account/Login.cshtml
index 76cbe744..ae325523 100644
--- a/labs/Teacher/TeacherExt/Views/Account/Login.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Account/Login.cshtml
@@ -44,26 +44,6 @@
         </div>
     </div>
 </form>
-<div class="row">
-    <p>
-        测试账号(密码统一为6个1)：
-    </p>
-    <p>
-        局管理员：admin
-    </p>
-    <p>
-        校管理员：admin1 admin2
-    </p>
-    <p>
-        校长：xiaozhang1 xiaozhang2
-    </p>
-    <p>
-        老师：laoshi1 laoshi2
-    </p>
-    <p>
-        职工：zhigong1 zhigong2
-    </p>
-</div>
 <div class="row">
     <p>审核状态：未提交、待审核、审核成功、审核失败</p>
 </div>
\ No newline at end of file
diff --git a/labs/Teacher/TeacherExt/Views/Home/Edit.cshtml b/labs/Teacher/TeacherExt/Views/Home/Edit.cshtml
index c18fc744..2593f51e 100644
--- a/labs/Teacher/TeacherExt/Views/Home/Edit.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Home/Edit.cshtml
@@ -84,7 +84,7 @@
                                     @if (checkedProp != null)
                                     {
                                         <div class="form-control" style="border-color:transparent;padding-left:0;">
-                                            @Html.Hidden(prop.PropertyName)
+                                            @Html.Hidden(checkedProp.PropertyName)
                                             @Html.Display(checkedProp.PropertyName, uihit)
                                         </div>
                                     }
diff --git a/labs/Teacher/TeacherExt/Views/Home/Index.cshtml b/labs/Teacher/TeacherExt/Views/Home/Index.cshtml
index 27e7f405..5e1ee60f 100644
--- a/labs/Teacher/TeacherExt/Views/Home/Index.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Home/Index.cshtml
@@ -88,7 +88,7 @@
                             <table class="table table-bordered text-nowrap">
                                 <tr>
                                     <th>行号</th>
-                                    <th>申请修改状态</th>
+                                    <th>申请修改</th>
                                     <th>审核状态</th>
                                     <th>姓名</th>
                                     <th>性别</th>
@@ -110,17 +110,25 @@
                                         <td>@item.nation_name</td>
                                         <td>@item.placeofbirth</td>
                                         <td>
-                                            @if (User.IsInRole("城中区教育局管理员") && item.CheckStatus == "审核成功")
+                                            @if (User.IsInRole("城中区教育局管理员"))
                                             {
-                                                <a href="@url">驳回</a>
-                                            }
-                                            else if (User.IsInRole("学校管理员") && item.CheckStatus == "待审核")
-                                            {
-                                                <a href="@url">审核</a>
+                                                <a href="@url">查看</a>
+                                                @if (item.CheckStatus == "审核成功")
+                                                {
+                                                    <a href="@url">退回</a>
+                                                }
                                             }
-                                            else
+                                            @if (User.IsInRole("学校管理员"))
                                             {
                                                 <a href="@url">查看</a>
+                                                @if (item.CheckStatus == "待审核")
+                                                {
+                                                    <a href="@url">审核</a>
+                                                }
+                                                @if (item.RequestEditStatus == "已申请")
+                                                {
+                                                    <a href="@url">批准</a>
+                                                }
                                             }
                                         </td>
                                         <td>
diff --git a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml
index 960aeb7f..07da3b02 100644
--- a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml
@@ -79,12 +79,12 @@
                                     {<div class="form-control" style="border-color:transparent;padding-left:0;">
                                             @if (isCheck)
                                             {
-                                                @Html.Editor(prop.PropertyName, uihit)
+                                                @Html.Editor(checkedProp.PropertyName)
                                             }
                                             else
                                             {
                                                 <div class="form-control" style="border-color:transparent;padding-left:0;">
-                                                    @Html.Hidden(prop.PropertyName)
+                                                    @Html.Hidden(checkedProp.PropertyName)
                                                     @Html.Display(checkedProp.PropertyName, "Bool")
                                                 </div>
                                             }
@@ -118,20 +118,43 @@
                     <div class="form-group row">
                         <div class="col-sm-4"> </div>
                         <div class="col-sm-8">
-                            @if (Model != null)
+                            @if (User.IsInRole("城中区教育局管理员"))
                             {
-                                if (new string[] { "未提交", "审核失败" }.Contains(Model.CheckStatus))
+                                @if (Model.CheckStatus == "审核成功")
                                 {
-                                    <button class="btn btn-primary" type="submit">保存</button>
-                                    <button id="submitCheckRequest" type="button" class="btn btn-primary">提交审核</button>
+                                    <button id="super" type="button" class="btn btn-primary">退回</button>
+                                }
+                            }
+                            else if (User.IsInRole("学校管理员"))
+                            {
+                                @if (Model.CheckStatus == "待审核")
+                                {
+                                    <button id="admin1" type="button" class="btn btn-primary">审核通过</button>
+                                    <button id="admin2" type="button" class="btn btn-primary">审核失败</button>
+                                }
+                                @if (Model.RequestEditStatus == "已申请")
+                                {
+                                    <button id="admin3" type="button" class="btn btn-primary">批准修改申请</button>
                                 }
-                                else if (Model.RequestEditStatus == "已申请")
+                                else
+                                {
+                                    <button id="admin4" type="button" class="btn btn-primary">拒绝修改申请</button>
+                                }
+                            }
+                            @if (User.Identity.Name == Model.LoginName)
+                            {
+                                if (Model.CheckStatus == "未提交" || Model.CheckStatus == "审核失败")
                                 {
-                                    <button id="cancelModifyRequest" type="button" class="btn btn-primary">取消申请</button>
+                                    <button class="btn btn-primary" type="submit">保存</button>
+                                    <button id="submitCheckRequest" type="button" class="btn btn-primary">提交审核</button>
                                 }
                                 else
                                 {
-                                    if (new string[] { "待审核", "审核成功" }.Contains(Model.CheckStatus))
+                                    if (Model.RequestEditStatus == "已申请")
+                                    {
+                                        <button id="cancelModifyRequest" type="button" class="btn btn-primary">取消申请</button>
+                                    }
+                                    else
                                     {
                                         <button id="submitModifyRequest" type="button" class="btn btn-primary">申请修改</button>
                                     }
@@ -146,17 +169,97 @@
 </div>
 @section scripts{
     <script>
+        function submit(msg, func) {
+            Swal.fire({
+                text: msg,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                showCancelButton: true
+            }).then(function (value) {
+                if (value.isConfirmed) {
+                    func();
+                }
+            });
+        }
+    </script>
+    <script>
+        //用户操作
+        //提交审核
         $('#submitCheckRequest').click(function () {
-            $('#CheckStatus').val('待审核');
-            $(this).parents('form').submit();
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#CheckStatus').val('待审核');
+                form.submit();
+            });
+        });
+        //申请修改
+        $('#submitModifyRequest').click(function () {
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#RequestEditStatus').val('已申请');
+                form.submit();
+            });
         });
+        //取消申请
         $('#cancelModifyRequest').click(function () {
-            $('#RequestEditStatus').val('未申请');
-            $(this).parents('form').submit();
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#RequestEditStatus').val('未申请');
+                form.submit();
+            });
         });
-        $('#submitModifyRequest').click(function () {
-            $('#RequestEditStatus').val('已申请');
-            $(this).parents('form').submit();
+    </script>
+    <script>
+        //批准申请修改
+        $('#super').click(function () {
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#CheckStatus').val('未提交');
+                $('#RequestEditStatus').val('未申请');
+                form.submit();
+            });
+        });
+        //审核成功
+        $('#admin1').click(function () {
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#Comment').val('');
+                $('#CheckStatus').val('审核成功');
+                form.submit();
+            });
+        });
+        //审核失败
+        $('#admin2').click(function () {
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#CheckStatus').val('审核失败');
+                form.submit();
+            });
+        });
+        //批准修改申请
+        $('#admin3').click(function () {
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#CheckStatus').val('未提交');
+                $('#RequestEditStatus').val('未申请');
+                form.submit();
+            });
+        });
+        //拒绝修改申请
+        $('#admin4').click(function () {
+            var form = $(this).parents('form');
+            var msg = '确认' + $(this).text() + '？';
+            submit(msg, function () {
+                $('#RequestEditStatus').val('未申请');
+                form.submit();
+            });
         });
     </script>
     <script>
diff --git a/labs/Teacher/TeacherExt/Views/Shared/_Layout.cshtml b/labs/Teacher/TeacherExt/Views/Shared/_Layout.cshtml
index f60bff25..7767afbb 100644
--- a/labs/Teacher/TeacherExt/Views/Shared/_Layout.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Shared/_Layout.cshtml
@@ -37,7 +37,7 @@
                         {
                             var person_id = User.Claims.FirstOrDefault(o => o.Type == System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
                             <li class="nav-item">
-                                <a href="@Url.Action("Edit","Home",new { id=person_id})" class="@GetLinkClass(area:"",controller:"Account")">@User.Identity.Name</a>
+                                <a href="@Url.Action("Update","Home",new { id=person_id})" class="@GetLinkClass(area:"",controller:"Account")">@User.Identity.Name</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="@Url.Action("Logout","Account",new { area=""})" click="logout">退出</a>