Merge branch '娄底高职分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js

@@ -422,7 +422,9 @@ export default {
         Uri: t => /^[a-zA-z]+:\/\/[^\s]*$/.test(t) || '须符合网址Url格式',
         UriOrNull: t => t.length <= 0 || /^[a-zA-z]+:\/\/[^\s]*$/.test(t) || '须留空或符合网址Url格式',
 		Price: t => this.checkAmt(t) || '须输入数值',
-		PriceOrNull: t => (!t&&t!==0) || this.checkAmt(t) || '须留空或输入数值'
+		PriceOrNull: t => (!t&&t!==0) || this.checkAmt(t) || '须留空或输入数值',
+		PositiveInt: t => /^[1-9]\d*$/.test(t) || '须输入正整数',
+		PositiveIntOrNull: t => (!t&&t!==0) || /^[1-9]\d*$/.test(t) || '须留空或输入正整数'
       }
     }
   }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Edu/single.vue

@@ -277,7 +277,7 @@ export default {
 		let isRight = true
 		for (let s of arr) {
 			let Price = Number(s.Price),Quantity = Number(s.Quantity);
-			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&&/^(\-|\+)?\d+(\.\d+)?$/.test(Quantity)){
+			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&& /^[1-9]\d*$/.test(Quantity)){
 				total = this.accAdd(total,this.accMul(Price,Quantity))
 			}else{
 				isRight = false
@@ -432,7 +432,7 @@ export default {
   
         case 'save':
 		  if(!this.current.Purchase_Edu.TotalAmount){
-			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量为空或错误') 
+			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量(正整数)为空或错误') 
 			return
 		  }
           const verifyResult = this.verifyForm()

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Info/single.vue

@@ -274,7 +274,7 @@ export default {
 		let isRight = true
 		for (let s of arr) {
 			let Price = Number(s.Price),Quantity = Number(s.Quantity);
-			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&&/^(\-|\+)?\d+(\.\d+)?$/.test(Quantity)){
+			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&& /^[1-9]\d*$/.test(Quantity)){
 				total = this.accAdd(total,this.accMul(Price,Quantity))
 			}else{
 				isRight = false
@@ -428,7 +428,7 @@ export default {
   
         case 'save':
 		  if(!this.current.Purchase_Info.TotalAmount){
-			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量为空或错误') 
+			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量(正整数)为空或错误') 
 			return
 		  }
           const verifyResult = this.verifyForm()

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Logistic/single.vue

@@ -275,7 +275,7 @@ export default {
 		let isRight = true
 		for (let s of arr) {
 			let Price = Number(s.Price),Quantity = Number(s.Quantity);
-			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&&/^(\-|\+)?\d+(\.\d+)?$/.test(Quantity)){
+			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&& /^[1-9]\d*$/.test(Quantity)){
 				total = this.accAdd(total,this.accMul(Price,Quantity))
 			}else{
 				isRight = false
@@ -428,7 +428,7 @@ export default {
   
         case 'save':
 		  if(!this.current.Purchase_Logistic.TotalAmount){
-			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量为空或错误') 
+			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量(正整数)为空或错误') 
 			return
 		  }
           const verifyResult = this.verifyForm()

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Other/single.vue

@@ -275,7 +275,7 @@ export default {
 		let isRight = true
 		for (let s of arr) {
 			let Price = Number(s.Price),Quantity = Number(s.Quantity);
-			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&&/^(\-|\+)?\d+(\.\d+)?$/.test(Quantity)){
+			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&& /^[1-9]\d*$/.test(Quantity)){
 				total = this.accAdd(total,this.accMul(Price,Quantity))
 			}else{
 				isRight = false
@@ -429,7 +429,7 @@ export default {
   
         case 'save':
 		  if(!this.current.Purchase_Other.TotalAmount){
-			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量为空或错误') 
+			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量(正整数)为空或错误') 
 			return
 		  }
           const verifyResult = this.verifyForm()

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Print/single.vue

@@ -279,7 +279,7 @@ export default {
 		let isRight = true
 		for (let s of arr) {
 			let Price = Number(s.Price),Quantity = Number(s.Quantity);
-			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&&/^(\-|\+)?\d+(\.\d+)?$/.test(Quantity)){
+			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&& /^[1-9]\d*$/.test(Quantity)){
 				total = this.accAdd(total,this.accMul(Price,Quantity))
 			}else{
 				isRight = false
@@ -433,7 +433,7 @@ export default {
   
         case 'save':
 		  if(!this.current.Purchase_Print.TotalAmount){
-			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量为空或错误') 
+			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量(正整数)为空或错误') 
 			return
 		  }
           const verifyResult = this.verifyForm()

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Student/single.vue

@@ -273,7 +273,7 @@ export default {
 		let isRight = true
 		for (let s of arr) {
 			let Price = Number(s.Price),Quantity = Number(s.Quantity);
-			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&&/^(\-|\+)?\d+(\.\d+)?$/.test(Quantity)){
+			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&& /^[1-9]\d*$/.test(Quantity)){
 				total = this.accAdd(total,this.accMul(Price,Quantity))
 			}else{
 				isRight = false
@@ -426,7 +426,7 @@ export default {
   
         case 'save':
 		  if(!this.current.Purchase_Student.TotalAmount){
-			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量为空或错误') 
+			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量(正整数)为空或错误') 
 			return
 		  }
           const verifyResult = this.verifyForm()

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Purchase_Work/single.vue

@@ -272,7 +272,7 @@ export default {
 		let isRight = true
 		for (let s of arr) {
 			let Price = Number(s.Price),Quantity = Number(s.Quantity);
-			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&&/^(\-|\+)?\d+(\.\d+)?$/.test(Quantity)){
+			if(/^(\-|\+)?\d+(\.\d+)?$/.test(Price)&& /^[1-9]\d*$/.test(Quantity)){
 				total = this.accAdd(total,this.accMul(Price,Quantity))
 			}else{
 				isRight = false
@@ -425,7 +425,7 @@ export default {
   
         case 'save':
 		  if(!this.current.Purchase_Work.TotalAmount){
-			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量为空或错误') 
+			this.CONFIRM('表单验证失败', '[采购列表]：价格和数量(正整数)为空或错误') 
 			return
 		  }
           const verifyResult = this.verifyForm()

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsapplyManagement/Purchase_Print_Apply/single.vue

@@ -600,7 +600,7 @@
 										}
 
 							this.EMIT('LogisticsapplyManagement-Purchase_Print-list-change')
-							this.NAV_BACK()
+							setTimeout(()=>this.NAV_BACK(),500)
 							this.TOAST('提交保存成功')
 						})
 						break