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

10.31

Browse Source
This commit is contained in:
cun-nan 2024-10-31 15:54:59 +08:00
parent 94c0c18e6f
commit 6ea3834783
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fuintAdmin/src/views/oilConfig/oilGun/list.vue
View File

@ -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>

10
fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
View File

@ -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>

20
fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
View File

@ -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>

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

@ -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;
}