From d8f82e70f0d2e98d45fd9341e35d042d3ee9e1e6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 18 十二月 2025 14:59:28 +0800
Subject: [PATCH] 1.海川开心-采购管理展示签订日期
---
src/views/inventoryManagement/dispatchLog/index.vue | 73 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 17 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 80e706b..3f1274b 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
- <el-tab-pane label="鐢熶骇鍑哄簱" name="production">
+ <el-tab-pane label="鎴愬搧鍑哄簱" name="production">
<div class="search_form">
<div>
<!-- <span class="search_title">瀹㈡埛鍚嶇О锛�</span>-->
@@ -22,6 +22,13 @@
format="YYYY-MM-DD"
clearable
@change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -52,6 +59,8 @@
<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="unitPrice" width="150"></el-table-column>
+ <el-table-column label="鎬讳环(鍏�)" prop="totalPrice" width="150"></el-table-column>
<!-- <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 />-->
@@ -69,18 +78,18 @@
</div>
</el-tab-pane>
- <el-tab-pane label="閲囪喘鍑哄簱" name="purchase">
+ <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">渚涘簲鍟嗗悕绉帮細</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"
@@ -90,6 +99,13 @@
format="YYYY-MM-DD"
clearable
@change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -115,15 +131,13 @@
<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="supplierName" width="250" 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
@@ -137,7 +151,7 @@
</div>
</el-tab-pane>
- <el-tab-pane label="鑷畾涔夊嚭搴�" name="manual">
+ <el-tab-pane label="鏉愭枡鍑哄簱" name="manual">
<div class="search_form">
<div>
<!-- <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>-->
@@ -158,6 +172,13 @@
format="YYYY-MM-DD"
clearable
@change="handleQuery"
+ />
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-input
+ v-model="searchForm.productCategory"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable
/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
@@ -189,6 +210,8 @@
<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="150"></el-table-column>-->
+<!-- <el-table-column label="鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>-->
<!-- <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 />-->
@@ -358,6 +381,7 @@
searchForm: {
supplierName: "",
customerName: "",
+ productCategory:'',
timeStr: getCurrentDate(),
},
form: {
@@ -403,6 +427,7 @@
params.supplierName = searchForm.value.supplierName
params.timeStr = searchForm.value.timeStr
}
+ params.productCategory = searchForm.value.productCategory
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
const apiCall = activeTab.value === 'production'
@@ -417,6 +442,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;
})
@@ -431,6 +467,7 @@
searchForm.value.customerName = ''
searchForm.value.timeStr = ''
selectedRows.value = []
+ searchForm.value.productCategory = ''
getList()
};
@@ -968,3 +1005,5 @@
}
}
</style>
+
+
--
Gitblit v1.9.3