From fd42d3fa1bbe494e422a370a4814829ba0d7b381 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 15 Mar 2023 10:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=B7=E5=81=87-=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuLeaveManagement/CheckIndex.cshtml             | 4 ++++
 .../Views/StuLeaveManagement/CheckIndex.js                 | 6 +++++-
 .../StuLeaveManagement/StuLeaveManagementService.cs        | 7 ++++++-
 .../EducationalAdministration/StuLeaveManagement/list.vue  | 4 ++--
 .../StuLeaveManagement/single.vue                          | 4 ++--
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml
index 8844cbc55..90f5e2de7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.cshtml	
@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">审核状态</div>
                                     <div id="CheckStatus"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js
index 15bfcdf04..9b625e062 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js	
@@ -17,7 +17,11 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#LeaveType').lrDataItemSelect({ code: 'LeaveType' });
-            $('#CheckStatus').lrDataItemSelect({ code: 'LeaveCheck' });
+            $('#CheckStatus').lrselect({
+                data: [{ text: "草稿", value: "0" }, { text: "审核中", value: "1" }, { text: "审核通过", value: "1" }, { text: "审核未通过", value: "1" }],
+                text: "text",
+                value: "value"
+            })
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs
index a7efaa3b7..40038e841 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementService.cs	
@@ -132,6 +132,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.CreateUserNo = @StuNo ");
                 }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND s.StuName like @StuName ");
+                }
                 //班级班主任/辅导员/系主任
                 var ClassManagerNo = LoginUserInfo.Get().account;
                 if (!string.IsNullOrEmpty(ClassManagerNo))
@@ -645,7 +650,7 @@ and a.lessondate between '{startTime}' and '{endTime}'");
                         data.ClassTutorNo = classlist.ClassTutorNo;
                     }
                 }
-                return data; 
+                return data;
             }
             catch (Exception ex)
             {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue
index 5ec55c8f5..487d72f5f 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue	
@@ -24,10 +24,10 @@
 							{{ displayListItem(item, "CheckRemark") }}
 						</view> -->
 
-						<view class="customlist-item-field">
+						<!-- <view class="customlist-item-field">
 							<text class="customlist-item-field-title">审核人：</text>
 							{{ displayListItem(item, "CheckUserNo") }}
-						</view>
+						</view> -->
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">请假类型：</text>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue
index 86b7d435c..09c6e578a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue	
@@ -18,7 +18,7 @@
 		v-if="!edit"
 	  />
 	  
-      <l-textarea
+      <!-- <l-textarea
         @input="setValue('StuLeaveManagement.CheckRemark', $event)"
         :value="getValue('StuLeaveManagement.CheckRemark')"
         title="审核备注"
@@ -32,7 +32,7 @@
 	    title="审核人"
 		v-if="!edit"
 		:disabled="!edit"
-	  />
+	  /> -->
 	  <l-select
 	    @input="setValue('StuLeaveManagement.LeaveType', $event)"
 	    :value="getValue('StuLeaveManagement.LeaveType')"