dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
齐天大圣 2024-01-13 13:22:33 +08:00
parent 3ee4bd0073
commit 0163084c13
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/oilConfig/oilTank/list.vue
View File

@ -93,7 +93,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="油品号" prop="oilNumber"> <el-form-item label="油品号" prop="oilNumber">
<el-select v-model="tankForm.numberId" placeholder="请选择油品号" style="width:100%" @change="chooseOilNumber()"> <el-select v-model="tankForm.numberId" placeholder="请选择油品号" style="width:100%" @change="chooseOilNumber()" :disabled="disableInput">
<el-option <el-option
v-for="option in selectOilTypeByPrice" v-for="option in selectOilTypeByPrice"
:key="option.numberId" :key="option.numberId"
@ -107,7 +107,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="油罐体积" prop="tankVolume"> <el-form-item label="油罐体积" prop="tankVolume">
<el-input v-model="tankForm.tankVolume" placeholder="请输入油罐体积" maxlength="30"> <el-input v-model="tankForm.tankVolume" placeholder="请输入油罐体积" maxlength="30" :disabled="disableInput">
<template slot="append">{{tankForm.unit}}</template> <template slot="append">{{tankForm.unit}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -959,6 +959,9 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
// 修改油罐容量 // 修改油罐容量
Double storedQuantity = oilTank.getStoredQuantity(); Double storedQuantity = oilTank.getStoredQuantity();
if (ObjectUtil.isEmpty(storedQuantity) || storedQuantity - oilOrder.getOilNum() <=0){
throw new RuntimeException("油罐容量不足!");
}
oilTank.setStoredQuantity(storedQuantity-oilOrder.getOilNum()); oilTank.setStoredQuantity(storedQuantity-oilOrder.getOilNum());
oilTankService.update(oilTank); oilTankService.update(oilTank);
} }

2
fuintCashierWeb/src/views/details/index.vue
View File

@ -1059,7 +1059,7 @@ export default {
// 副卡管理 // 副卡管理
secondCard(){ secondCard(){
this.openSecondCard = true; this.openSecondCard = true;
this.title = this.form.secondCard+'-副卡账户管理' this.title = this.form.secondCard || ''+'-副卡账户管理'
}, },
// 实体卡绑定 // 实体卡绑定
bindIdCard(){ bindIdCard(){