From 0e0a756dea5e57d7b458b7a80107532760c1c85e Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Tue, 25 Jun 2024 12:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=201.=E5=88=9B=E5=BB=BA=E8=BD=A6=E6=AC=A1?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=B4=B9=E5=8D=95=E4=BB=B7=EF=BC=8C?=
=?UTF-8?q?=E5=B9=B6=E6=A0=B9=E6=8D=AE=E5=85=A5=E5=BA=93=E5=90=A8=E4=BD=8D?=
=?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=80=BB=E4=BB=B7.=202.=E8=BD=A6=E8=BE=86?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E5=91=98=E5=B7=A5=E5=B7=A5=E8=B5=84=EF=BC=8C=E5=91=98?=
=?UTF-8?q?=E5=B7=A5=E8=A1=A5=E8=B4=B4=EF=BC=8C=E6=B2=B9=E8=80=97=E9=87=8F?=
=?UTF-8?q?=EF=BC=8C=E6=B2=B9=E8=80=97=E5=8D=87=E6=95=B0=EF=BC=8C=E8=BD=A6?=
=?UTF-8?q?=E5=88=A9=E6=B6=A6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../TrainNumber/TrainNumber/Edit.vue | 12 ++++++++--
.../TrainNumber/TrainNumber/List.vue | 2 +-
.../Middle/transport/Truck/Truck/Detail.vue | 22 ++++++++++++++++---
.../transport/Truck/Truck/zkTableList.vue | 16 ++++++++++++++
4 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
index 491de35..e36fe9c 100644
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
@@ -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_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: '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_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: '否' } }},
@@ -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: '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: '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: {
@@ -1034,6 +1036,12 @@ export default {
handleTotalPrice(){
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(){
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']
},
diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue
index dfc3591..75ccaf0 100644
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue
@@ -83,7 +83,7 @@
- 无
+ 否
是
diff --git a/src/pages/Middle/transport/Truck/Truck/Detail.vue b/src/pages/Middle/transport/Truck/Truck/Detail.vue
index 1b9980a..81650e1 100644
--- a/src/pages/Middle/transport/Truck/Truck/Detail.vue
+++ b/src/pages/Middle/transport/Truck/Truck/Detail.vue
@@ -138,16 +138,32 @@ export default {
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: '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,
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_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: 'repair_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: 'other_fee', 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',
align: 'center',
diff --git a/src/pages/Middle/transport/Truck/Truck/zkTableList.vue b/src/pages/Middle/transport/Truck/Truck/zkTableList.vue
index 27b2f28..3adee5f 100644
--- a/src/pages/Middle/transport/Truck/Truck/zkTableList.vue
+++ b/src/pages/Middle/transport/Truck/Truck/zkTableList.vue
@@ -48,6 +48,22 @@
+
+
+ 否
+
+
+ 是
+
+
+