修改零售出库

src/views/supermarketerp/components/select-dialog.vue

@@ -1,7 +1,7 @@
 <template>
-	<el-dialog v-model="dialogVisible" title="选择商品" width="90%" :close-on-click-modal="false" draggable @close="dialogVisible = false">
+	<el-dialog v-model="dialogVisible" title="选择商品" width="80%" :close-on-click-modal="false" draggable @close="dialogVisible = false">
 		<el-row>
-			<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataListAndSelect">
+			<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 				<el-form-item label="商品名称" prop="productName">
 					<el-input placeholder="请输入商品名称" v-model="queryForm.productName" />
 				</el-form-item>
@@ -12,7 +12,7 @@
 					<el-input placeholder="请输入条码" v-model="queryForm.barcode" />
 				</el-form-item>
 				<el-form-item>
-					<el-button icon="search" type="primary" @click="getDataListAndSelect">查询</el-button>
+					<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 				</el-form-item>
 			</el-form>
@@ -24,7 +24,7 @@
 			v-loading="loading"
 			:row-key="(row:any) => row.id"
 			:reserve-selection="true"
-			@selection-change="handleSelectionChange"
+			@selection-change=""
 		>
 			<el-table-column type="selection" width="50" reserve-selection fixed="left" align="center" />
 			<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
@@ -40,22 +40,13 @@
 				<template #default="scope">
 					<div v-if="scope.row.erpUnitVos && scope.row.erpUnitVos.length > 0">
 						<div class="flex flex-wrap gap-2">
-							<el-tag 
-								v-for="unit in scope.row.erpUnitVos" 
-								:key="unit.id"
-								:type="unit.isBase ? 'primary' : 'info'"
-								size="small"
-							>
+							<el-tag v-for="unit in scope.row.erpUnitVos" :key="unit.id" :type="unit.isBase ? 'primary' : 'info'" size="small">
 								{{ unit.unit }}
-								<span class="text-xs ml-1">
-									({{ formatPrice(unit.purchasePrice) }}元)
-								</span>
+								<span class="text-xs ml-1">({{ displayPrice(unit.purchasePrice, "") }}元)</span>
 							</el-tag>
 						</div>
 					</div>
-					<div v-else class="text-gray-400">
-						无包装单位
-					</div>
+					<div v-else class="text-gray-400">无包装单位</div>
 				</template>
 			</el-table-column>
 			<el-table-column prop="status" label="状态" min-width="100px" align="center" show-overflow-tooltip>
@@ -82,19 +73,11 @@
 <script setup lang="ts">
 import { ref } from "vue"
 import { getErpSpuPage } from "/@/api/supermarketerp/common"
-import { getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
+// import { getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 
 const emit = defineEmits(["getSelectedRows"])
-const props = withDefaults(
-	defineProps<{
-		selectedRows: any[]
-	}>(),
-	{
-		selectedRows: () => [],
-	},
-)
 
 const { status } = useDict("status")
 const queryRef = ref()
@@ -108,36 +91,17 @@ const queryForm = reactive<any>({
 })
 const total = ref<number>(0)
 const dataList = ref<any[]>([]) // 对话框多选表格数据
-const supermarketCategory = ref<any>([]) // 商品分类
-const supermarketBrand = ref<any>([]) // 商品品牌
-const selectedRowsWithUnit = ref<any[]>([]) // 记录选中行及其包装单位
-const currentSelectedRows = ref<any[]>([]) // 当前选中的商品行
-
-// 格式化价格显示
-const formatPrice = (price: number) => {
-	return displayPrice(price, "")
-}
-
-// 判断行是否被选中
-const isRowSelected = (row: any) => {
-	return currentSelectedRows.value.some((selectedRow: any) => selectedRow.id === row.id)
-}
-
-// 处理商品选择变化
-const handleSelectionChange = (selection: any[]) => {
-	currentSelectedRows.value = selection
-}
+// const supermarketCategory = ref<any>([]) // 商品分类
+// const supermarketBrand = ref<any>([]) // 商品品牌
 
 // 打开弹窗
 const openDialog = async () => {
 	dialogVisible.value = true
-	selectedRowsWithUnit.value = []
-	currentSelectedRows.value = []
-	getDataListAndSelect()
+	getDataList()
 }
 
 // 获取商品数据并且勾选
-const getDataListAndSelect = async () => {
+const getDataList = async () => {
 	loading.value = true
 	try {
 		const { code, data } = await getErpSpuPage(queryForm)
@@ -145,23 +109,10 @@ const getDataListAndSelect = async () => {
 			dataList.value = data.records.map((item: any) => {
 				return {
 					...item,
-					erpSpuId: item.id
+					erpSpuId: item.id,
 				}
 			})
 			total.value = data.total
-
-			// 恢复之前的选择状态
-			nextTick(() => {
-				const rowsToRestore = props.selectedRows.filter((row) => dataList.value.some((item) => item.erpSpuId === row.erpSpuId))
-				
-				// 恢复商品选择状态
-				rowsToRestore.forEach((row) => {
-					const targetRow = dataList.value.find((item) => item.erpSpuId === row.erpSpuId)
-					if (targetRow) {
-						tableRef.value?.toggleRowSelection(targetRow, true)
-					}
-				})
-			})
 		}
 	} catch (error) {
 		dataList.value = []
@@ -173,35 +124,26 @@ const getDataListAndSelect = async () => {
 // 分页变化
 const sizeChangeHandle = (val: number) => {
 	queryForm.size = val
-	getDataListAndSelect()
+	getDataList()
 }
 const currentChangeHandle = (val: number) => {
 	queryForm.current = val
-	getDataListAndSelect()
+	getDataList()
 }
 
 const resetQuery = () => {
 	queryRef.value?.resetFields()
-	getDataListAndSelect()
+	getDataList()
 }
 
 // 商品选择对话框确认
 const dialogConfirm = () => {
 	const $table = tableRef.value
 	if ($table) {
-		// 获取当前选中的商品
 		const currentSelectedRows = $table.getSelectionRows()
-		
-		// 合并当前选中的行和之前已选的行（排除当前页面的行）
-		const allSelectedRows = [
-			...currentSelectedRows,
-			...props.selectedRows.filter((row) => !dataList.value.some((item) => item.erpSpuId === row.erpSpuId)),
-		]
-		
+
 		dialogVisible.value = false
-		selectedRowsWithUnit.value = []
-		currentSelectedRows.value = []
-		emit("getSelectedRows", allSelectedRows)
+		emit("getSelectedRows", currentSelectedRows)
 	}
 }