From f7cd57455346e4fd7085eae8bcf7b01a75c94d25 Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期一, 22 十二月 2025 16:35:11 +0800
Subject: [PATCH] 海川开心-协同办公-报销管理金额显示

---
 src/views/inventoryManagement/dispatchLog/index.vue |  208 ++++++++++++++++++++++++++-------------------------
 1 files changed, 106 insertions(+), 102 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index f998c08..5f73d91 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"
@@ -22,6 +13,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>
@@ -46,16 +44,14 @@
 					>
 						<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="createTime" width="120" show-overflow-tooltip />
+						<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" 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="unitPrice" width="150"></el-table-column>
+						<el-table-column label="鎬讳环(鍏�)" prop="totalPrice" width="150"></el-table-column>
 						<el-table-column label="鍑哄簱浜�" prop="createBy" width="80" show-overflow-tooltip />
 					</el-table>
 					<pagination
@@ -69,86 +65,9 @@
 				</div>
 			</el-tab-pane>
 
-<!--			<el-tab-pane label="閲囪喘鍑哄簱" name="purchase">-->
-<!--				<div class="search_form">-->
-<!--					<div>-->
-<!--&lt;!&ndash;						<span class="search_title">渚涘簲鍟嗗悕绉帮細</span>&ndash;&gt;-->
-<!--&lt;!&ndash;						<el-input&ndash;&gt;-->
-<!--&lt;!&ndash;							v-model="searchForm.supplierName"&ndash;&gt;-->
-<!--&lt;!&ndash;							style="width: 240px"&ndash;&gt;-->
-<!--&lt;!&ndash;							placeholder="璇疯緭鍏�"&ndash;&gt;-->
-<!--&lt;!&ndash;							@change="handleQuery"&ndash;&gt;-->
-<!--&lt;!&ndash;							clearable&ndash;&gt;-->
-<!--&lt;!&ndash;							prefix-icon="Search"&ndash;&gt;-->
-<!--&lt;!&ndash;						/>&ndash;&gt;-->
-<!--						<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="120" show-overflow-tooltip />-->
-<!--&lt;!&ndash;						<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="250" show-overflow-tooltip />&ndash;&gt;-->
-<!--						<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 />-->
-<!--&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="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">
+			<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"
@@ -158,6 +77,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>
@@ -182,17 +108,79 @@
 					>
 						<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="createTime" width="120" show-overflow-tooltip />
+						<el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="180" 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
+						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="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip width="130"/>
+						<el-table-column label="鎵规鍙�" prop="code" width="130" 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="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" show-overflow-tooltip />
 					</el-table>
 					<pagination
@@ -230,7 +218,7 @@
 					<div v-for="(item, index) in printData" :key="index" class="print-page">
 						<div class="delivery-note">
 							<div class="header">
-								<div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+								<div class="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
 								<div class="document-title">闆跺敭鍙戣揣鍗�</div>
 							</div>
 							
@@ -358,6 +346,7 @@
 	searchForm: {
 		supplierName: "",
 		customerName: "",
+    	productCategory:'',
 		timeStr: getCurrentDate(),
 	},
 	form: {
@@ -403,6 +392,7 @@
 		params.supplierName = searchForm.value.supplierName
 		params.timeStr = searchForm.value.timeStr
 	}
+    params.productCategory = searchForm.value.productCategory
 	
 	// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
 	const apiCall = activeTab.value === 'production' 
@@ -417,6 +407,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 +432,7 @@
 	searchForm.value.customerName = ''
 	searchForm.value.timeStr = ''
 	selectedRows.value = []
+  	searchForm.value.productCategory = ''
 	getList()
 };
 
@@ -659,7 +661,7 @@
       <div class="print-page">
         <div class="delivery-note">
           <div class="header">
-            <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+            <div class="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
             <div class="document-title">闆跺敭鍙戣揣鍗�</div>
           </div>
           
@@ -968,3 +970,5 @@
 	}
 }
 </style>
+
+

--
Gitblit v1.9.3