xiaozhiyong/refinery-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into zyj

Browse Source 
# Conflicts:
#	src/views/order/components/billOfLading.vue
This commit is contained in:
zhangyouji
2023-06-07 16:45:18 +08:00
parent 3ebcb20141 6c858a519c
commit abf96ad23e
9 changed files with 753 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/order/components/billOfLading.vue
View File

@@ -1,7 +1,7 @@
<template>
<el-drawer direction="ltr" size="40%" :visible="controlWindows.bill" @opened="openDrawer" :before-close="closeWindow" :show-close="false">
<div class="create" v-if="controlWindows.bill">
<el-form label-width="100px">
<el-form label-width="135px">
<div class="billTop">
<div class="billTop-top">
<div class="billTop-top-left">
@@ -41,6 +41,17 @@
<span>{{ billData.orderInfo.surplusAmount }}</span>
</el-form-item>
</div>
<div
v-if="billData.orderInfo && billData.orderInfo.orderStatus && billData.orderInfo.orderStatus == 'DELIVERING'"
class="billTop-top-left"
>
<el-form-item label="炼厂余额:">
<span>{{ billData.refineryInfo.balance }}</span>
</el-form-item>
<el-form-item label="炼厂余额(预扣):">
<span>{{ balanceWithhold }}</span>
</el-form-item>
</div>
</div>
</div>
<div class="billBottom">
@@ -104,7 +115,11 @@
</el-image>
</div>
</div>
<div v-show="item.deliveryStatus == 'SUBMITED'" style="text-align: right; color: #409eff" @click="billAdd(item, index)">
<div
v-show="item.deliveryStatus == 'SUBMITED'"
style="text-align: right; color: #409eff; cursor: pointer"
@click="billAdd(item, index)"
>
我来修改/锁定
</div>
<div class="billBottom-body-bottom">
@@ -142,9 +157,11 @@
订单确认
</el-button>
</div>
<el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息确认" width="400px" :visible.sync="dialogBillAdd">
<el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息确认" width="460px" :visible.sync="dialogBillAdd">
<el-form v-if="dialogBillAdd" :model="billAddData" ref="form" :rules="rules">
<el-form-item label="预约提货量" prop="preDeliveryQuantity"> <el-input v-model="billAddData.preDeliveryQuantity"></el-input>吨 </el-form-item>
<el-form-item label="预约提货量" prop="preDeliveryQuantity">
<el-input v-model="billAddData.preDeliveryQuantity"> <template slot="append">吨</template></el-input>
</el-form-item>
<el-form-item label="提货人" prop="driverName">
<el-input v-model="billAddData.driverName"></el-input>
</el-form-item>
@@ -339,11 +356,23 @@ export default {
}
},
created() {},
computed: {
balanceWithhold() {
let { refineryInfo, orderInfo } = this.billData
if (refineryInfo) {
let balance = refineryInfo.balance * 10000
let costTotal = orderInfo.floorPrice * orderInfo.preQuantity * 10000
let total = this.$utils.fixedHandle((balance + costTotal) / 10000)
return total
}
return 0
}
},
methods: {
billdelivery() {
let percentage103 = (this.billAddData.preDeliveryQuantity * 10000 * 1.03) / 10000
if (this.deliveryQuantity > percentage103) {
this.$confirm('实际提货量超出预约提货量103%, 是否确认?', '提示', {
this.$confirm('实际提货量超出预约提货量3%, 是否确认?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -485,7 +514,6 @@ export default {
this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo))
this.configAutocomplete.echoId = id
this.configAutocomplete.echoName = this.form.refineryName
console.log('this.form', this.form.floorPrice)
}
},
submit() {