学生请假-教师页面查询条件优化

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>

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();

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)
             {

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>

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')"