From a66da67589e9ec2fbbd6a253e9a9447ba0b29fe2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 七月 2025 15:15:06 +0800
Subject: [PATCH] 1.销售出库运费问题
---
src/views/salesOutbound/components/formDia.vue | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/views/salesOutbound/components/formDia.vue b/src/views/salesOutbound/components/formDia.vue
index e990bc8..b210c91 100644
--- a/src/views/salesOutbound/components/formDia.vue
+++ b/src/views/salesOutbound/components/formDia.vue
@@ -81,36 +81,41 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="杩愯垂" prop="freight">
- <el-input v-model="form.freight" placeholder="璇疯緭鍏ラ攢鍞�讳环(鍚◣)" maxlength="30" type="number" :disabled="operationType === 'view'"/>
+ <el-form-item label="閲囪喘杩愯垂" prop="purchasingFreight" @change="mathProfit">
+ <el-input v-model="form.purchasingFreight" placeholder="璇疯緭鍏�" maxlength="30" type="number" :disabled="operationType === 'view'"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
+ <el-col :span="12">
+ <el-form-item label="閿�鍞繍璐�" prop="salesFreight" @change="mathProfit">
+ <el-input v-model="form.salesFreight" placeholder="璇疯緭鍏�" maxlength="30" type="number" :disabled="operationType === 'view'"/>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="璐攢鐓ょ◣鐜�(%)" prop="taxCoal">
- <el-input v-model="form.taxCoal" placeholder="璇疯緭鍏ラ攢鍞�讳环(鍚◣)" maxlength="30" type="number" :disabled="operationType === 'view'"/>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="杩愯緭绋庣巼(%)" prop="taxTrans">
- <el-input v-model="form.taxTrans" placeholder="璇疯緭鍏ラ攢鍞�讳环(鍚◣)" maxlength="30" type="number" :disabled="operationType === 'view'"/>
+ <el-input v-model="form.taxCoal" placeholder="璇疯緭鍏�" maxlength="30" type="number" :disabled="operationType === 'view'"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
+ <el-col :span="12">
+ <el-form-item label="杩愯緭绋庣巼(%)" prop="taxTrans">
+ <el-input v-model="form.taxTrans" placeholder="璇疯緭鍏�" maxlength="30" type="number" :disabled="operationType === 'view'"/>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="姣涘埄娑�" prop="grossProfit">
<el-input v-model="form.grossProfit" placeholder="姣涘埄娑�" maxlength="30" type="number" :disabled="operationType === 'view'"/>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鍑�鍒╂鼎" prop="netProfit">
- <el-input v-model="form.netProfit" placeholder="鍑�鍒╂鼎" maxlength="30" type="number" :disabled="operationType === 'view'"/>
- </el-form-item>
- </el-col>
</el-row>
<el-row>
+ <el-col :span="12">
+ <el-form-item label="鍑�鍒╂鼎" prop="netProfit">
+ <el-input v-model="form.netProfit" placeholder="鍑�鍒╂鼎" maxlength="30" type="number" :disabled="operationType === 'view'"/>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="娣诲姞鑷冲緟琛ュ簱" prop="isPendingRestock">
<el-select v-model="form.isPendingRestock" placeholder="">
@@ -152,13 +157,14 @@
saleQuantity: '',
salePrice: '',
totalAmount: '',
- freight: '',
+ purchasingFreight: '',
taxCoal: '',
taxTrans: '',
grossProfit: '',
netProfit: '',
inventoryQuantity: '',
priceIncludingTax: '',
+ salesFreight: '',
isPendingRestock: false
},
rules: {
@@ -169,7 +175,7 @@
saleQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
salePrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
totalAmount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
- freight: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
+ purchasingFreight: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" },],
taxCoal: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
taxTrans: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
grossProfit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" },],
@@ -201,7 +207,8 @@
form.value.registrantId = res.user.userId
form.value.taxCoal = 13
form.value.taxTrans = 9
- form.value.freight = 20
+ form.value.purchasingFreight = 20
+ form.value.salesFreight = 0
if (type !== 'add') {
form.value = {...row}
}
@@ -227,7 +234,8 @@
const purchaseTons = form.value.inventoryQuantity; // 搴撳瓨鏁伴噺
const saleTons = form.value.saleQuantity; // 閿�鍞暟閲�
const purchasePricePerTon = form.value.priceIncludingTax; // 鍚◣鍗曚环
- const transportPricePerTon = form.value.freight; // 杩愯垂
+ const transportPricePerTon = form.value.purchasingFreight; // 閲囪喘杩愯垂
+ const salesFreight = form.value.salesFreight; // 閿�鍞繍璐�
const salePricePerTon = form.value.salePrice; // 閿�鍞崟浠凤紙鍏�/鍚級
const coalTaxRate = form.value.taxCoal / 100; // 璐攢鐓ょ◣鐜囷紙13%锛�
const transportTaxRate = form.value.taxTrans / 100; // 杩愯緭绋庣巼锛�9%锛�
@@ -242,13 +250,15 @@
const D = C * transportTaxRate * purchaseTons; // 杩愯垂杩涢」绋庨
const E = salePricePerTon / (1 + coalTaxRate); // 閿�鍞笉鍚◣鍗曚环
const F = E * coalTaxRate * saleTons; // 閿�椤圭◣棰�
+ const R = salesFreight / (1 + transportTaxRate); // 閿�鍞叅杩愯垂涓嶅惈绋庡崟浠�
+ const S = R * transportTaxRate * saleTons; // 閿�鍞叅杩愯垂杩涢」绋庨
// 姣涘埄娑� = 閿�鍞敹鍏� - 鎴愭湰鎴愭湰锛堣喘鐓�+杩愯垂锛夌殑鎴愭湰閮ㄥ垎
- const G = E * saleTons - A * saleTons - C * saleTons;
+ const G = E * saleTons - A * saleTons - C * saleTons - R * saleTons;
form.value.grossProfit = G.toFixed(2);
// 搴旂即绾冲鍊肩◣ = 閿�椤圭◣ - 鍙姷鎵ｈ繘椤圭◣锛堟寜閿�鍞噺姣斾緥璁＄畻锛�
- const H = F - (A * coalTaxRate * saleTons) - (C * transportTaxRate * saleTons);
+ const H = F - (A * coalTaxRate * saleTons) - (C * transportTaxRate * saleTons) - (R * transportTaxRate * saleTons);
// 澧炲�肩◣闄勫姞绋�
const K = H * surchargeRate;
--
Gitblit v1.9.3