修改bug

fuintAdmin/src/views/oilConfig/oilTank/list.vue

@@ -93,7 +93,7 @@
           </el-col>
           <el-col :span="8">
             <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
                   v-for="option in selectOilTypeByPrice"
                   :key="option.numberId"
@@ -107,7 +107,7 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <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>
               </el-input>
             </el-form-item>

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

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

fuintCashierWeb/src/views/details/index.vue

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