diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index 9514e80c7..202c7d3fe 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -391,26 +391,42 @@ }, // 数字键盘确定按钮 submitAmount(){ - if (this.value!="" && this.qindex!=null){ - this.show = false - if (uni.getStorageSync("inviteStaffId")!=null && uni.getStorageSync("inviteStaffId")!="" && uni.getStorageSync("inviteStaffId")!=undefined){ - this.toPayment(uni.getStorageSync("inviteStaffId")) - }else{ - this.$refs.popup.open('bottom') - } - }else{ - if (this.value=="") { + // 校验油罐内油量是否足够 + request({ + url: "business/petrolStationManagement/oilTank/" + uni.getStorageSync('tankId'), + method: 'get', + }).then((res)=>{ + if (res.data.storedQuantity-this.liters<0){ uni.showToast({ - title:"请输入加油金额", - icon:"error" - }) - }else{ - uni.showToast({ - title:"请选择油枪号", - icon:"error" + title:"所加油的升数大于油罐内的升数,请重新选择加油升数", + icon:"none" }) + return; + }else { + if (this.value!="" && this.qindex!=null){ + this.show = false + if (uni.getStorageSync("inviteStaffId")){ + this.toPayment(uni.getStorageSync("inviteStaffId")) + }else{ + this.$refs.popup.open('bottom') + } + }else{ + if (this.value=="") { + uni.showToast({ + title:"请输入加油金额", + icon:"error" + }) + }else{ + uni.showToast({ + title:"请选择油枪号", + icon:"error" + }) + } + } } - } + }) + + }, changeVal(val) { this.value = val;