From a582232206853830512bbafe8f7a4358c7a25aff Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 22 十二月 2025 13:46:01 +0800
Subject: [PATCH] 1.海川开心-发货字段和打印展示公司修改
---
src/views/inventoryManagement/dispatchLog/index.vue | 74 +++++++++++++-----------------------
1 files changed, 27 insertions(+), 47 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index e21144e..5f73d91 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -4,15 +4,6 @@
<el-tab-pane label="鎴愬搧鍑哄簱" name="production">
<div class="search_form">
<div>
-<!-- <span class="search_title">瀹㈡埛鍚嶇О锛�</span>-->
-<!-- <el-input-->
-<!-- v-model="searchForm.customerName"-->
-<!-- style="width: 240px"-->
-<!-- placeholder="璇疯緭鍏�"-->
-<!-- @change="handleQuery"-->
-<!-- clearable-->
-<!-- prefix-icon="Search"-->
-<!-- />-->
<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
<el-date-picker
v-model="searchForm.timeStr"
@@ -53,16 +44,14 @@
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" min-width="120" show-overflow-tooltip />
-<!-- <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="250" show-overflow-tooltip />-->
+ <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="120" show-overflow-tooltip />
+ <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
<el-table-column label="鍑哄簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
-<!-- <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />-->
-<!-- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />-->
-<!-- <el-table-column label="绋庣巼(%)" prop="taxRate" width="100" show-overflow-tooltip />-->
-<!-- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />-->
+ <el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="150"></el-table-column>
+ <el-table-column label="鎬讳环(鍏�)" prop="totalPrice" width="150"></el-table-column>
<el-table-column label="鍑哄簱浜�" prop="createBy" width="80" show-overflow-tooltip />
</el-table>
<pagination
@@ -79,15 +68,6 @@
<el-tab-pane label="鍘熸枡鍑哄簱" name="purchase">
<div class="search_form">
<div>
-<!--<!– <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>–>-->
-<!--<!– <el-input–>-->
-<!--<!– v-model="searchForm.supplierName"–>-->
-<!--<!– style="width: 240px"–>-->
-<!--<!– placeholder="璇疯緭鍏�"–>-->
-<!--<!– @change="handleQuery"–>-->
-<!--<!– clearable–>-->
-<!--<!– prefix-icon="Search"–>-->
-<!--<!– />–>-->
<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
<el-date-picker
v-model="searchForm.timeStr"
@@ -128,16 +108,14 @@
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" min-width="120" show-overflow-tooltip />
-<!--<!– <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="250" show-overflow-tooltip />–>-->
+ <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="120" show-overflow-tooltip />
+ <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="180" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
<el-table-column label="鍑哄簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
-<!--<!– <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />–>-->
-<!--<!– <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />–>-->
-<!--<!– <el-table-column label="绋庣巼(%)" prop="taxRate" width="100" show-overflow-tooltip />–>-->
-<!--<!– <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />–>-->
+ <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
<el-table-column label="鍑哄簱浜�" prop="createBy" width="80" show-overflow-tooltip />
</el-table>
<pagination
@@ -154,15 +132,6 @@
<el-tab-pane label="鏉愭枡鍑哄簱" name="manual">
<div class="search_form">
<div>
-<!-- <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>-->
-<!-- <el-input-->
-<!-- v-model="searchForm.supplierName"-->
-<!-- style="width: 240px"-->
-<!-- placeholder="璇疯緭鍏�"-->
-<!-- @change="handleQuery"-->
-<!-- clearable-->
-<!-- prefix-icon="Search"-->
-<!-- />-->
<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
<el-date-picker
v-model="searchForm.timeStr"
@@ -203,17 +172,15 @@
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip />
- <!-- <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="250" show-overflow-tooltip /> -->
+ <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip width="130"/>
+ <el-table-column label="鎵规鍙�" prop="code" width="130" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
<el-table-column label="鐗╁搧绫诲瀷" prop="itemType" show-overflow-tooltip />
<el-table-column label="鍑哄簱鏁伴噺" prop="inboundNum" show-overflow-tooltip />
-<!-- <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />-->
-<!-- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />-->
-<!-- <el-table-column label="绋庣巼(%)" prop="taxRate" width="100" show-overflow-tooltip />-->
-<!-- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />-->
+ <el-table-column label="鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+ <el-table-column label="鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
<el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
</el-table>
<pagination
@@ -251,7 +218,7 @@
<div v-for="(item, index) in printData" :key="index" class="print-page">
<div class="delivery-note">
<div class="header">
- <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+ <div class="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
<div class="document-title">闆跺敭鍙戣揣鍗�</div>
</div>
@@ -440,6 +407,17 @@
tableData.value = res.data.records;
tableData.value.map((item) => {
item.children = [];
+ // 鍓嶇璁＄畻鎬讳环
+ const inboundNum = Number(item.inboundNum) || 0;
+ if (activeTab.value === 'production') {
+ // 鎴愬搧鍑哄簱锛氭�讳环 = unitPrice 脳 inboundNum
+ const unitPrice = Number(item.unitPrice) || 0;
+ item.totalPrice = (unitPrice * inboundNum).toFixed(2);
+ } else {
+ // 鍘熸枡鍜屾潗鏂欏嚭搴擄細鎬讳环 = taxInclusiveUnitPrice 脳 inboundNum
+ const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
+ item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2);
+ }
});
total.value = res.data.total;
})
@@ -683,7 +661,7 @@
<div class="print-page">
<div class="delivery-note">
<div class="header">
- <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+ <div class="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
<div class="document-title">闆跺敭鍙戣揣鍗�</div>
</div>
@@ -992,3 +970,5 @@
}
}
</style>
+
+
--
Gitblit v1.9.3