bug修复

pages/dataImport/data-import.vue

@@ -235,30 +235,30 @@
 				decimal:5,
 				irrAndSimpleInfos:this.policyYearLists
 			  });
-			  provide("dataImportIrrAndSimpleCalcuteParams", params);
-			  uni.navigateTo({
-			  	url: '/pages/index/index'
-			  });
-			  // api.irrAndSimpleCalcute(params).then(res=>{
-			  // 	if(res.success === true){
-			  // 		this.irrAndSimpleResInfos = res.data.irrAndSimpleResInfos;
-			  // 		// this.resultShowFlag = true;
-					// //计算成功返回上一页
-					// uni.setStorageSync('resIrrAndSimpleResInfos',this.irrAndSimpleResInfos);
-					// // uni.navigateBack({
-					// // 	delta:1,//返回层数，2则上上页
-					// // })
-					// uni.navigateTo({
-					// 	url: '/pages/index/index?isBack=1'
-					// });
-			  // 	}else{
-			  // 		uni.showToast({
-					// 	title: res['message'],
-					// 	duration: 2000,
-					// 	icon: 'none'					
-			  // 		})
-			  // 	}
-			  // })
+			  // provide("dataImportIrrAndSimpleCalcuteParams", params);
+			  // uni.navigateTo({
+			  // 	url: '/pages/index/index'
+			  // });
+			  api.irrAndSimpleCalcute(params).then(res=>{
+			  	if(res.success === true){
+			  		this.irrAndSimpleResInfos = res.data.irrAndSimpleResInfos;
+			  		// this.resultShowFlag = true;
+					//计算成功返回上一页
+					uni.setStorageSync('resIrrAndSimpleResInfos',this.irrAndSimpleResInfos);
+					// uni.navigateBack({
+					// 	delta:1,//返回层数，2则上上页
+					// })
+					uni.navigateTo({
+						url: '/pages/index/index?isBack=1'
+					});
+			  	}else{
+			  		uni.showToast({
+						title: res['message'],
+						duration: 2000,
+						icon: 'none'					
+			  		})
+			  	}
+			  })
 		  }
 			
 	  }

pages/index/index.vue

@@ -322,11 +322,13 @@
 						yearWithdrawalAmount:null}]);
 					}else if(e=='1'){
 						this.irrAndSimpleCalcuteParam.allFirstPayment = null;
-						this.yearWithdrawalInfos = [];
+						if(this.withdrawalType == '1'){
+							this.yearWithdrawalInfos = [];
+						}
 					}
 					this.resultShowFlag = false;
 				}
-				
+
 			},
 			// calcuteMethod判断单次还是批量；businessType判断保存还是计算
 			calcute(businessType){
@@ -375,6 +377,19 @@
 									this.errorDialog(1,`请输入提领信息保单年度，且年度值必须大于0`);
 									return false;
 								}
+								if(!this.yearWithdrawalInfos[i]['yearWithdrawalAmount']){
+									this.errorDialog(1,'请输入提领金额');
+									return false;
+								}else{
+									if(this.yearWithdrawalInfos[i]['yearWithdrawalAmount']<0){
+										this.errorDialog(1,'提领金额必须大于等于0');
+										return false;
+									}
+									if(this.yearWithdrawalInfos[i]['yearWithdrawalAmount']>999999999999999){
+										this.errorDialog(1,'提领金额必须小于999,999,999,999,999');
+										return false;
+									}
+								}
 							}
 						}
 					}
@@ -506,6 +521,19 @@
 								this.errorDialog(2,`请输入提领信息保单年度，且年度值必须大于0！`);
 								return false;
 							}
+							if(!this.yearWithdrawalInfos[i]['yearWithdrawalAmount']){
+								this.errorDialog(1,'请输入提领金额');
+								return false;
+							}else{
+								if(this.yearWithdrawalInfos[i]['yearWithdrawalAmount']<0){
+									this.errorDialog(1,'提领金额必须大于等于0');
+									return false;
+								}
+								if(this.yearWithdrawalInfos[i]['yearWithdrawalAmount']>999999999999999){
+									this.errorDialog(1,'提领金额必须小于999,999,999,999,999');
+									return false;
+								}
+							}
 						}
 					}
 				}