金额控制&批量数据测算后提领信息不显示

pages/index/index.vue

@@ -242,9 +242,8 @@
 					this.businessType = calcuteData.businessType;
 					this.businessType = calcuteData.businessType;
 					this.calcuteType = calcuteData.calcuteType;
 					this.calcuteType = calcuteData.calcuteType;
 					this.yearWithdrawalInfos = calcuteData.yearWithdrawalInfos;
 					this.yearWithdrawalInfos = calcuteData.yearWithdrawalInfos;
+					this.withdrawalType = calcuteData.withdrawalType;
 				}
 				}
-
-				console.log('111',typeof this.yearWithdrawalInfos)
 			}else{
 			}else{
 				//初始化删除上次批量计算结果
 				//初始化删除上次批量计算结果
 				uni.removeStorageSync('resIrrAndSimpleResInfos');
 				uni.removeStorageSync('resIrrAndSimpleResInfos');
@@ -354,6 +353,9 @@
 								if(this.yearWithdrawalInfos[i]['yearWithdrawalAmount'] && this.yearWithdrawalInfos[i]['yearWithdrawalAmount']<=0){
 								if(this.yearWithdrawalInfos[i]['yearWithdrawalAmount'] && this.yearWithdrawalInfos[i]['yearWithdrawalAmount']<=0){
 									this.errorDialog(2,`第${i+1}行,提领金额必须大于0`);
 									this.errorDialog(2,`第${i+1}行,提领金额必须大于0`);
 									return false;
 									return false;
+								}else if(this.yearWithdrawalInfos[i]['yearWithdrawalAmount'] > 999999999999999){
+									this.errorDialog(2,`第${i+1}行,提领金额必须小于999,999,999,999,999`);
+									return false;
 								}else{
 								}else{
 									if(!this.yearWithdrawalInfos[i]['yearWithdrawalAmount']){
 									if(!this.yearWithdrawalInfos[i]['yearWithdrawalAmount']){
 										this.errorDialog(1,`请输入第${i+1}行,提领金额`);
 										this.errorDialog(1,`请输入第${i+1}行,提领金额`);
@@ -378,7 +380,8 @@
 						yearWithdrawalInfos:this.yearWithdrawalInfos,
 						yearWithdrawalInfos:this.yearWithdrawalInfos,
 						calcuteType:this.calcuteType,
 						calcuteType:this.calcuteType,
 						businessNo:this.businessNo,
 						businessNo:this.businessNo,
-						businessType:this.businessType
+						businessType:this.businessType,
+						withdrawalType:this.withdrawalType
 					}
 					}
 					uni.setStorageSync('calcuteData',JSON.stringify(calcuteData))
 					uni.setStorageSync('calcuteData',JSON.stringify(calcuteData))
 					uni.navigateTo({
 					uni.navigateTo({
@@ -454,7 +457,11 @@
 					}
 					}
 				} 
 				} 
 				if(this.irrAndSimpleCalcuteParam.allFirstPayment && this.irrAndSimpleCalcuteParam.allFirstPayment < 0){
 				if(this.irrAndSimpleCalcuteParam.allFirstPayment && this.irrAndSimpleCalcuteParam.allFirstPayment < 0){
-					this.errorDialog(2,`万能账户首年交费信息须大于或等于0！`);
+					this.errorDialog(2,`万能账户首年交费须大于或等于0！`);
+					return false;
+				}
+				if(this.irrAndSimpleCalcuteParam.allFirstPayment && this.irrAndSimpleCalcuteParam.allFirstPayment > 999999999999999){
+					this.errorDialog(2,`万能账户首年交费必须小于999,999,999,999,999！`);
 					return false;
 					return false;
 				}
 				}
 				if(this.businessType == 2){
 				if(this.businessType == 2){
@@ -562,7 +569,8 @@
 					withdrawalEnd:undefined,
 					withdrawalEnd:undefined,
 					yearWithdrawalAmount:undefined}];
 					yearWithdrawalAmount:undefined}];
 				this.withdrawalType = '1';
 				this.withdrawalType = '1';
-				this.irrAndSimple = {nyear:undefined,cashValue:undefined}
+				this.irrAndSimple = {nyear:undefined,cashValue:undefined};
+				this.resultShowFlag = false;
 			}
 			}
 		},
 		},
 		onShow() {
 		onShow() {