From 5c08242dd6faea9518606945b45ceb6c6cf8aab5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 17 十二月 2025 13:31:46 +0800
Subject: [PATCH] 1.海川开心-仓储物流展示字段修改

---
 src/views/inventoryManagement/dispatchLog/index.vue |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 57e9771..3cea028 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 />-->
@@ -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
@@ -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' 
@@ -431,6 +456,7 @@
 	searchForm.value.customerName = ''
 	searchForm.value.timeStr = ''
 	selectedRows.value = []
+  	searchForm.value.productCategory = ''
 	getList()
 };
 

--
Gitblit v1.9.3