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:
cun-nan 2024-03-18 15:26:11 +08:00
parent 1f2646bdfc
commit 613995dd4e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fuintAdmin/src/views/staffCommission/staffCommission.vue
View File

@ -82,7 +82,7 @@
</el-table-column> </el-table-column>
<el-table-column label="囤油卡充值" prop="oilStorageRecharge" align="center"> <el-table-column label="囤油卡充值" prop="oilStorageRecharge" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.oilCardRecharge || 0 }}</span> <span>{{ scope.row.oilStorageRecharge || 0 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="车主加油" prop="oilSale" align="center"> <el-table-column label="车主加油" prop="oilSale" align="center">
@ -315,7 +315,7 @@
<el-drawer <el-drawer
title="库存跟踪" title="提成记录"
:visible.sync="drawer" :visible.sync="drawer"
direction="rtl" direction="rtl"
size="60%" size="60%"
@ -332,9 +332,9 @@
<el-option label="油品订单提成" :value="1"></el-option> <el-option label="油品订单提成" :value="1"></el-option>
<el-option label="商品订单提成" :value="2"></el-option> <el-option label="商品订单提成" :value="2"></el-option>
<el-option label="储值卡充值提成" :value="3"></el-option> <el-option label="储值卡充值提成" :value="3"></el-option>
<el-option label="油品退款" :value="4"></el-option> <el-option label="囤油卡充值提成" :value="4"></el-option>
<el-option label="商品退款" :value="5"></el-option> <!-- <el-option label="商品退款" :value="5"></el-option>-->
<el-option label="囤油卡充值提成" :value="6"></el-option> <!-- <el-option label="囤油卡充值提成" :value="6"></el-option>-->
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单号"> <el-form-item label="订单号">
@ -384,9 +384,9 @@
<span v-if="scope.row.type==1">油品订单提成</span> <span v-if="scope.row.type==1">油品订单提成</span>
<span v-if="scope.row.type==2">商品订单提成</span> <span v-if="scope.row.type==2">商品订单提成</span>
<span v-if="scope.row.type==3">储值卡充值提成</span> <span v-if="scope.row.type==3">储值卡充值提成</span>
<span v-if="scope.row.type==4">油品退款</span> <!-- <span v-if="scope.row.type==4">油品退款</span>-->
<span v-if="scope.row.type==5">商品退款</span> <!-- <span v-if="scope.row.type==5">商品退款</span>-->
<span v-if="scope.row.type==6">囤油卡充值提成</span> <span v-if="scope.row.type==4">囤油卡充值提成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提成金额（元）" prop="amount" align="center"> <el-table-column label="提成金额（元）" prop="amount" align="center">

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

@ -89,7 +89,7 @@ public class CommissionRecordServiceImpl implements CommissionRecordService {
staffPercentageVo.setGoodsCommission(commissionRecordMapper.selectAllCommissIon(commissionRecord)); staffPercentageVo.setGoodsCommission(commissionRecordMapper.selectAllCommissIon(commissionRecord));
commissionRecord.setType("3"); commissionRecord.setType("3");
staffPercentageVo.setOilCardRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord)); staffPercentageVo.setOilCardRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord));
commissionRecord.setType("6"); commissionRecord.setType("4");
staffPercentageVo.setOilStorageRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord)); staffPercentageVo.setOilStorageRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord));
list.add(staffPercentageVo); list.add(staffPercentageVo);
} }