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

---
 .../StuLeaveManagement/Check/list.vue         | 36 ++++++++++++++++---
 .../StuLeaveManagement/list.vue               | 22 +++++++++---
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue
index ccbdfeb97..cb2997878 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue	
@@ -120,6 +120,12 @@
 					title="请假类型" placeholder="按请假类型查询" />
 				<l-select v-model="queryData.CheckStatus" @change="searchChange" :range="dataSource.CheckStatus"
 					title="审核状态" placeholder="按审核状态查询" />
+				<l-input
+				  v-model="queryData.StuName"
+				  @change="searchChange"
+				  title ="姓名"
+				  placeholder="按姓名查询"
+				/> 
 				<!-- 重置查询条件按钮 -->
 				<view class="padding-tb">
 					<l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button>
@@ -224,6 +230,7 @@
 				queryData: {
 					LeaveType: "",
 					CheckStatus: '',
+					StuName:'',
 					// CreateUser: "",
 				},
 
@@ -239,10 +246,31 @@
 						value: t.value,
 						text: t.text
 					})),
-					CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({
-						value: t.value,
-						text: t.text
-					})),
+					// CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({
+					// 	value: t.value,
+					// 	text: t.text
+					// })),
+					CheckStatus:[
+						{
+							value:'0',
+							text:'草稿'
+						},
+						{
+							value:'1',
+							text:'审核中'
+						},
+						{
+							value:'2',
+							text:'审核通过'
+						},
+						{
+							value:'3',
+							text:'审核未通过'
+						}
+					],
+					
+					
+					
 				},
 
 				// 页面相关参数
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 487d72f5f..366144c36 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	
@@ -230,10 +230,24 @@
 						value: t.value,
 						text: t.text
 					})),
-					CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({
-						value: t.value,
-						text: t.text
-					})),
+					CheckStatus:[
+						{
+							value:'0',
+							text:'草稿'
+						},
+						{
+							value:'1',
+							text:'审核中'
+						},
+						{
+							value:'2',
+							text:'审核通过'
+						},
+						{
+							value:'3',
+							text:'审核未通过'
+						}
+					],
 				},
 
 				// 页面相关参数