From dbb84fba23bd29ca1fafdc86f8e52265b586b669 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 11 十一月 2025 13:23:22 +0800
Subject: [PATCH] 逻辑回退

---
 src/views/inventoryManagement/dispatchLog/index.vue |  276 +++++++------------------------------------------------
 1 files changed, 35 insertions(+), 241 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 7f4b267..751a92d 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -1,209 +1,34 @@
 <template>
 	<div class="app-container">
-		<el-tabs v-model="activeTab" @tab-change="handleTabChange">
-			<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"
-							type="date"
-							placeholder="璇烽�夋嫨鏃ユ湡"
-							value-format="YYYY-MM-DD"
-							format="YYYY-MM-DD"
-							clearable
-							@change="handleQuery"
-						/>
-						<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"
-						: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" label="搴忓彿" type="index" width="60" />
-						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" min-width="250" show-overflow-tooltip />
-						<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="250" show-overflow-tooltip />
-						<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
-						<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="100" 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="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">渚涘簲鍟嗗悕绉帮細</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"
-							type="date"
-							placeholder="璇烽�夋嫨鏃ユ湡"
-							value-format="YYYY-MM-DD"
-							format="YYYY-MM-DD"
-							clearable
-							@change="handleQuery"
-						/>
-						<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="250" show-overflow-tooltip />
-						<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="250" show-overflow-tooltip />
-						<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
-						<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="100" 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="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="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"
-							type="date"
-							placeholder="璇烽�夋嫨鏃ユ湡"
-							value-format="YYYY-MM-DD"
-							format="YYYY-MM-DD"
-							clearable
-							@change="handleQuery"
-						/>
-						<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="250" show-overflow-tooltip />
-						<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="250" show-overflow-tooltip />
-						<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
-						<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="100" show-overflow-tooltip />
-						<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
-						<el-table-column label="鐗╁搧绫诲瀷" prop="itemType" width="120" 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="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-tabs>
+		<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"
+					type="date"
+					placeholder="璇烽�夋嫨鏃ユ湡"
+					value-format="YYYY-MM-DD"
+					format="YYYY-MM-DD"
+					clearable
+					@change="handleQuery"
+				/>
+				<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"
@@ -437,15 +262,10 @@
 	getStockOutPage,
 	delStockOut,
 } from "@/api/inventoryManagement/stockOut.js";
-import {
-	getStockInPageByProduct,
-	getStockInPageByCustom,
-} from "@/api/inventoryManagement/stockIn.js";
 
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const tableData = ref([]);
-const activeTab = ref('production');
 const selectedRows = ref([]);
 const tableLoading = ref(false);
 const page = reactive({
@@ -462,7 +282,6 @@
 const data = reactive({
 	searchForm: {
 		supplierName: "",
-		customerName: "",
 		timeStr: "",
 	},
 	form: {
@@ -500,23 +319,13 @@
 };
 const getList = () => {
 	tableLoading.value = true;
-	const params = { ...page }
-	if (activeTab.value === 'production') {
-		params.customerName = searchForm.value.customerName
-		params.timeStr = searchForm.value.timeStr
-	} else {
-		params.supplierName = searchForm.value.supplierName
-		params.timeStr = searchForm.value.timeStr
+	const params = { 
+		...page,
+		supplierName: searchForm.value.supplierName,
+		timeStr: searchForm.value.timeStr
 	}
 	
-	// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
-	const apiCall = activeTab.value === 'production' 
-		? getStockInPageByProduct(params)
-		: activeTab.value === 'manual' 
-		? getStockInPageByCustom(params)
-		: getStockOutPage(params)
-	
-	apiCall
+	getStockOutPage(params)
 		.then((res) => {
 			tableLoading.value = false;
 			tableData.value = res.data.records;
@@ -530,14 +339,6 @@
 		});
 };
 
-const handleTabChange = () => {
-	page.current = 1
-	searchForm.value.supplierName = ''
-	searchForm.value.customerName = ''
-	searchForm.value.timeStr = ''
-	selectedRows.value = []
-	getList()
-};
 
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
@@ -564,14 +365,7 @@
 		type: "warning",
 	})
 		.then(() => {
-			// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勫鍑烘帴鍙�
-			let exportUrl = "/stockmanagement/export"
-			if (activeTab.value === 'production') {
-				exportUrl = "/stockmanagement/exportone"
-			} else if (activeTab.value === 'manual') {
-				exportUrl = "/stockmanagement/exportTwo"
-			}
-			proxy.download(exportUrl, {}, "鍑哄簱鍙拌处.xlsx");
+			proxy.download("/stockmanagement/export", {}, "鍑哄簱鍙拌处.xlsx");
 		})
 		.catch(() => {
 			proxy.$modal.msg("宸插彇娑�");

--
Gitblit v1.9.3