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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
sw 2024-11-21 09:56:55 +08:00
commit 886aaf2b89
2 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div class="card-change" style="height: 90vh;">
<div class="card-change" style="height: 91.4vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="" prop="purchaseNo">
<el-input v-model="queryParams.purchaseNo" placeholder="请输入进货单号"/>
@ -63,7 +63,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 74vh;overflow: auto;scrollbar-width: none">
<div style="height: 75vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables"
v-loading="loading"
:data="purchaseList"
@ -231,6 +231,7 @@ export default {
},
// 添加采购
purchaseAdd() {
this.query={}
this.$router.push('/oilPurchase/purchaseOrder');
},
// 处理单据

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

@ -1,6 +1,11 @@
<template>
<div class="app-container" style="padding-top: 1px">
<div class="top-box" @click="goback()">
<span style="cursor: pointer" v-if="this.state == 'await' "> 当前位置：油站管理--采购审核</span>
<span style="cursor: pointer" v-else-if="this.state == 'ysh' "> 当前位置：油站管理--油品入库</span>
<span style="cursor: pointer" v-else-if="this.state == 'yzf' || this.state == 'qrts' "> 当前位置：油站管理--采购详情</span>
<span style="cursor: pointer" v-else> 当前位置：油站管理--新增采购</span>
</div>
<div class="card-change-1-search">
<div class="" style="height: 90px; display: flex; justify-content: space-between;">
<div style="height: 100%; display: flex; justify-content: space-between;">
@ -53,7 +58,9 @@
<el-button type="primary" @click="cancelPurchase" v-if="state=='qrts'">关闭</el-button>
<el-button @click="cancelPurchase" v-else>取消</el-button>
<el-button type="success" v-if="state=='await'" :disabled="saveFlag" @click="savePurchase()">保存</el-button>
<el-button type="success" v-if="state==''" :disabled="saveFlag" @click="savePurchase()">保存</el-button>
<el-button type="primary" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="primary" v-if="state==''" :disabled="auditFlag" @click="audit">保存并审核</el-button>
<el-button type="danger" v-if="state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
<el-button type="primary" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">收货并入库</el-button>
<!-- state=='yzf'-->
@ -73,6 +80,13 @@
@click="orderAdd"
>添加采购油品
</el-button>
<el-button
v-if="state ==''"
type="primary"
icon="el-icon-plus"
@click="orderAdd"
>添加采购油品
</el-button>
</el-col>
</el-row>
<div style="height: 60vh;overflow: auto">
@ -144,8 +158,8 @@
<el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="orderForm" :rules="rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="22">
<el-form-item label="采购油品号" prop="numberId">
<el-col :span="24">
<el-form-item label="采购油品号" prop="numberId" style="margin-left: -30px;">
<el-select v-model="orderForm.numberId" placeholder="请选择油品" style="width:100%"
@change="chooseOilNumber($event)">
<el-option
@ -159,8 +173,8 @@
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="22">
<el-form-item label="入库油罐" prop="tankId">
<el-col :span="24">
<el-form-item label="入库油罐" prop="tankId" style="margin-left: -30px;">
<el-select v-model="orderForm.tankId" placeholder="请选择油罐" style="width:100%"
@change="chooseTank($event),getSecondName()">
<el-option
@ -177,8 +191,8 @@
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="22">
<el-form-item label="供应商" prop="supplierId">
<el-col :span="24">
<el-form-item label="供应商" prop="supplierId" style="margin-left: -30px;">
<el-select v-model="orderForm.supplierId" placeholder="请选择供应商" style="width:100%">
<el-option
v-for="option in suppliersList"
@ -191,8 +205,8 @@
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="22">
<el-form-item label="油品密度" prop="productDensity">
<el-col :span="24">
<el-form-item label="油品密度" prop="productDensity" style="margin-left: -30px;">
<el-input v-model="orderForm.productDensity" @input="aaa()" placeholder="请输入油品密度">
<template slot="append">g/ml</template>
</el-input>
@ -207,8 +221,8 @@
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="22">
<el-form-item label="采购吨数" prop="purchaseWeight">
<el-col :span="24">
<el-form-item label="采购吨数" prop="purchaseWeight" style="margin-left: -30px;">
<el-input v-model="orderForm.purchaseWeight" placeholder="请输入采购吨数" @input="inputPurchaseWeight()">
<template slot="append">吨</template>
</el-input>
@ -216,8 +230,8 @@
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="22">
<el-form-item label="采购单价" prop="purchasePrice">
<el-col :span="24">
<el-form-item label="采购单价" prop="purchasePrice" style="margin-left: -30px;">
<el-input v-model="orderForm.purchasePrice" placeholder="请输入采购单价">
<template slot="append">元/吨</template>
</el-input>
@ -225,7 +239,7 @@
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div style="text-align: center;">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
@ -392,10 +406,10 @@ export default {
this.state = this.$route.query.state;
if (this.state == null) {
this.state = 'await'
this.state = ''
}
if (this.state == 'await') {
if (this.state == '') {
this.numberInput = false
} else {
this.numberInput = true
@ -938,6 +952,9 @@ export default {
goToAbout() {
this.$router.push('/oilConfig/oilPurchase/list');
},
goback(){
this.$router.go(-1)
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
@ -960,6 +977,20 @@ export default {
padding: 0px;
}
.top-box{
width: 100%;
background: #fff;
box-sizing: border-box;
padding: 20px;
display: flex;
align-items: center;
font-weight: 400;
font-size: 18px;
color: #666666;
padding-left: 25px;
}
.box {
height: 80%;
width: 212px;
@ -980,7 +1011,7 @@ export default {
.card-change-1-1{
margin: 10px;
height: 74vh;
height: 69vh;
}