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

src/hooks/smProcessFormAction.ts

@@ -25,7 +25,7 @@ export function useSmProcessFormAction() {
 	}
 
 	// 提交数据 成功返回 true 失败返回 false
-	const submitData = async (baseDataForm: any, vxeTableItems: Ref<any[]>, loading: Ref<boolean>, putObj: any, addObj: any) => {
+	const submitData = async (baseDataForm: any, vxeTableItems: any, loading: Ref<boolean>, putObj: any, addObj: any) => {
 		try {
 			loading.value = true
 

src/views/supermarketerp/purchaseManagement/smErpCgInventory/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>
@@ -34,7 +34,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" />
@@ -42,7 +42,7 @@
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" :disabled="disabled" />
 					</el-form-item>
-					<el-form-item label="关联采购订单" prop="linkCode">
+					<!-- <el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
 							:suffix-icon="Search"
@@ -52,7 +52,7 @@
 							style="width: 200px"
 							:disabled="disabled"
 						/>
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser
 							v-model.trim="baseDataForm.handlerUserId"
@@ -72,12 +72,12 @@
 
 			<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>
 
 			<vxe-table
-				ref="editableTableRef"
+				ref="vxeTableRef"
 				border
 				:loading="loading"
 				show-overflow
@@ -97,10 +97,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"
 			>
@@ -109,49 +109,44 @@
 				<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="unitObj" title="包装单位" :edit-render="{}">
+				<vxe-column field="selectedUnitObj" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
-						<el-select v-if="row.erpUnitVos" v-model="row.unitObj" value-key="id" placeholder="请选择包装单位">
+						<el-select v-model="row.selectedUnitObj" value-key="id" placeholder="请选择包装单位">
 							<el-option v-for="item in row.erpUnitVos" :key="item.id" :label="item.unit" :value="item" />
 						</el-select>
-						<el-select v-else v-model="row.unitId" value-key="id" placeholder="请选择包装单位">
+						<!-- <el-select v-else v-model="row.unitId" value-key="id" placeholder="请选择包装单位">
 							<el-option :key="row.id" :label="row.unit" :value="row.unitId" />
-						</el-select>
+						</el-select> -->
 					</template>
 					<template #default="{ row }">
-						<span v-if="row.erpUnitVos">{{ row.unitObj?.unit ?? "请选择" }}</span>
-						<span v-else>{{ row.unit }}</span>
+						<span>{{ row.selectedUnitObj?.unit ?? "请选择" }}</span>
 					</template>
 				</vxe-column>
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
-						<el-input v-model="row.quantity" />
+						<el-input v-model.number="row.quantity" />
 					</template>
 				</vxe-column>
 				<vxe-column field="unitPrice" title="原进价">
 					<template #default="{ row }">
-						{{ row.erpUnitVos ? displayPrice(row.unitObj?.purchasePrice || 0) : displayPrice(row.purchasePrice) }}
+						{{ displayPrice(row.selectedUnitObj?.purchasePrice || 0) }}
 					</template>
 				</vxe-column>
 				<vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #default="{ row }">
-						{{ row.erpUnitVos && row.unitObj ? row.unitObj?.realPrice || 0 : row.realPrice }}
+						{{ row?.selectedUnitObj?.realPrice || 0 }}
 					</template>
 					<template #edit="{ row }">
-						<el-input v-if="row.erpUnitVos && row.unitObj" v-model="row.unitObj.realPrice" />
-						<el-input v-else v-model="row.realPrice" />
+						<el-input-number v-if="row.selectedUnitObj" v-model="row.selectedUnitObj.realPrice" :min="0" :precision="2" />
 					</template>
 				</vxe-column>
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
-						<span v-if="row.erpUnitVos && row.unitObj && row.quantity">
-							{{ Number(row.quantity * parseFloat(row.unitObj.realPrice || 0)).toFixed(2) }}
-						</span>
-						<span v-else>
-							{{ Number(Number(row.quantity) * row.realPrice).toFixed(2) }}
+						<span v-if="row.selectedUnitObj && row.quantity">
+							{{ Number(row.quantity * parseFloat(row.selectedUnitObj.realPrice || 0)).toFixed(2) }}
 						</span>
 					</template>
 				</vxe-column>
@@ -172,20 +167,20 @@
 				<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-tooltip v-if="disabled" effect="dark" content="打印清单" placement="top">
 					<el-button type="success" plain @click="printEvent">打印</el-button>
-				</el-tooltip>
+				</el-tooltip> -->
 			</el-row>
 
 			<!-- 商品选择对话框 -->
 			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
-			<link-code-dialog
+			<!-- <link-code-dialog
 				ref="linkCodeDialogRef"
 				title="关联采购订单"
 				:getTableData="getCgddPage"
 				@getSelectedLinkCode="getSelectedLinkCode"
-			/>
+			/> -->
 		</div>
 	</div>
 </template>
@@ -194,10 +189,9 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { getPlanCode, getErpSpuSimpleAll, getCgddPage } 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 { Search } from "@element-plus/icons-vue"
-import LinkCodeDialog from "/@/views/supermarketerp/components/link-code-dialog.vue"
+// import LinkCodeDialog from "/@/views/supermarketerp/components/link-code-dialog.vue"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
@@ -206,220 +200,167 @@ const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/
 
 const props = withDefaults(
 	defineProps<{
-		formId: string | undefined
+		formId: string
 		disabled: boolean
 	}>(),
 	{
-		formId: undefined,
-		disabled: true,
+		formId: "",
+		disabled: false,
 	},
 )
 const emit = defineEmits(["close"])
 
-const loading = ref(false) // 采购计划加载
+const loading = ref(false)
 const disabled = ref(false)
-const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
-const linkCodeDialogRef = ref() // 关联采购申请单对话框ref
-const baseDataFormRef = ref() // 基本数据表单ref
-const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
-const baseDataInfoRef = ref() // 基本信息ref
-// 基本信息表单数据
+const erpSpuSelectDialogRef = ref()
+// const linkCodeDialogRef = ref()
+const baseFormRef = ref()
+const vxeTableRef = ref<VxeTableInstance<any>>()
+const baseInfoRef = ref()
 const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
 	handlerUserId: "",
-	checkStatus: "",
-	checkUserId: "",
-	checkTime: "",
 	supplierId: "",
 	remark: "",
 	inventoryType: "3",
 	orderType: "1",
-	totalAmount: "",
-})
-const state = reactive<{
-	editableTableData: any[]
-	erpSpuItemsMemo: any[]
-	selectedRowsErpSpuIds: string[]
-	erpSpuSimpleAll: any
-}>({
-	editableTableData: [], // 可编辑表格数据
-	erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存
-	selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId
-	erpSpuSimpleAll: [], // 简要商品列表
 })
+const vxeTableData = ref<any>([])
+const erpSpuSimpleAll = ref<any>([])
 
 // 基本信息表单校验规则
 const dataRules = ref({
-	inventoryCode: [{ required: true, message: "出入库记录表编号不能为空", trigger: "blur" }],
-	inventoryDate: [{ required: true, message: "出入库记录表单据日期不能为空", trigger: "blur" }],
-	handlerUserId: [{ 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>>({
-	unitObj: [{ required: true, message: "必须选择" }],
+	selectedUnitObj: [{ required: true, message: "必须选择" }],
 	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
 })
 
+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.map((item: any) => {
-				const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
+			vxeTableData.value = cgPlanData.data.items.map((item: any) => {
+				const selectedUnitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
 				return {
 					...item,
-					unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
-				}
-			})
-			state.erpSpuItemsMemo = cgPlanData.data.items.map((item: any) => {
-				const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
-				return {
-					...item,
-					unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
+					selectedUnitObj: { ...selectedUnitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
 				}
 			})
 		}
 	} else {
 		loading.value = true
 		// 获取采购入库编号
-		const [planCode] = await Promise.allSettled([getPlanCode({ type: 3 })])
-			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
-			.finally(() => (loading.value = false))
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 3 })]).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 handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(2)
-
-// 获取选择的采购申请
-const getSelectedLinkCode = (selectionRows: any) => {
-	console.log("被选择的关联数据", selectionRows)
-
-	baseDataForm.linkCode = selectionRows.code
-	state.editableTableData = selectionRows.items.map((item: any) => ({
-		...item,
-		unitObj: {},
-		realPrice: displayPrice(item.purchasePrice, ""),
-	}))
-	state.erpSpuItemsMemo = selectionRows.items.map((item: any) => ({
-		...item,
-		unitObj: {},
-		realPrice: displayPrice(item.purchasePrice, ""),
-	}))
-}
-
-// 删除选中的行
-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)
 }
 
 // 点击商品选择
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
+// 点击关联采购申请编号
+// const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(2)
+
+// 获取选择的采购申请
+// const getSelectedLinkCode = (selectionRows: any) => {
+// 	console.log("被选择的关联数据", selectionRows)
+
+// 	baseDataForm.linkCode = selectionRows.code
+// 	vxeTableData.value = selectionRows.items.map((item: any) => ({
+// 		...item,
+// 		selectedUnitObj: {},
+// 		realPrice: displayPrice(item.purchasePrice, ""),
+// 	}))
+// }
+
 // 获取被选择的商品行
 const getSelectedRows = (selectionRows: any) => {
 	console.log("被选择的商品行", selectionRows)
 
 	// 筛选新勾选的项
 	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]
+			// const index = state.erpSpuItemsMemo.findIndex((item: any) => item.erpSpuId === addItem.erpSpuId)
+			// if (index !== -1) return state.erpSpuItemsMemo[index]
 			return {
 				...addItem,
 				erpUnitVos: addItem.erpUnitVos.map((item: any) => ({ ...item, realPrice: displayPrice(item.purchasePrice, "") })),
-				unitObj: addItem.erpUnitVos[0],
+				selectedUnitObj: addItem.erpUnitVos[0],
+				unitId: addItem.erpUnitVos[0].id,
+				quantity: 1,
 				isNew: true,
 			}
 		})
 	// 仅添加新勾选的项
-	state.editableTableData = [...state.editableTableData, ...addedItems]
+	vxeTableData.value.push(...addedItems)
 
 	// 筛选取消勾选的项
-	const removedItems = state.editableTableData.filter(
-		(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
-	)
+	// const removedItems = vxeTableData.value.filter(
+	// 	(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
+	// )
 	// 仅移除取消勾选的项
-	state.editableTableData = state.editableTableData.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)
+	// vxeTableData.value = vxeTableData.value.filter(
+	// 	(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
+	// )
+	console.log("vxeTableData.value", vxeTableData.value)
 }
 
-// 整理数据
-const cgPlanSpuItems = computed(() => {
-	return state.editableTableData.map((item: any) => {
-		if (item.erpUnitVos) {
-			const unitObj = item.unitObj
-			return {
-				id: item.isNew ? undefined : item.id,
-				erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
-				unitPrice: unitObj.purchasePrice ? Number(unitObj?.purchasePrice) : 0,
-				realPrice: unitObj.realPrice ? storePrice(unitObj?.realPrice) : 0,
-				totalAmount: storePrice(Number(unitObj?.realPrice || 0) * item.quantity),
-				remark: item.remark,
-				unitId: unitObj.id,
-				orderType: baseDataForm.orderType,
-			}
-		} else {
-			return {
-				id: item.isNew ? undefined : item.id,
-				erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
-				unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0,
-				realPrice: item.realPrice ? storePrice(item.realPrice) : 0,
-				totalAmount: item?.realPrice && item.quantity ? storePrice(Number(item.realPrice) * 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))
+		}
+	}
+}
+
+// 整理table数据
+const settledTableItems = computed(() => {
+	return vxeTableData.value.map((item: any) => {
+		const selectedUnitObj = item.selectedUnitObj
+		return {
+			id: item.isNew ? "" : item.id,
+			erpSpuId: item.erpSpuId,
+			quantity: item.quantity,
+			unitPrice: selectedUnitObj.purchasePrice ? Number(selectedUnitObj?.purchasePrice) : 0,
+			realPrice: selectedUnitObj.realPrice ? storePrice(selectedUnitObj?.realPrice) : 0,
+			totalAmount: storePrice(Number(selectedUnitObj?.realPrice || 0) * item.quantity),
+			remark: item.remark,
+			unitId: selectedUnitObj.id,
+			orderType: baseDataForm.orderType,
 		}
 	})
 })
@@ -429,40 +370,34 @@ const { formValidate, submitData } = useSmProcessFormAction()
 // 点击继续添加
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
-	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+	console.log("vxeTableData.value", 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.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+	console.log("vxeTableData.value", 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 = []
 	return true
 }
 
 // 点击打印
-const printEvent = () => {
-	tablePrint(editableTableRef.value, baseDataInfoRef.value, state.editableTableData, 23, "采购入库")
-}
-
-onMounted(() => {
-	getInitData()
-})
+// const printEvent = () => {
+// 	tablePrint(vxeTableRef.value, baseInfoRef.value, vxeTableData.value, 23, "采购入库")
+// }
 </script>

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

@@ -1,6 +1,6 @@
 <template>
 	<div class="layout-padding">
-		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
+		<div v-if="!showForm" class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 					<el-form-item label="单据编号" prop="inventoryCode">
@@ -18,20 +18,16 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<!-- <el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
-						</el-select>
-					</el-form-item> -->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
+
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="create()" v-auth="'supermarket_smErpInventoryRecords_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpInventoryRecords_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -70,11 +66,6 @@
 				<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="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="scope">
-						<dict-tag :options="check_status" :value="scope.row.checkStatus" />
-					</template>
-				</el-table-column> -->
 				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip>
@@ -84,14 +75,7 @@
 				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button icon="MessageBox" text type="success" @click="edit({ ...scope.row, checkStatus: 2 })">详情</el-button>
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'supermarket_smErpInventoryRecords_edit'"
-							@click="edit({ ...scope.row, checkStatus: null })"
-						>
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpInventoryRecords_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
 						<el-button
@@ -103,26 +87,13 @@
 						>
 							删除
 						</el-button>
-						<!-- <el-button
-							type="primary"
-							size="small"
-							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
-							link
-							icon="VideoPlay"
-							@click="deal(scope.row)"
-						>
-							开始处理
-						</el-button> -->
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
 
-		<sm-form v-else :formId="processFormState.formId" :disabled="processFormState.formDisabled" @close="formClose" />
-
-		<!-- 审批抽屉 -->
-		<!-- <process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" /> -->
+		<sm-form v-else :formId="formId" :disabled="formDisabled" @close="formClose" />
 	</div>
 </template>
 
@@ -130,35 +101,63 @@
 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 ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { displayPrice } from "/@/utils/formatMoney"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
-const { check_status } = useDict("check_status")
-// 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
-// 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
-const processFormState = reactive<{ formId: string | undefined; formDisabled: boolean; showForm: boolean }>({
-	formId: undefined,
-	formDisabled: true,
-	showForm: false,
-})
-const processDrawerRef = ref<InstanceType<typeof ProcessDrawer> | null>(null)
-
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
 		inventoryType: "3",
 	},
 	pageList: fetchList,
 })
+const showForm = ref(false)
+const formDisabled = ref(false)
+const formId = ref("")
+
+// 新增
+const create = () => {
+	formDisabled.value = false
+	formId.value = ""
+	showForm.value = true
+}
+
+// 删除操作
+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)
+	}
+}
+
+// 编辑
+const edit = (row: any) => {
+	if (!row.id) return useMessage().warning("清单id不存在")
+	formId.value = row.id
+	showForm.value = true
+}
+
+// 表单关闭
+const formClose = () => {
+	showForm.value = false
+	formId.value = ""
+	formDisabled.value = false
+	getDataList()
+}
 
-//  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
@@ -180,28 +179,4 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	selectObjs.value = objs.map(({ id }) => id)
 	multiple.value = !objs.length
 }
-
-const { create, edit, close } = useSmProcessTableAction(processFormState)
-
-const formClose = () => {
-	close()
-	getDataList()
-}
-
-// 删除操作
-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)
-	}
-}
 </script>

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

@@ -220,7 +220,6 @@ const baseDataForm = reactive<any>({
 	receiveAmount: 0,
 })
 const vxeTableData = ref<any>([])
-const vxeTableDataMemo = ref([])
 const erpSpuSimpleAll = ref<any>([])
 
 const dataRules = ref({
@@ -252,7 +251,6 @@ const getInitData = async () => {
 		if (cgPlanData?.code === 0) {
 			Object.assign(baseDataForm, cgPlanData.data)
 			vxeTableData.value = cgPlanData.data.items
-			vxeTableDataMemo.value = cgPlanData.data.items
 		}
 	} else {
 		loading.value = true
@@ -286,16 +284,16 @@ const getSelectedRows = (selectionRows: any) => {
 			return { ...addItem, unitId: addItem.erpUnitVos[0].id, quantity: 1, isNew: true }
 		})
 	// 仅添加新勾选的项
-	vxeTableData.value = [...vxeTableData.value, ...addedItems]
+	vxeTableData.value.push(...addedItems)
 
 	// 筛选取消勾选的项
-	const removedItems = vxeTableData.value.filter(
-		(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
-	)
+	// const removedItems = vxeTableData.value.filter(
+	// 	(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
+	// )
 	// 仅移除取消勾选的项
-	vxeTableData.value = vxeTableData.value.filter(
-		(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
-	)
+	// vxeTableData.value = vxeTableData.value.filter(
+	// 	(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
+	// )
 	console.log("vxeTableData.value", vxeTableData.value)
 }
 
@@ -358,7 +356,6 @@ const clearData = () => {
 		baseDataForm[key] = ""
 	}
 	vxeTableData.value = []
-	vxeTableDataMemo.value = []
 	return true
 }
 </script>

src/views/supermarketerp/supermarketSpu/index.vue

@@ -3,14 +3,19 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="商品名称" prop="productName">
+						<el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
+					</el-form-item>
+					<el-form-item label="商品分类" prop="categoryId">
+						<el-select v-model="state.queryForm.categoryId" placeholder="请选择商品分类">
+							<el-option v-for="item in supermarketCategory" :key="item?.id" :label="item?.name" :value="item?.id" />
+						</el-select>
+					</el-form-item>
 					<el-form-item label="货号" prop="productCode">
 						<el-input placeholder="请输入货号" v-model="state.queryForm.productCode" />
 					</el-form-item>
-					<el-form-item label="自编码/条码" prop="barcode">
-						<el-input placeholder="请输入自编码/条码" v-model="state.queryForm.barcode" />
-					</el-form-item>
-					<el-form-item label="商品名称" prop="productName">
-						<el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
+					<el-form-item label="条码" prop="barcode">
+						<el-input placeholder="条码" v-model="state.queryForm.barcode" />
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
@@ -103,6 +108,9 @@
 				<el-table-column prop="costPrice" label="成本单价(元)" show-overflow-tooltip width="120">
 					<template #default="{ row }">{{ displayPrice(row.costPrice, "") }}</template>
 				</el-table-column>
+				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip width="120">
+					<template #default="{ row }">{{ displayPrice(row.retailPrice, "") }}</template>
+				</el-table-column>
 				<el-table-column prop="stock" label="剩余总库存" show-overflow-tooltip />
 				<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip /> -->