From f4e0ea65ca756d6d5c3a4ce1a35d6b08503ae664 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 5 Aug 2025 16:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8E=BB=E9=99=A4=E7=BB=8F?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=BA=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smErpCgInventory/form.vue                 | 27 ++++++++-----------
 .../smErpCgInventory/index.vue                |  6 ++---
 .../smErpRetailDelivery/form.vue              |  9 -------
 src/views/supermarketerp/supermarketUtils.ts  | 14 +++-------
 4 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index cb5563c..b5b03ba 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -11,7 +11,7 @@
 						<span class="font-bold">单据日期：</span>
 						<span>{{ baseDataForm.inventoryDate }}</span>
 					</div>
-					<div style="width: 33.33%; height: 28px; line-height: 28px">
+					<!-- <div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">经办人：</span>
 						<SelectHandlerUser
 							v-model.trim="baseDataForm.handlerUserId"
@@ -19,7 +19,7 @@
 							style="width: 200px"
 							:isDisplayName="true"
 						/>
-					</div>
+					</div> -->
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">关联补货申请：</span>
 						<span>{{ baseDataForm.linkCode }}</span>
@@ -53,14 +53,14 @@
 							:disabled="disabled"
 						/>
 					</el-form-item> -->
-					<el-form-item label="经办人" prop="handlerUserId">
+					<!-- <el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser
 							v-model.trim="baseDataForm.handlerUserId"
 							placeholder="请选择经办人"
 							style="width: 200px"
 							:disabled="disabled"
 						/>
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item label="货商" prop="supplierId">
 						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
@@ -81,7 +81,6 @@
 				border
 				:loading="loading"
 				show-overflow
-				show-footer
 				max-height="410"
 				:edit-config="{
 					trigger: 'click',
@@ -98,9 +97,12 @@
 				:column-config="{ resizable: true }"
 				:row-config="{ isHover: true }"
 				:resizable-config="{ dragMode: 'fixed' }"
+				:checkbox-config="{ highlight: true, range: true }"
 				:data="vxeTableData"
 				:edit-rules="validRules"
+				show-footer
 				:footer-data="footerData"
+				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 6 }]"
 				@checkbox-all=""
 				@checkbox-change=""
 				size="mini"
@@ -189,6 +191,9 @@
 							@change="updateFootEvent"
 						/>
 					</template>
+					<template #footer="{ row }">
+						<span style="color: #2e5cf6; font-weight: bold">{{ footerData[0].totalAmount }} 元</span>
+					</template>
 				</vxe-column>
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
@@ -207,7 +212,7 @@
 				<el-tooltip v-if="!disabled" effect="dark" content="保存并返回列表页面" placement="top">
 					<el-button type="primary" plain @click="onSave">保存</el-button>
 				</el-tooltip>
-				<!-- <el-tooltip v-if="disabled" effect="dark" content="打印清单" placement="top">
+				<!-- <el-tooltip effect="dark" content="打印清单" placement="top">
 					<el-button type="success" plain @click="printEvent">打印</el-button>
 				</el-tooltip> -->
 			</el-row>
@@ -263,7 +268,6 @@ const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
-	handlerUserId: "",
 	supplierId: "",
 	remark: "",
 	inventoryType: "3",
@@ -374,17 +378,8 @@ const getSelectedRows = (selectionRows: any) => {
 				isNew: true,
 			}
 		})
-	// 仅添加新勾选的项
 	vxeTableData.value.push(...addedItems)
 
-	// 筛选取消勾选的项
-	// const removedItems = vxeTableData.value.filter(
-	// 	(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
-	// )
-	// 仅移除取消勾选的项
-	// vxeTableData.value = vxeTableData.value.filter(
-	// 	(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
-	// )
 	updateFootCount(vxeTableData.value)
 
 	console.log("vxeTableData.value", vxeTableData.value)
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index b65b162..86328be 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -15,9 +15,9 @@
 							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
+					<!-- <el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -65,7 +65,7 @@
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
-				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
+				<!-- <el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip /> -->
 				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip>
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index 485baa8..15e9cb2 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -283,17 +283,8 @@ const getSelectedRows = (selectionRows: any) => {
 			// if (index !== -1) return vxeTableDataMemo.value[index]
 			return { ...addItem, unitId: addItem.erpUnitVos[0].id, quantity: 1, isNew: true }
 		})
-	// 仅添加新勾选的项
 	vxeTableData.value.push(...addedItems)
 
-	// 筛选取消勾选的项
-	// const removedItems = vxeTableData.value.filter(
-	// 	(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
-	// )
-	// 仅移除取消勾选的项
-	// vxeTableData.value = vxeTableData.value.filter(
-	// 	(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
-	// )
 	console.log("vxeTableData.value", vxeTableData.value)
 }
 
diff --git a/src/views/supermarketerp/supermarketUtils.ts b/src/views/supermarketerp/supermarketUtils.ts
index 88adbe1..6b0bca7 100644
--- a/src/views/supermarketerp/supermarketUtils.ts
+++ b/src/views/supermarketerp/supermarketUtils.ts
@@ -14,19 +14,13 @@ function chunk<T>(array: T[], size: number): T[][] {
 }
 
 // 表格分页 + 表单信息 打印
-export const tablePrint = (
-	editableTableRef: any,
-	baseDataInfoRef: any,
-	editableTableData: any,
-	tableChunkSize: number = 20,
-	printTitle: string = "",
-) => {
-	const $table = editableTableRef
-	const formPrintHtml = baseDataInfoRef ? baseDataInfoRef.innerHTML : ""
+export const tablePrint = (vxeTableRef: any, baseInfoRef: any, vxeTableData: any, tableChunkSize: number = 20, printTitle: string = "") => {
+	const $table = vxeTableRef
+	const formPrintHtml = baseInfoRef ? baseInfoRef.innerHTML : ""
 	if ($table && formPrintHtml) {
 		// 分割每页20条
 		Promise.all(
-			chunk(editableTableData, tableChunkSize).map((pageData: any, index: number) => {
+			chunk(vxeTableData, tableChunkSize).map((pageData: any, index: number) => {
 				return $table
 					.getPrintHtml({
 						data: pageData,