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

10.25

Browse Source
This commit is contained in:
cun-nan 2024-10-25 17:51:00 +08:00
parent 42b9df78a8
commit 73576a54ae
3 changed files with 114 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
View File

@ -52,7 +52,7 @@
placeholder="结束日期"> placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item style="float: right;margin-right: 0px"> <el-form-item style="display:flex;justify-content: end">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button <el-button
@ -60,10 +60,12 @@
@click="purchaseAdd" @click="purchaseAdd"
v-hasPermi="['oilConfig:oilPurchase:list:add']" v-hasPermi="['oilConfig:oilPurchase:list:add']"
>新增采购</el-button> >新增采购
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 70vh;overflow: auto">
<el-table ref="tables" <el-table ref="tables"
v-loading="loading" v-loading="loading"
:data="purchaseList" :data="purchaseList"
@ -110,19 +112,22 @@
type="text" type="text"
v-if="scope.row.status == 'await'" v-if="scope.row.status == 'await'"
@click="dispose(scope.row)" @click="dispose(scope.row)"
>油品入库</el-button> >油品入库
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-else-if="scope.row.status == 'ysh'" v-else-if="scope.row.status == 'ysh'"
@click="dispose(scope.row)" @click="dispose(scope.row)"
>采购审核</el-button> >采购审核
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-else v-else
@click="dispose(scope.row)" @click="dispose(scope.row)"
>查看详情</el-button> >查看详情
</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -133,6 +138,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -276,6 +282,7 @@ export default {
height: 100%; height: 100%;
background: #f6f8f9; background: #f6f8f9;
} }
.el-form--inline .el-form-item { .el-form--inline .el-form-item {
margin-right: 44px; margin-right: 44px;
} }

32
fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
View File

@ -4,24 +4,24 @@
<div class="card-change-1-search"> <div class="card-change-1-search">
<div class="" style="height: 90px; display: flex; justify-content: space-between;"> <div class="" style="height: 90px; display: flex; justify-content: space-between;">
<div style="height: 100%; display: flex; justify-content: space-between;"> <div style="height: 100%; display: flex; justify-content: space-between;">
<div style="height: 100%; width: 70%; display: flex; justify-content: space-between;font-family: YouSheBiaoTiHei"> <div style="height: 100%; width: 70%; display: flex; justify-content: space-between;align-items: center">
<div class="box"> <div class="box">
<span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchasedTonnage}}</span> <span style="font-size: 24px;color: #0DC291;font-weight: bold" >{{purchasedTonnage}}</span>
<span style="display: flex"> <span style="display: flex;font-size: 14px;font-weight: bold">
<div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div> <div style="background-color: #0DC291;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
采购吨数 采购吨数
</span> </span>
</div> </div>
<div class="box"> <div class="box">
<span style="font-size: 26px;color: #3B6ADE;font-weight: bold" >{{purchaseLiters}}</span> <span style="font-size: 26px;color: #00CAFF;font-weight: bold" >{{purchaseLiters}}</span>
<span style="display: flex"> <span style="display: flex;font-size: 14px;font-weight: bold">
<div style="background-color: #3B6ADE;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div> <div style="background-color: #00CAFF;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
采购升数</span> 采购升数</span>
</div> </div>
<div class="box"> <div class="box">
<span style="font-size: 26px;color: #FF4347;font-weight: bold">{{totalAmountPurchased}}</span> <span style="font-size: 26px;color: #F44522;font-weight: bold">{{totalAmountPurchased}}</span>
<span style="display: flex"> <span style="display: flex;font-size: 14px;font-weight: bold">
<div style="background-color: #FF4347;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div> <div style="background-color: #F44522;width: 10px;height: 10px;border-radius: 50%;margin-top: 6px;margin-right: 10px"></div>
采购总额</span> 采购总额</span>
</div> </div>
</div> </div>
@ -47,10 +47,11 @@
</div> </div>
</div> </div>
<div style="height: 100%; width: 30%; display: flex; align-items: center; justify-content: flex-end;"> <div style="height: 100%; width: 30%; display: flex; align-items: center; justify-content: flex-end;">
<el-button @click="cancelPurchase">取消</el-button>
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="savePurchase()">保存</el-button> <el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="savePurchase()">保存</el-button>
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button> <el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="success" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">收货并入库</el-button> <el-button type="danger" v-if="state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button> <el-button type="primary" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">收货并入库</el-button>
<!-- state=='yzf'--> <!-- state=='yzf'-->
</div> </div>
</div> </div>
@ -414,6 +415,10 @@ export default {
} }
}, },
methods: { methods: {
// 返回页面
cancelPurchase(){
this.$router.back()
},
aaa() { aaa() {
this.densityCalculations() this.densityCalculations()
this.$forceUpdate(); this.$forceUpdate();
@ -946,12 +951,11 @@ export default {
padding: 0px; padding: 0px;
} }
.box { .box {
height: 100%; height: 80%;
width: 212px; width: 212px;
margin-right: 10px; margin-right: 10px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10px 10px 10px 10px; border: 1px solid #FF9655;
border: 1px solid #EEEEEE;
border-radius: 10px; border-radius: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

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

@ -726,7 +726,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
e.printStackTrace(); e.printStackTrace();
} }
} else { } else {
this.insertAllOrderInfo(orderNo, storeId, oilAmount + goodsAmount, Double.valueOf(map.get("allAmount")), oilDiscount, payType, userId, "PC", "6", "paid"); Double payAmount = map.get("payType").equals("CASH") ? Double.valueOf(map.get("authCode")) : Double.valueOf(map.get("allAmount"));
this.insertAllOrderInfo(orderNo, storeId, oilAmount + goodsAmount, payAmount, oilDiscount, payType, userId, "PC", "6", "paid");
// 添加车队卡订单信息 // 添加车队卡订单信息
if (payType.equals("car_card_value") && ObjectUtil.isNotEmpty(fleetMember)) this.addFleetOrder(orderNo,fleetMember); if (payType.equals("car_card_value") && ObjectUtil.isNotEmpty(fleetMember)) this.addFleetOrder(orderNo,fleetMember);