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

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2023-10-26 15:01:02 +08:00
parent 9ca2e2e609
commit 2af2037ed1
3 changed files with 312 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
fuintAdmin/src/views/convenienceStore/purchase/details.vue
View File

@ -61,15 +61,6 @@
icon="el-icon-plus"
@click="commodityAdd"
>添加进货</el-button>
</el-col>
<el-col :span="1.5">
<el-alert
title="为了保证盘点我准确性,请在非收银期间段内进行盘点、否则会导致盘点信息异常"
:closable="false"
type="error">
</el-alert>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
@ -77,17 +68,26 @@
v-loading="loading"
:data="detailsList"
:default-sort="defaultSort">
<el-table-column label="油罐名称" align="center" prop="tankName"/>
<el-table-column label="油品名称" align="center" prop="numberName"/>
<el-table-column label="当前均进价" align="center" prop="currentAveragePrice" />
<el-table-column label="当前库存升数(L)" align="center" prop="currentInventoryVolume"/>
<el-table-column label="盘点升数(L)" align="center" prop="inventoryVolume">
<el-table-column label="商品名称" align="center" prop="tankName"/>
<el-table-column label="分类名称" align="center" prop="numberName"/>
<el-table-column label="供应商 " align="center" prop="currentAveragePrice" />
<el-table-column label="单位" align="center" prop="currentInventoryVolume"/>
<el-table-column label="当前库存" align="center" prop="currentInventoryVolume"/>
<el-table-column label="进货数量" align="center" prop="inventoryVolume">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.inventoryVolume" @change="change(scope.row)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="进货单价" align="center" prop="inventoryVolume">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.inventoryVolume" @change="change(scope.row)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="小计金额" align="center" prop="inventoryVolume">
<template slot-scope="scope">
<el-input-number :disabled="false" v-model="scope.row.inventoryVolume" @change="change(scope.row)" controls-position="right" :min="0" :max="100000000" :step="1" style="max-width: 100%"></el-input-number>
</template>
</el-table-column>
<el-table-column label="库存差异升数(L)" align="center" prop="stockDifference"/>
<el-table-column label="盈亏金额" align="center" prop="profitLossAmount"/>
<el-table-column v-if="state =='await' || state=='ysh'"label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -112,57 +112,71 @@
</el-card>
<!-- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">-->
<!-- <el-container>-->
<!-- <el-header style="">-->
<!-- <el-form ref="tankForm" :model="commodityForm" label-width="80px">-->
<!-- <el-row :gutter="24">-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="选择油号">-->
<!-- <el-select v-model="commodityForm.numberId" placeholder="请选择油商品分类" style="width:100%" @change="chooseOilNumber()">-->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-container>
<el-header style="">
<el-form ref="tankForm" :model="commodityForm" label-width="80px">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="商品分类">
<el-select v-model="commodityForm.cvsGoodId" placeholder="请选择商品分类" style="width:100%" @change="chooseOilNumber()">
<!-- <el-option-->
<!-- v-for="option in selectOilTypeByPrice"-->
<!-- :key="option.numberId"-->
<!-- :label="option.oilType +' '+option.oilName"-->
<!-- :value="option.numberId"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="油罐名称">-->
<!-- <el-input v-model="tankForm.tankName"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4">-->
<!-- <el-button type="primary" @click="inquireTank()">查询</el-button>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </el-header>-->
<!-- <el-main>-->
<!-- <el-table ref="tables"-->
<!-- v-loading="loading"-->
<!-- :data="tankList"-->
<!-- @selection-change="handleSelectionChange"-->
<!-- border-->
<!-- :default-sort="defaultSort">-->
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="55">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="油罐名称" align="center" prop="tankName"/>-->
<!-- <el-table-column label="油品" align="center" prop="oilNumber"/>-->
<!-- <el-table-column label="当前均价(元/升)" align="center" prop="discountedPrice" />-->
<!-- <el-table-column label="当前库存(L)" align="center" prop="storedQuantity"/>-->
<!-- </el-table>-->
<!-- </el-main>-->
<!-- </el-container>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="addOrder">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商">
<el-select v-model="commodityForm.cvsGoodId" placeholder="请选择供应商" style="width:100%" @change="chooseOilNumber()">
<!-- <el-option-->
<!-- v-for="option in selectOilTypeByPrice"-->
<!-- :key="option.numberId"-->
<!-- :label="option.oilType +' '+option.oilName"-->
<!-- :value="option.numberId"-->
<!-- ></el-option>-->
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="详细信息">
<el-input v-model="commodityForm.detailed" placeholder="商品名称，拼音码，条形码等信息" ></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button type="primary" @click="inquire()">查询</el-button>
</el-col>
</el-row>
</el-form>
</el-header>
<el-main>
<el-table ref="tables"
v-loading="loading"
:data="commodityList"
@selection-change="handleSelectionChange"
border
:default-sort="defaultSort">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column label="商品名称" align="center" prop="tankName"/>
<el-table-column label="商品编码" align="center" prop="oilNumber"/>
<el-table-column label="类别" align="center" prop="oilNumber"/>
<el-table-column label="供应商" align="center" prop="oilNumber"/>
<el-table-column label="单位" align="center" prop="oilNumber"/>
<el-table-column label="当前库存" align="center" prop="oilNumber"/>
</el-table>
</el-main>
</el-container>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="addCommodity">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -173,6 +187,7 @@
<script>
import {getAuditPremApi} from "@/api/oilConfig/staff";
import {abolitionInventoryApi, auditInventoryApi, storageInventoryApi} from "@/api/oilConfig/oilInventory";
import {BigNumber} from "bignumber.js";
export default {
name: "details",
@ -180,8 +195,14 @@ export default {
data() {
return {
detailsList: [],
commodityForm:{
commodityList: [],
commodityForm:{
cvsGoodId: "",
cvsGood: "",
supplierId: "",
supplier: "",
detailed: ""
},
purchaseForm: {
orderNumber: "",
@ -191,16 +212,16 @@ export default {
productQuantity: 0, //商品数量
quantityPurchased: 0 //进货数量
} ,
state:'',
state:'await',
saveFlag:false,
auditFlag:false,
voidFlag:false,
storageFlag:true,
multipleSelection:[], // 表格
// 弹出框标题
title:'',
title:'选择商品',
// 显示搜索条件
showSearch: true,
disableInput: false, // 默认不禁用
@ -230,17 +251,86 @@ export default {
async created() {
if (this.purchaseForm.orderNumber == null) {
this.refresh();
}
},
methods: {
// 页面跳转
goToAbout() {
this.$router.push('/convenienceStore/purchase/details');
this.$router.push('/convenienceStore/purchase/index');
},
commodityAdd() {
this.open = true;
},
commodityDel() {
},
// 查询商品
inquire() {
},
// 改变数字时
change(data) {
// // 库存差异升数
// data.stockDifference = data.inventoryVolume - data.currentInventoryVolume
// // 盈亏金额
// data.profitLossAmount = data.inventoryVolume * data.stockDifference
//
// this.sumMethod(this.orderList)
// 进行保存
// this.orderForm = data
// this.edit()
},
// 计算header数据
sumMethod(data) {
// console.log("sumMethod",data)
// let this_ = this
// this_.inventoryVolume = new BigNumber(0),
// this_.stockDifference = new BigNumber(0),
// this_.profitLossAmount = new BigNumber(0),
// data.forEach(da => {
// if (da.inventoryVolume != null) {
// this_.inventoryVolume= this_.inventoryVolume.plus(da.inventoryVolume)
// }
// if (da.stockDifference != null) {
// this_.stockDifference= this_.stockDifference.plus(da.stockDifference)
// }
// if (da.profitLossAmount != null) {
// this_.profitLossAmount= this_.profitLossAmount.plus(da.profitLossAmount)
// }
// })
},
addCommodity () {
let this_ = this
console.log("this.multipleSelection",this.multipleSelection)
this.multipleSelection.forEach(mul=>{
let now = {
tankId: mul.id,
tankName: mul.tankName,
numberId: mul.numberId,
numberName: mul.oilNumber,
inventoryVolume:mul.storedQuantity,
currentAveragePrice: mul.discountedPrice,
currentInventoryVolume: mul.storedQuantity
}
this_.orderList.push(now)
})
this_.open = false
this.numberOfTanks = this.numberOfTanks+1
this_.sumMethod(this_.orderList);
},
cancel() {
this.open = false;
},
// 表格选择器
handleSelectionChange(val) {
this.multipleSelection = val;
},
// 刷新订单编号
refresh() {
@ -248,9 +338,11 @@ export default {
let min = 100; // 最小的四位数是 1000
let max = 999; // 最大的四位数是 9999
let randomFourDigitNumber = Math.floor(Math.random() * (max - min + 1)) + min;
this.inventoryNo.inventoryNo = timestamp+randomFourDigitNumber.toString();
this.purchaseForm.orderNumber = timestamp+randomFourDigitNumber.toString();
},
// 判断按钮是否可用
async JudgmentButton(){
let judgmentPermissions1 = await this.judgmentPermissions("盘点审核");
@ -282,9 +374,11 @@ export default {
});
},
// 保存并审核
save(){
},
// 保存并审核
audit(){
// 保存
let number = this.saveInventory();
if (number != -1) {
@ -302,7 +396,7 @@ export default {
},
// 入库
audit() {
storage() {
let this_ = this;
if (this_.inventoryNo.inventoryNo == null) {
this.$modal.msgWarning("请先选择进货单号");
@ -371,4 +465,17 @@ export default {
height: 100%;
background: #f6f8f9;
}
.box {
height: 100%;
width: 50%;
margin-right: 10px;
background-color: rgba(204, 204, 204, 0.3);
border-radius: 10px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
}
</style>

122
fuintAdmin/src/views/convenienceStore/purchase/index.vue
View File

@ -2,34 +2,42 @@
<div class="app-container">
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="业务单号" prop="tankName">
<el-input v-model="queryParams.inventoryNumber" placeholder="请输入业务单号名称" />
<el-form-item label="业务单号" prop="orderNumber">
<el-input v-model="queryParams.orderNumber" placeholder="请输入业务单号" />
</el-form-item>
<el-form-item label="状态" v-model="queryParams.status" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" style="width:100%">
<el-option
v-for="dict in dict.type.oilPurchasedStatus"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-form-item label="供应商" v-model="queryParams.status" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择供应商" style="width:100%">
<!-- <el-option-->
<!-- v-for="dict in dict.type.oilPurchasedStatus"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
</el-select>
</el-form-item>
<!-- <el-form-item label="日期选择" prop="status">-->
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- type="datetimerange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="状态" v-model="queryParams.approvalStatus" prop="status">
<el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="width:100%">
<!-- <el-option-->
<!-- v-for="dict in dict.type.oilPurchasedStatus"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
</el-select>
</el-form-item>
<el-form-item label="日期选择" prop="status">
<el-date-picker
v-model="queryParams.dateRange"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
</el-card>
@ -41,22 +49,20 @@
type="primary"
icon="el-icon-plus"
@click="detailsAdd"
>添加盘点</el-button>
>新增采购订单</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
<el-table ref="tables"
v-loading="loading"
:data="inventoryList"
:data="purchaseList"
:default-sort="defaultSort">
<el-table-column label="业务单号" align="center" prop="inventoryNumber"/>
<el-table-column label="盘点详情" align="center">
<el-table-column label="盘点油罐" align="center" prop="tanks"/>
<el-table-column label="盘点升数" align="center" prop="inventoryVolume"/>
<el-table-column label="库存差异升数" align="center" prop="stockDifference"/>
<el-table-column label="盈亏金额" align="center" prop="profitLossAmount"/>
</el-table-column>
<el-table-column label="业务单号" align="center" prop="inventoryNumber"/>
<el-table-column label="业务单号" align="center" prop="inventoryNumber"/>
<el-table-column label="业务单号" align="center" prop="inventoryNumber"/>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
@ -67,15 +73,14 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作人信息" align="center">
<el-table-column label="制单人" align="center" prop="creatorName"/>
<el-table-column label="审核人" align="center" prop="reviewerName"/>
</el-table-column>
<el-table-column label="制单日期" align="center" prop="orderTime" width="200">
<el-table-column label="制单人" align="center" prop="creatorName"/>
<el-table-column label="制单日期" align="center" prop="orderDate" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderTime) }}</span>
<span>{{ parseTime(scope.row.orderDate) }}</span>
</template>
</el-table-column>
<el-table-column label="审核人" align="center" prop="approverName"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -84,14 +89,8 @@
icon="el-icon-edit"
@click="dispose(scope.row)"
>处理单据</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-copy-document"-->
<!-- @click="handleDel(scope.row.id)"-->
<!-- >删除</el-button>-->
<!-- v-hasPermi="['']"-->
</template>
</el-table-column>
</el-table>
@ -108,7 +107,7 @@
</template>
<script>
import {getInventoryApi} from "@/api/oilConfig/oilInventory";
import {delInventoryApi, getInventoryApi} from "@/api/oilConfig/oilInventory";
export default {
name: "index",
@ -127,11 +126,12 @@ export default {
// 总条数
total: 0,
dateRange: '',
// 查询参数
queryParams: {
inventoryNumber:'',
orderNumber: "",
approvalStatus: "",
status: '',
dateRange: '',
page:null,
pageSize:null
},
@ -159,7 +159,34 @@ export default {
detailsAdd() {
this.$router.push('/purchase/details');
}
},
// 处理单据
dispose(data) {
this.$router.push({
path: '/purchase/details',
params: {
inventoryId: data.id
},
});
},
// 重置
resetQuery() {
},
// 删除
handleDel(data) {
delInventoryApi(data).then(response => {
this.$modal.msgSuccess("删除成功");
this.getList();
})
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
}
@ -172,4 +199,5 @@ export default {
height: 100%;
background: #f6f8f9;
}
</style>

59
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/vo/OilTankExcel.java Normal file
View File

@ -0,0 +1,59 @@
package com.fuint.business.petrolStationManagement.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class OilTankExcel {
/**
* 油罐名称
*/
@ExcelProperty("油罐名称")
private String tankName;
/**
* 油品号
*/
@ExcelProperty("油品号")
private String oilNumber;
/**
* 油罐体积
*/
@ExcelProperty("油罐体积")
private Double tankVolume;
/**
* 油品密度
*/
@ExcelProperty("油品密度")
private Double oilDensity;
/**
* 存油数量
*/
@ExcelProperty("存油数量")
private Double storedQuantity;
/**
* 存油总价
*/
@ExcelProperty("存油总价")
private Double totalPrice;
/**
* 折后单价
*/
@ExcelProperty("折后单价")
private Double discountedPrice;
/**
* 状态
*/
@ExcelProperty("状态")
private String status;
/**
* 更新时间
*/
@ExcelProperty("更新时间")
private Date updateTime;
}