Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/hooks/smProcessFormAction.ts

@@ -3,16 +3,16 @@ import { useMessage } from "./message"
 
 export function useSmProcessFormAction() {
 	// 校验 成功返回true 失败返回false
-	const formValidate = async (baseDataFormRef: any, editableTableRef: any, editableTableData: any) => {
-		const valid = await baseDataFormRef.value.validate().catch(() => {})
+	const formValidate = async (baseFormRef: any, vxeTableRef: any, vxeTableDataLength: number) => {
+		const valid = await baseFormRef.value.validate().catch(() => {})
 		if (!valid) return false
 
-		if (editableTableData.length <= 0) {
+		if (vxeTableDataLength <= 0) {
 			useMessage().warning("请选择商品")
 			return false
 		}
 
-		const $table = editableTableRef.value
+		const $table = vxeTableRef.value
 		if ($table) {
 			const errMap = await $table.validate(true)
 			if (errMap) {
@@ -25,13 +25,13 @@ export function useSmProcessFormAction() {
 	}
 
 	// 提交数据 成功返回 true 失败返回 false
-	const submitData = async (baseDataForm: any, cgPlanSpuItems: Ref<any[]>, loading: Ref<boolean>, putObj: any, addObj: any) => {
+	const submitData = async (baseDataForm: any, vxeTableItems: Ref<any[]>, loading: Ref<boolean>, putObj: any, addObj: any) => {
 		try {
 			loading.value = true
 
 			const _pa = {
 				...baseDataForm,
-				items: cgPlanSpuItems.value,
+				items: vxeTableItems,
 			}
 
 			console.log("提交的数据：", _pa)
@@ -40,10 +40,9 @@ export function useSmProcessFormAction() {
 			if (res.code == 0) {
 				useMessage().success(baseDataForm.id ? "修改成功" : "添加成功")
 				return true
-			} else {
-				useMessage().error(res.msg)
-				return false
 			}
+			useMessage().error(res.msg || baseDataForm.id ? "修改失败" : "添加失败")
+			return false
 		} catch (err: any) {
 			useMessage().error(err.msg)
 			loading.value = false
@@ -52,6 +51,7 @@ export function useSmProcessFormAction() {
 			loading.value = false
 		}
 	}
+
 	return {
 		formValidate,
 		submitData,

src/views/hard/canteen-product-total/index.vue

@@ -1,9 +1,16 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
-				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
-				:defaultTreeWidth="20" :nodeClickable="false">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:show-expand="true"
+				@getSelectNode="handleGetSelectNode"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
+				:defaultTreeWidth="20"
+				:nodeClickable="false"
+			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row>
@@ -11,30 +18,41 @@
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
 							</el-form-item>
 							<el-form-item style="width: 250px" label="食堂" prop="merchantId">
-								<select-mch v-model="state.queryForm.merchantId"
-									:apiParams="{ parentIsNull: false, types: '1' }" />
+								<select-mch v-model="state.queryForm.merchantId" :apiParams="{ parentIsNull: false, types: '1' }" />
 							</el-form-item>
 							<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
-								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
-									type="daterange" />
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
 							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="doSearch">{{ $t("common.queryBtn")
-								}}</el-button>
+								<el-button icon="Search" type="primary" @click="doSearch">{{ $t("common.queryBtn") }}</el-button>
 								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 							</el-form-item>
 						</el-row>
 					</el-form>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<right-toolbar :search="false" v-model:showSearch="showSearch"
-								:export="'wallet_walletTransaction_export'" @exportExcel="exportExcel" class="ml10 mr20"
-								style="float: right" @queryTable="getDataList"></right-toolbar>
+							<right-toolbar
+								:search="false"
+								v-model:showSearch="showSearch"
+								:export="'wallet_walletTransaction_export'"
+								@exportExcel="exportExcel"
+								class="ml10 mr20"
+								style="float: right"
+								@queryTable="getDataList"
+							></right-toolbar>
 						</div>
 					</el-row>
-					<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-						:header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries"
-						:show-summary="true" @selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
+					<el-table
+						:data="state.dataList"
+						v-loading="state.loading"
+						border
+						:cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle"
+						:summary-method="getSummaries"
+						:show-summary="true"
+						@selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle"
+					>
 						<el-table-column type="selection" width="80" align="center" />
 						<el-table-column type="index" label="#" width="50" />
 						<el-table-column label="用餐时间" align="center" prop="createTime">
@@ -47,7 +65,7 @@
 								<dict-tag :options="daily_menu" :value="row.hourType" />
 							</template>
 						</el-table-column>
-						<el-table-column label="购买次数" align="center" prop="payCount">
+						<el-table-column label="交易次数" align="center" prop="timeCount">
 							<template #default="{ row }">
 								<span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
 							</template>
@@ -65,15 +83,18 @@
 
 						<el-table-column fixed="right" label="操作" width="200">
 							<template #default="{ row }">
-								<el-button icon="Tickets" text type="primary"
-									@click="productTotalTableRef.openDialog(parseTime(row.createTime, '{y}-{m}-{d}'), row.hourType)">
+								<el-button
+									icon="Tickets"
+									text
+									type="primary"
+									@click="productTotalTableRef.openDialog(parseTime(row.createTime, '{y}-{m}-{d}'), row.hourType)"
+								>
 									菜品详情
 								</el-button>
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
-						v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>
@@ -117,7 +138,7 @@ const exportExcel = () => {
 
 const getSummaries = (param: any) => {
 	const { columns, data } = param
-	const totalColumns = ["payCount", "totalPrice"]
+	const totalColumns = ["timeCount", "payCount", "totalPrice"]
 	const totalRow = Array.from({ length: columns.length })
 	totalRow[0] = "合计"
 	columns.forEach((i: any, index: number) => {

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)
 	}
 }
 

src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue

@@ -172,7 +172,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
+			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
 			<link-code-dialog
 				ref="linkCodeDialogRef"
@@ -397,7 +397,7 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData()
 }
@@ -406,7 +406,7 @@ const onContinueAdd = async () => {
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")

src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue

@@ -177,7 +177,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
+			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
 			<link-code-dialog
 				ref="linkCodeDialogRef"
@@ -403,7 +403,7 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData()
 }
@@ -412,7 +412,7 @@ const onContinueAdd = async () => {
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -178,7 +178,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
+			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
 			<link-code-dialog
 				ref="linkCodeDialogRef"
@@ -430,7 +430,7 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData()
 }
@@ -439,7 +439,7 @@ const onContinueAdd = async () => {
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")

src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue

@@ -141,7 +141,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
+			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 		</div>
 	</div>
 </template>
@@ -317,7 +317,7 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData()
 }
@@ -326,7 +326,7 @@ const onContinueAdd = async () => {
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")

src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue

@@ -204,7 +204,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
+			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
 			<link-code-dialog
 				ref="linkCodeDialogRef"
@@ -446,7 +446,7 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData()
 }
@@ -455,7 +455,7 @@ const onContinueAdd = async () => {
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")

src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue

@@ -1,7 +1,7 @@
 <template>
 	<div v-loading="loading" class="w-full h-full">
 		<div v-if="baseDataForm.inventoryCode" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<div v-if="disabled" ref="baseDataInfoRef">
+			<div v-if="disabled" ref="baseInfoRef">
 				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279; display: flex; flex-wrap: wrap">
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">单据编号：</span>
@@ -25,7 +25,7 @@
 					</div>
 				</div>
 			</div>
-			<el-form v-else ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
+			<el-form v-else ref="baseFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
 				<div class="flex flex-wrap">
 					<el-form-item label="单据编号" prop="inventoryCode">
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" :disabled="disabled" />
@@ -47,22 +47,19 @@
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
-					<!--					<el-form-item label="会员卡号" prop="memberNumber">-->
-					<!--						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />-->
-					<!--					</el-form-item>-->
 				</div>
 			</el-form>
 
 			<el-row v-if="!disabled" class="my-3">
 				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
-				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
+				<el-button @click="removeRow">删除选中</el-button>
 				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
 			<div class="flex">
 				<div class="flex-auto">
 					<vxe-table
-						ref="editableTableRef"
+						ref="vxeTableRef"
 						border
 						:loading="loading"
 						show-overflow
@@ -82,10 +79,10 @@
 						:column-config="{ resizable: true }"
 						:row-config="{ isHover: true }"
 						:resizable-config="{ dragMode: 'fixed' }"
-						:data="state.editableTableData"
+						:data="vxeTableData"
 						:edit-rules="validRules"
-						@checkbox-all="selectChangeEvent"
-						@checkbox-change="selectChangeEvent"
+						@checkbox-all=""
+						@checkbox-change=""
 						size="mini"
 						align="center"
 					>
@@ -94,20 +91,13 @@
 						<vxe-column field="productName" title="库存商品">
 							<template #default="{ row }">
 								<span v-if="row.productName">{{ row.productName }}</span>
-								<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
+								<span v-else>{{ row.erpSpuId && erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
 							</template>
 						</vxe-column>
 						<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 							<template #edit="{ row }">
 								<el-select v-model="row.unitId" placeholder="请选择包装单位">
-									<el-option
-										v-if="row.erpUnitVos?.length > 0"
-										v-for="item in row.erpUnitVos"
-										:key="item.id"
-										:label="item.unit"
-										:value="item.id"
-									/>
-									<el-option v-else :key="row.id" :label="row.unit" :value="row.unitId" />
+									<el-option v-for="item in row.erpUnitVos" :key="item.id" :label="item.unit" :value="item.id" />
 								</el-select>
 							</template>
 							<template #default="{ row }">
@@ -131,9 +121,6 @@
 						</vxe-column>
 						<vxe-column field="totalAmount" title="累计总金额">
 							<template #default="{ row }">
-								<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
-									{{ displayPrice(row.quantity * parseFloat(row.retailPrice)) }}
-								</span>
 								<span v-if="row.unitId && row.quantity && row.erpUnitVos">
 									{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.retailPrice) * row.quantity) }}
 								</span>
@@ -147,20 +134,29 @@
 					</vxe-table>
 				</div>
 				<div class="w-64">
-					<el-card class="h-full flex items-center overflow-auto">
-						<el-form :model="receiveAmountForm" :rules="receiveAmountFormRules" label-width="100px">
-							<el-form-item label="单据金额：" prop="totalAmount">
-								<span class="w-full text-purple-600 border-b border-b-black text-xl h-8 text-center">{{ displayPrice(totalAmount) }}</span>
-							</el-form-item>
-							<el-form-item class="receive-amount-input" label="收款金额：" prop="receiveAmount">
-								<el-input v-model.trim="receiveAmountForm.receiveAmount" />
-							</el-form-item>
-							<el-form-item label="找零：" prop="backAmount">
-								<span class="w-full text-green-600 border-b border-b-black text-xl h-8 text-center">
-									{{ receiveAmountForm.receiveAmount && displayPrice(Number(totalAmount) - storePrice(receiveAmountForm.receiveAmount)) }}
-								</span>
-							</el-form-item>
-						</el-form>
+					<el-card class="h-full flex flex-col justify-around overflow-auto">
+						<div class="flex items-center text-nowrap">
+							<span class="w-40">单据金额：</span>
+							<span class="w-full text-purple-600 border-b border-b-black text-xl h-8 text-center">
+								{{ displayPrice(receiveTotalAmount) }}
+							</span>
+						</div>
+						<div class="flex items-center text-nowrap my-4">
+							<span class="w-40">收款金额：</span>
+							<el-input-number
+								class="receive-amount-input"
+								v-model.trim="baseDataForm.receiveAmount"
+								:min="0"
+								:precision="2"
+								:disabled="disabled"
+							/>
+						</div>
+						<div class="flex items-center text-nowrap">
+							<span class="w-40">找零：</span>
+							<span class="w-full text-green-600 border-b border-b-black text-xl h-8 text-center">
+								{{ baseDataForm.receiveAmount && displayPrice(Number(receiveTotalAmount) - storePrice(baseDataForm.receiveAmount)) }}
+							</span>
+						</div>
 					</el-card>
 				</div>
 			</div>
@@ -175,13 +171,10 @@
 				<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-button type="success" plain @click="printEvent">打印</el-button>
-				</el-tooltip>
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
+			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 		</div>
 	</div>
 </template>
@@ -190,10 +183,9 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
-import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
+import { VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
-import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
 
 const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/select-dialog.vue"))
@@ -210,119 +202,72 @@ const props = withDefaults(
 )
 const emit = defineEmits(["close"])
 
-const loading = ref(false) // 采购计划加载
+const loading = ref(false)
 const disabled = ref(false)
 const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
-const baseDataFormRef = ref() // 基本数据表单ref
-const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
-const baseDataInfoRef = ref() // 基本信息ref
-// 基本信息表单数据
+const baseFormRef = ref() // 基本表单ref
+const vxeTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
+const baseInfoRef = ref() // 基本信息ref
 const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
 	handlerUserId: "",
-	checkStatus: "",
-	checkUserId: "",
-	checkTime: "",
 	supplierId: "",
 	remark: "",
 	orderType: "2",
-	totalAmount: "",
-	memberNumber: "",
 	inventoryType: "5",
-})
-const state = reactive<{
-	editableTableData: any[]
-	erpSpuItemsMemo: any[]
-	selectedRowsErpSpuIds: string[]
-	erpSpuSimpleAll: any
-}>({
-	editableTableData: [], // 可编辑表格数据
-	erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存
-	selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId
-	erpSpuSimpleAll: [], // 简要商品列表
-})
-
-// 合计金额表单数据
-const receiveAmountForm = reactive<{ receiveAmount: number }>({
 	receiveAmount: 0,
 })
+const vxeTableData = ref<any>([])
+const vxeTableDataMemo = ref([])
+const erpSpuSimpleAll = ref<any>([])
 
-// 基本信息表单校验规则
 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" }],
 	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" }],
 })
 
-// 收款金额表单校验规则
-const receiveAmountFormRules = ref({
-	receiveAmount: [
-		{ required: true, message: "不能为空", trigger: "blur" },
-		{ pattern: /^\d+(\.\d{1,2})?$/, message: "格式错误" },
-	],
+onMounted(() => {
+	getInitData()
 })
 
 // 初始化数据
 const getInitData = async () => {
-	baseDataForm.id = undefined
+	baseDataForm.id = ""
 	const id = props.formId
 	disabled.value = props.disabled
 	if (id) {
 		loading.value = true
 		// 获取清单数据
-		const [cgPlanData] = await Promise.allSettled([getObj(id)])
-			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
-			.finally(() => (loading.value = false))
+		const [cgPlanData] = await Promise.allSettled([getObj(id)]).then((results) =>
+			results.map((result) => (result.status === "fulfilled" ? result.value : null)),
+		)
 
-		if (cgPlanData && cgPlanData.code === 0) {
+		if (cgPlanData?.code === 0) {
 			Object.assign(baseDataForm, cgPlanData.data)
-			state.editableTableData = cgPlanData.data.items
-			state.erpSpuItemsMemo = cgPlanData.data.items
+			vxeTableData.value = cgPlanData.data.items
+			vxeTableDataMemo.value = cgPlanData.data.items
 		}
 	} else {
 		loading.value = true
 		// 获取采购入库编号
-		const [planCode] = await Promise.allSettled([getPlanCode({ type: 5 })])
-			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
-			.finally(() => (loading.value = false))
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 5 })]).then((results) =>
+			results.map((result) => (result.status === "fulfilled" ? result.value : null)),
+		)
 		planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 	}
 
-	loading.value = true
 	// 获取简要商品列表
-	const [erpSpuSimpleAll] = await Promise.allSettled([getErpSpuSimpleAll()])
+	const [erpSpuSimpleAllData] = await Promise.allSettled([getErpSpuSimpleAll()])
 		.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 		.finally(() => (loading.value = false))
-	erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data)
-}
-
-// 删除选中的行
-const removeSelectRowEvent = () => {
-	const $table = editableTableRef.value
-	if ($table) {
-		const selectRecords = $table.getCheckboxRecords()
-		if (selectRecords.length > 0) {
-			state.editableTableData = state.editableTableData.filter((item) => !selectRecords.some((row) => row.erpSpuId === item.erpSpuId))
-		}
-	}
-}
-
-// 可编辑表格行勾选
-const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
-	const $table = editableTableRef.value
-	if ($table) {
-		const records = $table.getCheckboxRecords()
-		console.log(checked ? "勾选事件" : "取消事件", records)
-		state.selectedRowsErpSpuIds = records.map((item) => item.erpSpuId)
-	}
+	erpSpuSimpleAllData && erpSpuSimpleAllData.code === 0 && (erpSpuSimpleAll.value = erpSpuSimpleAllData.data)
 }
 
 // 点击商品选择
@@ -334,113 +279,93 @@ const getSelectedRows = (selectionRows: any) => {
 
 	// 筛选新勾选的项
 	const addedItems = selectionRows
-		.filter((item: any) => !state.editableTableData.some((editableTableItem: any) => editableTableItem.erpSpuId === item.erpSpuId))
+		.filter((item: any) => !vxeTableData.value.some((vxeTableItem: any) => vxeTableItem.erpSpuId === item.erpSpuId))
 		.map((addItem: any) => {
-			const index = state.erpSpuItemsMemo.findIndex((item: any) => item.erpSpuId === addItem.erpSpuId)
-			if (index !== -1) return state.erpSpuItemsMemo[index]
-			return { ...addItem, isNew: true }
+			// const index = vxeTableDataMemo.value.findIndex((item: any) => item.erpSpuId === addItem.erpSpuId)
+			// if (index !== -1) return vxeTableDataMemo.value[index]
+			return { ...addItem, unitId: addItem.erpUnitVos[0].id, quantity: 1, isNew: true }
 		})
 	// 仅添加新勾选的项
-	state.editableTableData = [...state.editableTableData, ...addedItems]
+	vxeTableData.value = [...vxeTableData.value, ...addedItems]
 
 	// 筛选取消勾选的项
-	const removedItems = state.editableTableData.filter(
+	const removedItems = vxeTableData.value.filter(
 		(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
 	)
 	// 仅移除取消勾选的项
-	state.editableTableData = state.editableTableData.filter(
+	vxeTableData.value = vxeTableData.value.filter(
 		(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
 	)
-	// state.editableTableData.push(item)
-	// nextTick(() => {
-	// 	const $table = editableTableRef.value
-	// 	if ($table) {
-	// 		$table.setRow(item)
-	// 	}
-	// })
-	console.log("state.editableTableData", state.editableTableData)
+	console.log("vxeTableData.value", vxeTableData.value)
 }
 
-// 整理数据
-const cgPlanSpuItems = 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?.retailPrice ? Number(unit?.retailPrice) : 0,
-				totalAmount: unit?.retailPrice && item.quantity ? Number(unit.retailPrice) * item.quantity : 0,
-				remark: item.remark,
-				unitId: item.unitId,
-				orderType: baseDataForm.orderType,
-			}
-		} else {
-			return {
-				id: item.isNew ? undefined : item.id,
-				erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
-				unitPrice: item.retailPrice ? Number(item.retailPrice) : 0,
-				totalAmount: item?.retailPrice && item.quantity ? Number(item.retailPrice) * item.quantity : 0,
-				remark: item.remark,
-				unitId: item.unitId,
-				orderType: baseDataForm.orderType,
-			}
+// 删除选中的行
+const removeRow = () => {
+	const $table = vxeTableRef.value
+	if ($table) {
+		const selectRecords = $table.getCheckboxRecords()
+		if (selectRecords.length > 0) {
+			vxeTableData.value = vxeTableData.value.filter((item: any) => !selectRecords.some((row) => row.erpSpuId === item.erpSpuId))
+		}
+	}
+}
+
+// 计算单据金额
+const receiveTotalAmount = computed(() => settledTableItems.value.reduce((pre: any, cur: any) => pre + cur.totalAmount, 0))
+
+// 整理table数据
+const settledTableItems = computed(() => {
+	return vxeTableData.value.map((item: any) => {
+		const unit = item.erpUnitVos.find((unitItem: any) => unitItem.id === item.unitId)
+		return {
+			id: item.isNew ? "" : item.id,
+			erpSpuId: item.erpSpuId,
+			quantity: item.quantity,
+			unitPrice: unit?.retailPrice ? Number(unit?.retailPrice) : 0,
+			totalAmount: unit?.retailPrice && item.quantity ? Number(unit.retailPrice) * item.quantity : 0,
+			remark: item.remark,
+			unitId: item.unitId,
+			orderType: baseDataForm.orderType,
 		}
 	})
 })
 
-// 计算单据金额
-const totalAmount = computed(() => cgPlanSpuItems.value.reduce((pre, cur) => pre + cur.totalAmount, 0))
-
 const { formValidate, submitData } = useSmProcessFormAction()
 
 // 点击继续添加
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
-	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+	console.log("vxeTableData", vxeTableData.value)
+	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
+		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
 		clearData()
 }
 
 // 点击保存
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
-	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+	console.log("vxeTableData", vxeTableData.value)
+	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
+		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")
 }
 
-// 清空填写的数据 返回 true
+// 清空填写的数据
 const clearData = () => {
 	for (const key in baseDataForm) {
 		if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue
 		baseDataForm[key] = ""
 	}
-	state.editableTableData = []
-	state.erpSpuItemsMemo = []
-	state.selectedRowsErpSpuIds = []
+	vxeTableData.value = []
+	vxeTableDataMemo.value = []
 	return true
 }
-
-// 点击打印
-const printEvent = () => {
-	tablePrint(editableTableRef.value, baseDataInfoRef.value, state.editableTableData, 23, "零售出库")
-}
-
-onMounted(() => {
-	getInitData()
-})
 </script>
 
 <style scoped>
 ::v-deep .receive-amount-input .el-input__inner {
 	color: red !important;
-	font-weight: bold !important;
 	font-size: large;
 	text-align: center;
 }

src/views/supermarketerp/stockTaking/form.vue

@@ -189,7 +189,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<select-dialog ref="erpSpuSelectDialogRef" :selectedRows="state.editableTableData" @getSelectedRows="getSelectedRows" />
+			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
 			<barCodeEnter ref="barCodeEnterRef" />
 		</div>
@@ -455,7 +455,7 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, pdPlanItems, loading, putObj, addObj)) &&
 		clearData()
 }
@@ -464,7 +464,7 @@ const onContinueAdd = async () => {
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData)) &&
+	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
 		(await submitData(baseDataForm, pdPlanItems, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")