From e89adb223114bb144a7b1b029a6ec95e628d30dc Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 17 Mar 2025 16:10:09 +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         |  27 ++++
 src/views/supermarketerp/stockTaking/form.vue | 152 +++++++++++-------
 .../supermarketerp/stockTaking/index.vue      |  29 ++--
 3 files changed, 136 insertions(+), 72 deletions(-)
 create mode 100644 src/api/supermarketerp/stockTaking.ts

diff --git a/src/api/supermarketerp/stockTaking.ts b/src/api/supermarketerp/stockTaking.ts
new file mode 100644
index 0000000..8778f22
--- /dev/null
+++ b/src/api/supermarketerp/stockTaking.ts
@@ -0,0 +1,27 @@
+import request from "/@/utils/request"
+
+// 获取库存盘点列表
+export function getStockTakingPage(params?: object) {
+	return request({
+		url: "/supermarket/smErpInventoryRecords/savePD",
+		method: "get",
+		params,
+	})
+}
+
+// 库存盘点新增
+export function stockTakingAdd(data?: object) {
+	return request({
+		url: "/supermarket/smErpInventoryRecords/savePD",
+		method: "post",
+		data,
+	})
+}
+
+// 查看库存盘点详情
+export function getStockTakingDeatil(params: { id: string }) {
+	return request({
+		url: `/supermarket/smErpInventoryRecords/getPD/${params.id}`,
+		method: "get",
+	})
+}
diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue
index 45fdbf2..09f0499 100644
--- a/src/views/supermarketerp/stockTaking/form.vue
+++ b/src/views/supermarketerp/stockTaking/form.vue
@@ -73,6 +73,7 @@
 				"
 				@checkbox-all="selectChangeEvent"
 				@checkbox-change="selectChangeEvent"
+				@edit-change="handleEditChange"
 				size="mini"
 				align="center"
 			>
@@ -92,7 +93,7 @@
 				</vxe-column>
 				<vxe-column field="accountNumber" title="账面数量">
 					<template #default="{ row }">
-						<div v-for="(item, index) in formatterAccountNumber(row)" :key="index">
+						<div v-for="(item, index) in computeAccountNumber(row)" :key="index">
 							{{ item.accountNumber + " " + item.unit }}
 						</div>
 					</template>
@@ -117,16 +118,12 @@
 				</vxe-column>
 				<vxe-column field="profit" title="盈">
 					<template #default="{ row }">
-						<span v-for="(item, index) in computedProfit(row)" :key="index">
-							{{ item }}
-						</span>
+						{{ computeProfit(row) }}
 					</template>
 				</vxe-column>
 				<vxe-column field="loss" title="亏">
 					<template #default="{ row }">
-						<span v-for="(item, index) in computedLoss(row)" :key="index">
-							{{ item }}
-						</span>
+						{{ computeLoss(row) }}
 					</template>
 				</vxe-column>
 				<vxe-column field="unitPrice" title="账面进价">
@@ -144,7 +141,7 @@
 						<el-input v-model="row.pdPrice" />
 					</template>
 				</vxe-column>
-				<vxe-column field="pdTotalNum" title="盘后总数" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<vxe-column field="pdTotalNum" title="盘后总数">
 					<template #default="{ row }">
 						{{ row.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0 }}
 					</template>
@@ -152,7 +149,10 @@
 				<vxe-column field="pdTotalAmount" title="盘后总金额">
 					<template #default="{ row }">
 						{{
-							parseFloat(row.pdPrice) * row.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0
+							(
+								parseFloat(row.pdPrice || 0) *
+								(row.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0)
+							).toFixed(2) || 0
 						}}
 					</template>
 				</vxe-column>
@@ -189,11 +189,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted } from "vue"
+import { ref, reactive, computed, onMounted, watch } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
-import { getPlanCode, getErpSpuSimpleAll, getCgddPage } from "/@/api/supermarketerp/common"
+import { addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
+import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getStockTakingDeatil } from "/@/api/supermarketerp/stockTaking"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
@@ -240,16 +241,14 @@ const state = reactive<{
 
 // 基本信息表单校验规则
 const dataRules = ref({
-	inventoryCode: [{ required: true, message: "出入库记录表编号不能为空", trigger: "blur" }],
-	inventoryDate: [{ required: true, message: "出入库记录表单据日期不能为空", trigger: "blur" }],
+	inventoryCode: [{ required: true, message: "单据编号不能为空", trigger: "blur" }],
+	inventoryDate: [{ required: true, message: "单据日期不能为空", trigger: "blur" }],
 	handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
-	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })
 
 // 可编辑表格校验规则
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
-	unitId: [{ required: true, message: "必须选择" }],
-	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
+	pdPrice: [{ required: true, message: "请输入" }],
 })
 
 // 初始化数据
@@ -259,7 +258,7 @@ const getInitData = async () => {
 	if (id) {
 		loading.value = true
 		// 获取采购计划数据 & 获取简要商品列表
-		const [cgPlanData] = await Promise.allSettled([getObj(id)])
+		const [cgPlanData] = await Promise.allSettled([getStockTakingDeatil({ id })])
 			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 			.finally(() => (loading.value = false))
 
@@ -279,9 +278,9 @@ const getInitData = async () => {
 }
 
 // 计算账面数量
-const formatterAccountNumber = (row: any) => {
+const computeAccountNumber = (row: any) => {
 	if (!row._cachedAccountNumber) {
-		console.log("xxxxx")
+		console.log("计算了账面数量")
 
 		let stock = row.stock
 		row._cachedAccountNumber = row.erpUnitVos
@@ -304,23 +303,23 @@ const formatterAccountNumber = (row: any) => {
 	return row._cachedAccountNumber
 }
 // 计算盈
-const computedProfit = (row: any) => {
-	if (!row._cachedProfit) {
-		console.log("cccc")
+const computeProfit = (row: any) => {
+	if (row._cachedProfit !== 0 && !row._cachedProfit) {
+		console.log("计算了盈")
 
 		const diff =
 			row.erpUnitVos.reduce((pre: any, cur: any) => {
 				return pre + (Number(cur.realNumber) || 0) * cur.packageNum
 			}, 0) - (Number(row.stock) || 0)
 
-		row._cachedProfit = [diff > 0 ? diff : 0]
+		row._cachedProfit = diff > 0 ? diff : 0
 	}
 	return row._cachedProfit
 }
 // 计算亏
-const computedLoss = (row: any) => {
-	if (!row._cachedLoss) {
-		console.log("cccc")
+const computeLoss = (row: any) => {
+	if (row._cachedLoss !== 0 && !row._cachedLoss) {
+		console.log("计算了亏")
 
 		const diff =
 			(Number(row.stock) || 0) -
@@ -328,12 +327,12 @@ const computedLoss = (row: any) => {
 				return pre + (Number(cur.realNumber) || 0) * cur.packageNum
 			}, 0)
 
-		row._cachedLoss = [diff > 0 ? diff : 0]
+		row._cachedLoss = diff > 0 ? diff : 0
 	}
 	return row._cachedLoss
 }
 
-// 在编辑实际数量时需要清除缓存使其重新计算
+// 当编辑实际数量时清除缓存使其重新计算
 const handleRealNumberChange = (row: any) => {
 	row._cachedProfit = null
 	row._cachedLoss = null
@@ -423,7 +422,7 @@ const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
 // 点击商品选择
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
-// 条码录入
+// 点击条码录入
 const handleClickBarCodeEnter = () => barCodeEnterRef.value.openDialog()
 
 // 获取被选择的商品行
@@ -461,29 +460,33 @@ const getSelectedSpuRows = (selectionRows: any) => {
 }
 
 // 整理数据
-const cgPlanSpuItems = computed(() => {
+const pdPlanItems = computed(() => {
 	return state.editableTableData.map((item: any) => {
-		if (item.erpUnitVos) {
-			const unit = item.erpUnitVos.find((unitItem: any) => unitItem.id === item.unitId)
-			return {
-				id: item.isNew ? undefined : item.id,
-				erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
-				unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
-				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
-				remark: item.remark,
-				unitId: item.unitId,
-			}
-		} else {
-			return {
-				id: item.isNew ? undefined : item.id,
-				erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
-				unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0,
-				totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
-				remark: item.remark,
-				unitId: item.unitId,
-			}
+		return {
+			...item,
+			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,
+			totalNumber: item.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0,
+			totalAmount: Number(
+				(
+					parseFloat(item.pdPrice || 0) *
+					(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",
 		}
 	})
 })
@@ -546,14 +549,12 @@ const submitData = async () => {
 
 		const _pa = {
 			...baseDataForm,
-			items: cgPlanSpuItems.value,
+			items: pdPlanItems.value,
 		}
 
 		console.log("提交的数据：", _pa)
 
-		const res = baseDataForm.id
-			? await putObj(_pa).finally(() => (loading.value = false))
-			: await addObj(_pa).finally(() => (loading.value = false))
+		const res = baseDataForm.id ? await putObj(_pa) : await addObj(_pa)
 		if (res.code === 0) {
 			useMessage().success(baseDataForm.id ? "修改成功" : "添加成功")
 			return true
@@ -571,7 +572,7 @@ const submitData = async () => {
 // 清空填写的数据 返回 true
 const clearData = () => {
 	for (const key in baseDataForm) {
-		if (key === "id" || key === "inventoryCode" || key === "inventoryDate") continue
+		if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue
 		baseDataForm[key] = ""
 	}
 	state.insertedRowNumber = 0
@@ -581,6 +582,43 @@ const clearData = () => {
 	return true
 }
 
+// 计算行数据
+// const computeRowData = (row: any) => {
+// 	// 计算盘点总数
+// 	const pdTotalNum = row.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0)
+
+// 	// 计算盈亏
+// 	const diff = pdTotalNum - (Number(row.stock) || 0)
+// 	const profit = diff > 0 ? diff : 0
+// 	const loss = diff < 0 ? Math.abs(diff) : 0
+
+// 	// 计算总金额
+// 	const pdTotalAmount = parseFloat(row.pdPrice) * pdTotalNum
+
+// 	return {
+// 		pdTotalNum,
+// 		profit,
+// 		loss,
+// 		pdTotalAmount,
+// 	}
+// }
+
+// 可编辑表格变化
+const handleEditChange = ({ row, column }: any) => {
+	// 	if (column.field === "realNumber") {
+	// 		// 更新盈亏数据
+	// 		row._cachedProfit = null
+	// 		row._cachedLoss = null
+	// 		// 更新盘点总数和总金额
+	// 		row.pdTotalNum = row.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0)
+	// 		row.pdTotalAmount = parseFloat(row.pdPrice) * row.pdTotalNum
+	// 	}
+	// 	if (column.field === "pdPrice") {
+	// 		// 更新盘点总金额
+	// 		row.pdTotalAmount = parseFloat(row.pdPrice) * row.pdTotalNum
+	// 	}
+}
+
 onMounted(() => {
 	getInitData()
 })
diff --git a/src/views/supermarketerp/stockTaking/index.vue b/src/views/supermarketerp/stockTaking/index.vue
index 918130e..a4c55ba 100644
--- a/src/views/supermarketerp/stockTaking/index.vue
+++ b/src/views/supermarketerp/stockTaking/index.vue
@@ -81,9 +81,9 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { getStockTakingPage } from "/@/api/supermarketerp/stockTaking"
 
 const router = useRouter()
 const { erp_order_type, inventory_type, check_status } = useDict("erp_order_type", "inventory_type", "check_status")
@@ -98,7 +98,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
 		inventoryType: "3",
 	},
-	pageList: fetchList,
+	pageList: getStockTakingPage,
 })
 
 //  table hook
@@ -129,18 +129,17 @@ const handleClickEditStockTaking = (id: string) => router.push({ path: "/superma
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-	try {
-		await useMessageBox().confirm("此操作将永久删除")
-	} catch {
-		return
-	}
-
-	try {
-		await delObjs(ids)
-		getDataList()
-		useMessage().success("删除成功")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	}
+	// try {
+	// 	await useMessageBox().confirm("此操作将永久删除")
+	// } catch {
+	// 	return
+	// }
+	// try {
+	// 	await delObjs(ids)
+	// 	getDataList()
+	// 	useMessage().success("删除成功")
+	// } catch (err: any) {
+	// 	useMessage().error(err.msg)
+	// }
 }
 </script>