Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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
 

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