From b80934d8bb58f356abcb00a145d0305be519de8c Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期三, 24 十二月 2025 08:47:45 +0800
Subject: [PATCH] 天津双奇点-修改仓储物流相关

---
 src/views/inventoryManagement/dispatchLog/index.vue |  194 +++++++++++++++++++++++-------------------------
 1 files changed, 93 insertions(+), 101 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 2370655..000e5f6 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -1,18 +1,9 @@
 <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>-->
-<!--						<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"
@@ -54,80 +45,12 @@
 						<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="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="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 />-->
-<!--						<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />-->
-						<el-table-column label="鍑哄簱浜�" prop="createBy" width="80" show-overflow-tooltip />
-					</el-table>
-					<pagination
-						v-show="total > 0"
-						:total="total"
-						layout="total, sizes, prev, pager, next, jumper"
-						:page="page.current"
-						:limit="page.size"
-						@pagination="paginationChange"
-					/>
-				</div>
-			</el-tab-pane>
-
-			<!-- <el-tab-pane label="鍘熸枡鍑哄簱" name="purchase">
-				<div class="search_form">
-					<div>
-						<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
-						<el-date-picker
-							v-model="searchForm.timeStr"
-							type="date"
-							placeholder="璇烽�夋嫨鏃ユ湡"
-							value-format="YYYY-MM-DD"
-							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>
-					<div>
-						<el-button @click="handleOut">瀵煎嚭</el-button>
-						<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
-						<el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
-					</div>
-				</div>
-				<div class="table_list">
-					<el-table
-						:data="tableData"
-						border
-						v-loading="tableLoading"
-						@selection-change="handleSelectionChange"
-						:expand-row-keys="expandedRowKeys"
-						:row-key="(row) => row.id"
-						show-summary
-						style="width: 100%"
-						:summary-method="summarizeMainTable"
-						height="calc(100vh - 18.5em)"
-					>
-						<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="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="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
@@ -141,18 +64,9 @@
 				</div>
 			</el-tab-pane> -->
 
-			<el-tab-pane label="鎴愬搧鍑哄簱" name="manual">
+			<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"
@@ -194,18 +108,90 @@
 						<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="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="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 />-->
-<!--						<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />-->
+						<el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
+						<el-table-column label="浜у搧楂樺害" prop="specificationModel" width="100" show-overflow-tooltip>
+						<template #default="scope">
+							<div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
+						</template>
+						</el-table-column>
+						<el-table-column label="鍑哄簱鏁伴噺/浠�" prop="inboundNum" show-overflow-tooltip />
+						<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
+						<el-table-column label="鍗曚环(鍏�)/鏀�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+						<el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
+						<el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip />
+						<el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
+					</el-table>
+					<pagination
+						v-show="total > 0"
+						:total="total"
+						layout="total, sizes, prev, pager, next, jumper"
+						:page="page.current"
+						:limit="page.size"
+						@pagination="paginationChange"
+					/>
+				</div>
+			</el-tab-pane>
+
+			<el-tab-pane label="鎴愬搧鍑哄簱" name="manual">
+				<div class="search_form">
+					<div>
+						<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
+						<el-date-picker
+							v-model="searchForm.timeStr"
+							type="date"
+							placeholder="璇烽�夋嫨鏃ユ湡"
+							value-format="YYYY-MM-DD"
+							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>
+					<div>
+						<el-button @click="handleOut">瀵煎嚭</el-button>
+						<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+						<el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
+					</div>
+				</div>
+				<div class="table_list">
+					<el-table
+						:data="tableData"
+						border
+						v-loading="tableLoading"
+						@selection-change="handleSelectionChange"
+						:expand-row-keys="expandedRowKeys"
+						:row-key="(row) => row.id"
+						show-summary
+						style="width: 100%"
+						:summary-method="summarizeMainTable"
+						height="calc(100vh - 18.5em)"
+					>
+						<el-table-column align="center" type="selection" width="55" />
+						<el-table-column align="center" label="搴忓彿" type="index" width="60" />
+						<el-table-column label="浜у搧鍥剧墖" width="100" align="center">
+							<template #default="scope">
+								<img class="barcode-img" :src="javaApiUrl+scope.row.url"></img>
+							</template>
+						</el-table-column>
+						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip />
+						<el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
+						<el-table-column label="浜у搧楂樺害" prop="specificationModel" width="100" show-overflow-tooltip>
+						<template #default="scope">
+							<div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
+						</template>
+						</el-table-column>
+						<el-table-column label="鍑哄簱鏁伴噺/浠�" prop="inboundNum" show-overflow-tooltip />
+						<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
+						<el-table-column label="鍗曚环(鍏�)/鏀�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+						<el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
+						<el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip />
 						<el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
 					</el-table>
 					<pagination
@@ -353,7 +339,7 @@
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const tableData = ref([]);
-const activeTab = ref('production');
+const activeTab = ref('purchase');
 const selectedRows = ref([]);
 const tableLoading = ref(false);
 const page = reactive({
@@ -994,6 +980,12 @@
 		page-break-after: avoid;
 	}
 }
+.barcode-img{
+  width: 80px;
+  height: 80px;
+  border-radius: 5px;
+  background-color: #F5F5F5;
+}
 </style>
 
 

--
Gitblit v1.9.3