From 6ea383478308213d932e938a2b76c3bb7ae6109d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 31 Oct 2024 15:54:59 +0800
Subject: [PATCH] 10.31

---
 .../src/views/oilConfig/oilGun/list.vue       | 13 ++++++++++--
 .../oilConfig/oilPrice/comp/addprice.vue      | 10 +++++-----
 .../views/oilConfig/oilPrice/comp/oilcon.vue  | 20 +++++++++----------
 .../service/impl/OilOrderServiceImpl.java     |  2 +-
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index 773ac16fa..efb217949 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -98,7 +98,6 @@
       />
     </div>
     <el-dialog
-      center
       :title="title"
       :visible.sync="dialogVisible"
       width="25%"
@@ -118,6 +117,16 @@
             </el-select>
           </el-input>
         </el-form-item>
+        <el-form-item label="关联油品油号" prop="tankId">
+          <el-select style="width: 300px" v-model="gunForm.tankId" placeholder="请选择所属油罐">
+            <el-option
+              v-for="option in tankList"
+              :key="option.id"
+              :label="option.tankName"
+              :value="option.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="所属油罐" prop="tankId">
           <el-select style="width: 300px" v-model="gunForm.tankId" placeholder="请选择所属油罐">
             <el-option
@@ -128,7 +137,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="status">
+        <el-form-item label="关联员工" prop="status">
           <el-radio v-model="staffStatus" label="全部员工">全部员工</el-radio>
           <el-radio v-model="staffStatus" label="指定员工">指定员工</el-radio>
         </el-form-item>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
index 14f20573d..800551000 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
@@ -244,7 +244,7 @@ export default {
             <el-table-column
               prop="currentPetrolPrices"
               align="center"
-              label="油站价"
+              label="挂牌价"
             >
             </el-table-column>
             <el-table-column
@@ -335,8 +335,8 @@ export default {
       </div>
 
     </div>
-    <el-dialog center title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
-      <el-form ref="priForm" :model="oilPresetPrices" label-width="140px" :rules="oilPresetPricesRules">
+    <el-dialog title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
+      <el-form ref="priForm" :model="oilPresetPrices" label-width="135px" :rules="oilPresetPricesRules">
         <el-form-item label="预设油品油号" prop="numberId">
           <el-select v-model="oilPresetPrices.numberId" placeholder="请选择油品名称" style="width: 100%"
                      @change="oilTypeClickByPrice()">
@@ -354,7 +354,7 @@ export default {
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="预设油站挂牌价" prop="presetOilPrices">
+        <el-form-item label="预设油品挂牌价" prop="presetOilPrices">
           <el-input v-model="oilPresetPrices.presetOilPrices" pattern="^\d+(\.\d+)?$">
             <template slot="append">元{{ oilPresetPrices.unit ? "/" + oilPresetPrices.unit : oilPresetPrices.unit }}
             </template>
@@ -384,7 +384,7 @@ export default {
           </el-date-picker>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button @click="dialogFormPricesAdd = false">取 消</el-button>
         <el-button type="primary" @click="insertOilPresePrices()">确 定</el-button>
       </div>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
index 192a23410..b2d4aa315 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
@@ -329,8 +329,8 @@ export default {
 
 
     </div>
-    <el-dialog center :title="title" width="26%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
-      <el-form ref="form" :model="oilNumber" :rules="rules" label-width="130px" >
+    <el-dialog :title="title" width="30%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
+      <el-form ref="form" :model="oilNumber" :rules="rules" label-width="120px" >
         <el-form-item label="油品类型" prop="oilType">
           <el-radio-group  v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">
             <el-radio
@@ -342,8 +342,8 @@ export default {
           </el-radio-group>
         </el-form-item>
 
-          <el-form-item label="油品名称" prop="oilName">
-            <el-select  v-model="oilNumber.oilNameT" style="width: 300px" placeholder="请选择油品名称" @change="changeOilName">
+          <el-form-item label="油号名称" prop="oilName">
+            <el-select  v-model="oilNumber.oilNameT" style="width: 100%" placeholder="请选择油号名称" @change="changeOilName">
               <el-option
                 v-for="option in oilNameList"
                 :key="option.id"
@@ -354,7 +354,7 @@ export default {
           </el-form-item>
 
           <el-form-item label="计价单位" prop="unit">
-            <el-select v-model="oilNumber.unit" style="width: 300px" placeholder="请选择活动区域">
+            <el-select v-model="oilNumber.unit" style="width: 100%" placeholder="请选择活动区域">
               <el-option
                 v-for="option in receivingUnitList"
                 :key="option.value"
@@ -366,13 +366,13 @@ export default {
           </el-form-item>
 
           <el-form-item label="当前油品挂牌价" prop="oilPrice">
-            <el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" style="width: 300px">
+            <el-input v-model="oilNumber.oilPrice" pattern="^\d+(\.\d+)?$" >
               <template slot="append">元{{oilNumber.unit?"/"+oilNumber.unit:''}}</template>
             </el-input>
           </el-form-item>
 
           <el-form-item label="当前油品国标价" prop="gbPrice">
-            <el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" style="width: 300px">
+            <el-input v-model="oilNumber.gbPrice" pattern="^\d+(\.\d+)?$" >
               <template slot="append">元{{oilNumber.unit?"/"+oilNumber.unit:''}}</template>
             </el-input>
           </el-form-item>
@@ -395,13 +395,13 @@ export default {
 <!--            </el-form-item>-->
 
         <el-form-item label="备注">
-          <el-input type="textarea" v-model="oilNumber.remark" style="width: 300px;"></el-input>
+          <el-input type="textarea" v-model="oilNumber.remark" ></el-input>
         </el-form-item>
 
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button @click="dialogFormNumberEdit = false">取 消</el-button>
-        <el-button type="primary" @click=" updateOilNumberin('form')">确 定</el-button>
+        <el-button type="primary" @click=" updateOilNumberin('form')">保 存</el-button>
       </div>
     </el-dialog>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index c0b6ea03d..91c3b6747 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -561,7 +561,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                 return orders;
             }
             Double fuelAmount = userFuelService.selectByUserIdAndOilId(userId, Integer.valueOf(JSONObject.parseObject(oilOrder).get("oils").toString()), storeId);
-            if (fuelAmount < oilActualPay) {
+            if (fuelAmount < Double.valueOf(oilCardAmount)) {
                 orders.put("error", "余额不足，请分开支付");
                 return orders;
             }