更新

priceAdjustmentTask/addTask/addTask.vue

@@ -501,6 +501,7 @@
 			},
 			detailseConfirmFn() {
 				if (this.timing !== 0) return
+
 				this.aboutEnterprise.createSource = 'OMS-MINIAPP';
 				priceAdjustmentTask.newOilPriceAdjustApply(this.aboutEnterprise).then(res => {
 					if (res.code !== 20000) return
@@ -508,9 +509,7 @@
 					setTimeout(() => {
 						uni.navigateBack()
 					}, 500);
-					console.log(res)
 				})
-				console.log('确定')
 			},
 			clearFn() {
 				let keysArray = Object.keys(this.aboutEnterprise);
@@ -648,11 +647,11 @@
 			},
 			postFn() {
 				let checkPage = {
-					newPersonalPrice: {
-						tacitly: '',
-						custom: /^([1-9]\d*)(\.\d{1,6})?$|^0\.\d{1,6}?$/,
-						WrongText: '个人价不能为空或零'
-					},
+					// newPersonalPrice: {
+					// 	tacitly: '',
+					// 	custom: /^([1-9]\d*)(\.\d{1,6})?$|^0\.\d{1,6}?$/,
+					// 	WrongText: '个人价不能为空或零'
+					// },
 					newEnterprisePrice: {
 						tacitly: '',
 						custom: /^([1-9]\d*)(\.\d{1,6})?$|^0\.\d{1,6}?$/,
@@ -722,6 +721,23 @@
 					})
 					return
 				}
+				if (+this.aboutEnterprise.newFloorPrice > +this.aboutEnterprise.newEnterprisePrice) {
+					uni.showModal({
+						title: '当前调价后，存在企业价低于底价，超出合理范围，是否确认',
+						confirmText: '确认',
+						icon: 'none',
+						success: (res) => {
+							if (res.confirm) {
+								this.countdownInit()
+							}
+						}
+					})
+					return
+				}
+				this.countdownInit()
+
+			},
+			countdownInit() {
 				if (this.time) {
 					clearInterval(this.time)
 				}