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 |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 3b49cf2..3f1274b 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -23,6 +23,13 @@
 							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>
 					<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 />-->
@@ -91,6 +100,13 @@
 							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>
 					<div>
@@ -120,10 +136,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 />
-<!--&lt;!&ndash;						<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />&ndash;&gt;-->
-<!--&lt;!&ndash;						<el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />&ndash;&gt;-->
-<!--&lt;!&ndash;						<el-table-column label="绋庣巼(%)" prop="taxRate" width="100" show-overflow-tooltip />&ndash;&gt;-->
-<!--&lt;!&ndash;						<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />&ndash;&gt;-->
+						<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
@@ -159,6 +173,13 @@
 							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>
 					<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