1.创建车次增加运费单价,并根据入库吨位计算总价.
2.车辆详情中,增加显示员工工资,员工补贴,油耗量,油耗升数,车利润。
This commit is contained in:
parent
4d1a1d0467
commit
0e0a756dea
|
|
@ -562,7 +562,8 @@ export default {
|
||||||
// {field: 'is_customer_settlement', title: '客户直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
// {field: 'is_customer_settlement', title: '客户直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
||||||
// {field: 'is_supplier_settlement', title: '供应商直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
// {field: 'is_supplier_settlement', title: '供应商直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
||||||
// {field: 'is_driver_settlement', title: '司机直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
// {field: 'is_driver_settlement', title: '司机直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
||||||
{field: 'freight', title: '运费', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
|
{field: 'unit_freight', title: '运费单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleFreight }}},
|
||||||
|
{field: 'freight', title: '运费总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
|
||||||
// {field: 'is_oil', title: '是否加油', span: 24,itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
// {field: 'is_oil', title: '是否加油', span: 24,itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
||||||
// {field: 'is_repair', title: '是否维修', span: 6,itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
// {field: 'is_repair', title: '是否维修', span: 6,itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
||||||
// {field: 'is_change_tire', title: '是否更换轮胎', span: 6,itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
// {field: 'is_change_tire', title: '是否更换轮胎', span: 6,itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
|
||||||
|
|
@ -692,7 +693,8 @@ export default {
|
||||||
{field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1}}},
|
{field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1}}},
|
||||||
{field: 'unit_price', title: '单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1 } }},
|
{field: 'unit_price', title: '单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1 } }},
|
||||||
{field: 'total_price', title: '总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
|
{field: 'total_price', title: '总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
|
||||||
{field: 'freight', title: '运费', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
|
{field: 'unit_freight', title: '运费单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleFreight1 }}},
|
||||||
|
{field: 'freight', title: '运费总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
|
||||||
]},
|
]},
|
||||||
// 司机补贴
|
// 司机补贴
|
||||||
driver_subsidyOptions: {
|
driver_subsidyOptions: {
|
||||||
|
|
@ -1034,6 +1036,12 @@ export default {
|
||||||
handleTotalPrice(){
|
handleTotalPrice(){
|
||||||
this.formOptions.data['total_price'] = this.formOptions.data['customer_warehousing_tonnage']*this.formOptions.data['unit_price'];
|
this.formOptions.data['total_price'] = this.formOptions.data['customer_warehousing_tonnage']*this.formOptions.data['unit_price'];
|
||||||
},
|
},
|
||||||
|
handleFreight(){
|
||||||
|
this.formOptions.data['freight'] = this.formOptions.data['unit_freight']*this.formOptions.data['customer_warehousing_tonnage']
|
||||||
|
},
|
||||||
|
handleFreight1(){
|
||||||
|
this.formOptions.data.train_number[this.nowIndex]['freight'] = this.formOptions.data.train_number[this.nowIndex]['unit_freight']*this.formOptions.data.train_number[this.nowIndex]['customer_warehousing_tonnage']
|
||||||
|
},
|
||||||
handleTotalPrice1(){
|
handleTotalPrice1(){
|
||||||
this.formOptions.data.train_number[this.nowIndex]['total_price'] = this.formOptions.data.train_number[this.nowIndex]['customer_warehousing_tonnage']*this.formOptions.data.train_number[this.nowIndex]['unit_price']
|
this.formOptions.data.train_number[this.nowIndex]['total_price'] = this.formOptions.data.train_number[this.nowIndex]['customer_warehousing_tonnage']*this.formOptions.data.train_number[this.nowIndex]['unit_price']
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@
|
||||||
|
|
||||||
<template #is_oil="{ row }">
|
<template #is_oil="{ row }">
|
||||||
<a-tag color="green" v-if="row.is_oil === 0">
|
<a-tag color="green" v-if="row.is_oil === 0">
|
||||||
无
|
否
|
||||||
</a-tag>
|
</a-tag>
|
||||||
<a-tag color="red" v-else>
|
<a-tag color="red" v-else>
|
||||||
是
|
是
|
||||||
|
|
|
||||||
|
|
@ -138,16 +138,32 @@ export default {
|
||||||
slots: { default: 'is_outsourcing' }
|
slots: { default: 'is_outsourcing' }
|
||||||
},
|
},
|
||||||
// 是否委外
|
// 是否委外
|
||||||
{field: 'is_need_outbound', sortable: true, title: '出车', width: 70}, // 是否需要出车
|
// {field: 'is_need_outbound', sortable: true, title: '是否出车', width: 70}, // 是否需要出车
|
||||||
{ field: 'outbound_date', align: 'center', sortable: true, formatter: 'formatDate', title: '出车日期', width: 100 }, // 出车日期
|
{ field: 'outbound_date', align: 'center', sortable: true, formatter: 'formatDate', title: '出车日期', width: 100 }, // 出车日期
|
||||||
{ field: 'return_date', align: 'center', sortable: true, formatter: 'formatDate', title: '回车日期', width: 100 }, // 回车日期
|
{ field: 'return_date', align: 'center', sortable: true, formatter: 'formatDate', title: '回车日期', width: 100 }, // 回车日期
|
||||||
|
|
||||||
|
// {
|
||||||
|
// field: 'is_oil', align: 'center', sortable: true, title: '加油', width: 70,
|
||||||
|
// slots: { default: 'is_oil' }
|
||||||
|
// }, // 是否加油
|
||||||
|
{
|
||||||
|
field: 'wage_fee', align: 'center', sortable: true, title: '工资费用', width: 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'driver_subsidy', align: 'center', sortable: true, title: '补贴费用', width: 100,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
field: 'is_oil', align: 'center', sortable: true, title: '加油', width: 70,
|
field: 'is_oil', align: 'center', sortable: true, title: '加油', width: 70,
|
||||||
slots: { default: 'is_oil' }
|
slots: { default: 'is_oil' }
|
||||||
}, // 是否加油
|
}, // 是否加油
|
||||||
|
{
|
||||||
|
field: 'oil_liter', align: 'center', sortable: true, title: '油耗升数', width: 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'oil_fee', align: 'center', sortable: true, title: '油耗费用', width: 100,
|
||||||
|
},
|
||||||
{ field: 'outbound_mileage', align: 'center', sortable: true, title: '出车公里数', width: 120 }, // 出车公里数
|
{ field: 'outbound_mileage', align: 'center', sortable: true, title: '出车公里数', width: 120 }, // 出车公里数
|
||||||
{ field: 'outbound_remark', align: 'center', sortable: true, title: '出车备注', width: 250 }, // 出车备注
|
// { field: 'outbound_remark', align: 'center', sortable: true, title: '出车备注', width: 250 }, // 出车备注
|
||||||
{ field: 'accessories_fee', align: 'center', sortable: true, title: '配件费', width: 120 }, // 配件费
|
{ field: 'accessories_fee', align: 'center', sortable: true, title: '配件费', width: 120 }, // 配件费
|
||||||
{ field: 'repair_fee', align: 'center', sortable: true, title: '维修费', width: 120 }, // 维修费
|
{ field: 'repair_fee', align: 'center', sortable: true, title: '维修费', width: 120 }, // 维修费
|
||||||
{ field: 'electric_fee', align: 'center', sortable: true, title: '电器费', width: 120 }, // 电器费
|
{ field: 'electric_fee', align: 'center', sortable: true, title: '电器费', width: 120 }, // 电器费
|
||||||
|
|
@ -155,7 +171,7 @@ export default {
|
||||||
{ field: 'tire_fee', align: 'center', sortable: true, title: '轮胎工费', width: 120 }, // 轮胎工费
|
{ field: 'tire_fee', align: 'center', sortable: true, title: '轮胎工费', width: 120 }, // 轮胎工费
|
||||||
{ field: 'other_fee', align: 'center', sortable: true, title: '其他费用', width: 120 }, // 其他费用
|
{ field: 'other_fee', align: 'center', sortable: true, title: '其他费用', width: 120 }, // 其他费用
|
||||||
{ field: 'truck_profit', align: 'center', sortable: true, title: '车利润', width: 120 }, // 车利润
|
{ field: 'truck_profit', align: 'center', sortable: true, title: '车利润', width: 120 }, // 车利润
|
||||||
{ field: 'material_profit', align: 'center', sortable: true, title: '土利润', width: 120 }, // 土利润
|
// { field: 'material_profit', align: 'center', sortable: true, title: '土利润', width: 120 }, // 土利润
|
||||||
{
|
{
|
||||||
field: 'income', sortable: true, title: '收入', width: 80, fixed: 'right',
|
field: 'income', sortable: true, title: '收入', width: 80, fixed: 'right',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,22 @@
|
||||||
<template #empty>
|
<template #empty>
|
||||||
<a-empty/>
|
<a-empty/>
|
||||||
</template>
|
</template>
|
||||||
|
<template #is_oil="{ row }">
|
||||||
|
<a-tag color="green" v-if="row.is_oil === 0">
|
||||||
|
否
|
||||||
|
</a-tag>
|
||||||
|
<a-tag color="red" v-else>
|
||||||
|
是
|
||||||
|
</a-tag>
|
||||||
|
</template>
|
||||||
|
<!-- <template #is_outsourcing="{ row }">
|
||||||
|
<a-tag color="green" v-if="row.is_outsourcing === 1">
|
||||||
|
委外出车
|
||||||
|
</a-tag>
|
||||||
|
<a-tag color="blue" v-if="row.is_need_outbound === 1">
|
||||||
|
正常出车
|
||||||
|
</a-tag>
|
||||||
|
</template> -->
|
||||||
</vxe-grid>
|
</vxe-grid>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue