From 4be9cbbd54c0b12936910d364ebb8d9c196ad846 Mon Sep 17 00:00:00 2001
From: lb01 <Vimicro@lb>
Date: Mon, 5 Dec 2022 11:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=AE=A1=E6=8A=A5=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E6=98=8E=E7=BB=86=E9=87=91=E9=A2=9D=E5=9B=9B=E8=88=8D?=
 =?UTF-8?q?=E4=BA=94=E5=85=A5=EF=BC=8C=E5=AD=A6=E7=94=9F=E6=8C=89=E5=A4=A9?=
 =?UTF-8?q?=E8=AF=B7=E5=81=87=20=E5=BC=80=E5=A7=8B=E5=92=8C=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/AssetManagementSystem/FundsApply/single.vue  |  2 +-
 .../StuLeaveManagement/single.vue                      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue
index 9a4348ac7..c6ef703f0 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue	
@@ -374,7 +374,7 @@
 				console.log(item)
 				let _this = this
 				if (item.Number && item.Price) {
-					item.Amount = item.Number * item.Price
+					item.Amount = (item.Number * item.Price).toFixed(2)
 
 					// _this.current.SumAmount = item.Number * item.Price
 
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 4e9a5feab..98c73f83d 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	
@@ -309,12 +309,20 @@ export default {
           break
 
         case 'save':
-		  // console.log(this.current)
+		  
           const verifyResult = this.verifyForm()
           if (verifyResult.length > 0) {
             this.CONFIRM('表单验证失败', verifyResult.join('\n'))
             return
           }
+		  
+		  let StartTime = Date.parse(this.current.StuLeaveManagement.StartTime)
+		  let EndTime = Date.parse(this.current.StuLeaveManagement.EndTime)
+		  
+		  if(StartTime > EndTime){
+			  this.TOAST('结束时间不能早于开始时间')
+			  return
+		  }
 
           if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) {
             return