From 52e4975351366991475f8a86781a97eed65cbe76 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Mon, 29 Jan 2024 17:34:17 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E6=88=91=E7=9A=84=E8=AF=BE=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/timeTable/leaveFrom.vue             | 24 ++++++++++++-------
 .../LearunApp-2.2.0/pages/timeTable/list.vue  |  6 ++---
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue
index 5f7021bcb..bea043c1c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/leaveFrom.vue	
@@ -209,16 +209,24 @@ export default {
 				keyValue: '',
 				strEntity: JSON.stringify(this.queryData)
 			}
-			this.LOADING('保存数据中…');
-			this.HTTP_POST('learun/adms/EducationalAdministration/StuAttendanceLeave/save', _postData, '加载数据时出错').then(res => {
-				this.HIDE_LOADING();
-				console.log(res)
+			this.CONFIRM('提示', '是否确认提交请假？', true).then(res => {
 				if(res){
-					this.TOAST('提交成功！');
-					this.EMIT('timeTable');
-					this.NAV_BACK();
+					this.LOADING('保存数据中…');
+					this.HTTP_POST('learun/adms/EducationalAdministration/StuAttendanceLeave/save', _postData, '加载数据时出错').then(res => {
+						this.HIDE_LOADING();
+						console.log(res)
+						if(res){
+							this.EMIT('timeTable');
+							setTimeout(()=>{
+								this.TOAST('提交成功！');
+							})
+							setTimeout(()=>{
+								this.NAV_BACK();
+							},600)
+						}
+					});
 				}
-			});
+			})
 		},
 		// 显示列表中的标题项
 		displayListItem(item, field) {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue
index cd405fbb3..5552247b8 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue	
@@ -170,8 +170,8 @@
 					account: Account
 				} = this.user
 				let param = {
-					StartDate: start,
-					EndDate: end,
+					StartDate: start||this.todayWeek.Monday,
+					EndDate: end||this.todayWeek.Sunday,
 					Description,
 					Account,
 				};
@@ -264,7 +264,7 @@
 			}
 		},
 		created() {
-			this.ON('timeTable', this.init);
+			this.ON('timeTable', this.loadData);
 			this.user = this.GET_GLOBAL('loginUser');
 			this.init()
 		}