From fbe3646757c909b76e85525cb215b917110e8f80 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 1 Jan 2021 20:53:16 +0800
Subject: [PATCH] update

Former-commit-id: a9fb871d5e80aa1219148a8a3c93c0eae8711d7e
Former-commit-id: 31163043f7fcf5a6c73daf7aa7f916a9ee159637
---
 labs/Teacher/TeacherExt/Controllers/HomeController.cs |  5 +----
 labs/Teacher/TeacherExt/Views/Home/Index.cshtml       |  8 ++++----
 labs/Teacher/TeacherExt/Views/Home/_Script.cshtml     | 11 +++++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/labs/Teacher/TeacherExt/Controllers/HomeController.cs b/labs/Teacher/TeacherExt/Controllers/HomeController.cs
index ee352d7d..989ffd1c 100644
--- a/labs/Teacher/TeacherExt/Controllers/HomeController.cs
+++ b/labs/Teacher/TeacherExt/Controllers/HomeController.cs
@@ -84,10 +84,7 @@ namespace TeacherExt.Controllers
                 row.CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.UserType);
                 row.CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.RealName);
                 row.CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.Sex);
-                if(teacher.Birthday.HasValue)
-                {
-                    row.CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.Birthday.Value.ToString("yyyy-MM"));
-                }
+                row.CreateCell(++colIndex).SetStyle(style).SetType(CellType.String).SetCellValue(teacher.Birthday.HasValue ? teacher.Birthday.Value.ToString("yyyy-MM") : string.Empty);
             }
         }
 
diff --git a/labs/Teacher/TeacherExt/Views/Home/Index.cshtml b/labs/Teacher/TeacherExt/Views/Home/Index.cshtml
index 3724227a..ca15ac19 100644
--- a/labs/Teacher/TeacherExt/Views/Home/Index.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Home/Index.cshtml
@@ -17,7 +17,7 @@
     var prefix = new ViewDataDictionary(this.ViewData);
     prefix.TemplateInfo.HtmlFieldPrefix = "Query";
 }
-<form action="@Url.Action(null,null)" method="post" class="form-horizontal query">
+<form action="@Url.Action(null,null)" method="get" class="form-horizontal query">
     <div class="card">
         <div class="card-header">
             <div class="row">
@@ -25,7 +25,7 @@
             </div>
             <div class="row">
                 <div class="col-12">
-                    <button type="submit" class="action query btn btn-primary cancel" data-action="@Url.Action(null,null)">
+                    <button type="submit" id="query" class="btn btn-primary" data-action="@Url.Action(null,null)">
                         查询
                     </button>
                     <a class="btn btn-success" href="@Url.Action("Add")">
@@ -46,7 +46,7 @@
                     <button type="submit" class="action confirm btn btn-danger" data-action="@Url.Action("Delete")">
                         删除
                     </button>
-                    <a class="btn btn-primary" href="@Url.Action("Export")" target="_blank">导出</a>
+                    <button type="button" id="export" class="btn btn-primary" data-action="@Url.Action("Export")" >导出</button>
                 </div>
             </div>
         </div>
@@ -107,4 +107,4 @@
 </form>
 @section scripts{
     @(await Html.PartialAsync("_Script"))
-}
\ No newline at end of file
+}
diff --git a/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml b/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml
index fc035aed..ac5812b7 100644
--- a/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Home/_Script.cshtml
@@ -70,4 +70,15 @@
             $("[data-my-group='HasPosition12']").parents('.@cls').show();
         }
     });
+</script>
+<script>
+    $('form.query').validate().currentForm = '';
+    $('#query').click(function () {
+        var url = $(this).attr('data-action') + '?' + $(this).parents('form').find('input,select').not('[value=""]').serialize();
+        window.location.href = url;
+    });
+    $('#export').click(function () {
+        var url = $(this).attr('data-action') + '?' + $(this).parents('form').find('input,select').not('[value=""]').serialize(); 
+        window.open(url); 
+    });
 </script>
\ No newline at end of file