From 0e66d461a73f66d5b82111577d8604535e21394f Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 15 Aug 2025 11:17:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=A5=E5=BA=93=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E8=BF=9B=E4=BB=B7=E6=A0=B9=E6=8D=AE=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=92=8C=E6=80=BB=E9=87=91=E9=A2=9D=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smErpCgInventory/form.vue                 | 32 +++++++++++++------
 .../supermarketerp/stockTaking/index.vue      |  6 +---
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index ff1aba3..2d5357d 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -152,9 +152,9 @@
 							v-model="row.quantity"
 							:min="0"
 							:precision="0"
-							@change="onRowValueChange(row, $rowIndex)"
+							@change="onQuantityChange(row, $rowIndex)"
 						/>
-						<el-input-number v-else v-model="row.quantity" :min="0" :precision="2" @change="onRowValueChange(row, $rowIndex)" />
+						<el-input-number v-else v-model="row.quantity" :min="0" :precision="2" @change="onQuantityChange(row, $rowIndex)" />
 					</template>
 				</vxe-column>
 				<vxe-column field="purchasePrice" title="原进价">
@@ -162,11 +162,11 @@
 						{{ displayPrice(row.selectedUnitObj?.purchasePrice || 0) }}
 					</template>
 				</vxe-column>
-				<vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<vxe-column field="realPrice" title="实际进价">
 					<template #default="{ row }">
 						{{ row?.selectedUnitObj?.realPrice || 0 }}
 					</template>
-					<template #edit="{ row, $rowIndex }">
+					<!-- <template #edit="{ row, $rowIndex }">
 						<el-input-number
 							v-if="row.selectedUnitObj"
 							v-model="row.selectedUnitObj.realPrice"
@@ -174,14 +174,20 @@
 							:precision="2"
 							@change="onRowValueChange(row, $rowIndex)"
 						/>
-					</template>
+					</template> -->
 				</vxe-column>
 				<vxe-column field="totalAmount" title="累计总金额" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #default="{ row }">
 						{{ row?.selectedUnitObj?.totalAmount }}
 					</template>
 					<template #edit="{ row, $rowIndex }">
-						<el-input-number v-if="row.selectedUnitObj" v-model="row.selectedUnitObj.totalAmount" :min="0" :precision="2" />
+						<el-input-number
+							v-if="row.selectedUnitObj"
+							v-model="row.selectedUnitObj.totalAmount"
+							:min="0"
+							:precision="2"
+							@change="onTotalAmountChange(row, $rowIndex)"
+						/>
 					</template>
 					<template #footer="{ row }">
 						<span style="color: #2e5cf6; font-weight: bold">{{ total.totalAmount }}元</span>
@@ -276,7 +282,7 @@ const total = computed(() => {
 	const purchasePrice = displayPrice(
 		vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.purchasePrice || 0), 0),
 	)
-	const realPrice = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.realPrice || 0), 0)
+	const realPrice = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.realPrice || 0), 0).toFixed(2)
 	const totalAmount = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.totalAmount || 0), 0).toFixed(2)
 	return { quantity, purchasePrice, realPrice, totalAmount }
 })
@@ -378,9 +384,15 @@ const onUnitChange = (row: any) => {
 	row.selectedUnitObj.totalAmount = Number((row.quantity * Number(row.selectedUnitObj.realPrice || 0)).toFixed(2))
 }
 
-// 数量、进价变动联动
-const onRowValueChange = (row: any, $rowIndex: number) => {
-	row.selectedUnitObj.totalAmount = Number((row.quantity * Number(row.selectedUnitObj.realPrice || 0)).toFixed(2))
+// 数量变动
+const onQuantityChange = (row: any, $rowIndex: number) => {
+	row.selectedUnitObj.totalAmount = Number(displayPrice(row.quantity * Number(row.selectedUnitObj.purchasePrice || 0), ""))
+	row.selectedUnitObj.realPrice = row.selectedUnitObj.totalAmount / row.quantity
+}
+
+// 累计总金额变动
+const onTotalAmountChange = (row: any, $rowIndex: number) => {
+	row.selectedUnitObj.realPrice = (row.selectedUnitObj.totalAmount / row.quantity).toFixed(2)
 }
 
 // 整理table数据
diff --git a/src/views/supermarketerp/stockTaking/index.vue b/src/views/supermarketerp/stockTaking/index.vue
index f66a503..dda9afd 100644
--- a/src/views/supermarketerp/stockTaking/index.vue
+++ b/src/views/supermarketerp/stockTaking/index.vue
@@ -15,9 +15,6 @@
 							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
-					<!-- <el-form-item label="经办人" prop="handlerUserId">
-						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
-					</el-form-item> -->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -51,8 +48,7 @@
 				<el-table-column type="index" label="#" width="50" />
 				<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="productName" label="入库商品" show-overflow-tooltip />
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">