From eaecfe4730d1c785e8579bf56a59248a9e6784cf Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 11 Aug 2025 10:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supermarketerp/stockTaking.ts         |  4 +--
 src/views/supermarketerp/stockTaking/form.vue | 35 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/api/supermarketerp/stockTaking.ts b/src/api/supermarketerp/stockTaking.ts
index b208261..d1830f4 100644
--- a/src/api/supermarketerp/stockTaking.ts
+++ b/src/api/supermarketerp/stockTaking.ts
@@ -12,8 +12,8 @@ export function addObj(data?: object) {
 // 库存盘点修改
 export function putObj(data?: object) {
 	return request({
-		url: "/supermarket/smErpInventoryRecords/savePD",
-		method: "post",
+		url: "/supermarket/smErpInventoryRecords/updatePD",
+		method: "put",
 		data,
 	})
 }
diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue
index 80d7197..6233f15 100644
--- a/src/views/supermarketerp/stockTaking/form.vue
+++ b/src/views/supermarketerp/stockTaking/form.vue
@@ -95,7 +95,9 @@
 				<vxe-column field="unitId" title="包装单位" min-width="60" width="auto">
 					<template #default="{ row }">
 						<div v-for="(item, index) in row.erpUnitVos" :key="index">
-							单位：{{ item.unit }} &nbsp; 装数：{{ item.packageNum }} &nbsp; 进价：{{ displayPrice(item.purchasePrice, "元") }}
+							单位：{{ item.unit }} &nbsp; 装数：{{ item.packageNum }} &nbsp; 进价：{{ displayPrice(item.purchasePrice, "元") }} &nbsp;
+							规格：{{ item.spec }}
+							<hr />
 						</div>
 					</template>
 				</vxe-column>
@@ -144,17 +146,17 @@
 						{{ computeLoss(row) }}
 					</template>
 				</vxe-column>
-				<vxe-column field="pdTotalNum" title="盘后总数">
+				<vxe-column field="totalNumber" title="盘后总数">
 					<template #default="{ row }">
 						{{ row.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0 }}
 					</template>
 				</vxe-column>
 				<vxe-column field="pdPrice" title="盘点单价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
-						<el-input v-model="row.pdPrice" />
+						<el-input-number v-model="row.pdPrice" :min="0" :precision="2" />
 					</template>
 				</vxe-column>
-				<vxe-column field="pdTotalAmount" title="盘后总金额">
+				<vxe-column field="totalAmount" title="盘后总金额">
 					<template #default="{ row }">
 						{{
 							(
@@ -407,20 +409,26 @@ const settledTableItems = computed(() => {
 	return vxeTableData.value.map((item: any) => {
 		return {
 			...item,
+			erpSpuId: item.erpSpuId,
+			profit: item._cachedProfit,
+			loss: item._cachedLoss,
+			// 盘盈就是1，盘亏就是2
+			orderType: item._cachedProfit === item._cachedLoss ? "0" : item._cachedProfit > item._cachedLoss ? "1" : "2",
+			accountNumber: item.stock,
+			realNumber: item.erpUnitVos.reduce((prev: number, curr: any) => prev + Number(curr.realNumber), 0),
 			unitPrice: Number(
 				displayPrice(
 					item.erpUnitVos.reduce((pre: any, cur: any) => pre + cur.purchasePrice * Number(cur.accountNumber), 0),
 					"",
 				),
 			),
-			realPrice: Number(
-				displayPrice(
-					item.erpUnitVos.reduce((pre: any, cur: any) => pre + cur.purchasePrice * Number(cur.realNumber), 0),
-					"",
-				),
-			),
-			profit: item._cachedProfit,
-			loss: item._cachedLoss,
+			realPrice: item.pdPrice,
+			// realPrice: Number(
+			// 	displayPrice(
+			// 		item.erpUnitVos.reduce((pre: any, cur: any) => pre + cur.purchasePrice * Number(cur.realNumber), 0),
+			// 		"",
+			// 	),
+			// ),
 			totalNumber: item.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0,
 			totalAmount: Number(
 				(
@@ -428,8 +436,6 @@ const settledTableItems = computed(() => {
 					(item.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0)
 				).toFixed(2) || 0,
 			),
-			// 盘盈就是1，盘亏就是2
-			orderType: item._cachedProfit === item._cachedLoss ? "0" : item._cachedProfit > item._cachedLoss ? "1" : "2",
 		}
 	})
 })
@@ -449,6 +455,7 @@ const onContinueAdd = async () => {
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("vxeTableData", vxeTableData.value)
+	console.log("settledTableItems", settledTableItems.value)
 	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
 		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
 		clearData() &&