Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud

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",
+		url: "/supermarket/smErpInventoryRecords/updatePD",
-		method: "post",
+		method: "put",
 		data,
 	})
 }

src/hooks/smProcessTableAction.ts

@@ -1,37 +0,0 @@
-import { useMessage } from "./message"
-
-export type tableRow = { id: string | undefined; checkStatus: number | string | undefined; processInstanceId: string | undefined | null }
-type ICreate = () => void
-type IEdit = (row: tableRow) => void
-type IClose = () => void
-
-// 采购流程（补货申请、采购订单、采购入库、采购退货、零售出库、零售退货） 表格操作列行为hook
-export function useSmProcessTableAction(processFormState: { formId: string | undefined; formDisabled: boolean; showForm: boolean }): {
-	create: ICreate
-	edit: IEdit
-	close: IClose
-} {
-	// 点击新增
-	const create: ICreate = () => {
-		processFormState.formDisabled = false
-		processFormState.showForm = true
-	}
-	// 点击编辑
-	const edit: IEdit = (row: tableRow) => {
-		row.id ? (processFormState.formId = row.id) : useMessage().warning("清单id不存在")
-		row.checkStatus == 2 ? (processFormState.formDisabled = true) : (processFormState.formDisabled = false)
-		processFormState.showForm = true
-	}
-	// 表单关闭
-	const close: IClose = () => {
-		processFormState.showForm = false
-		processFormState.formId = undefined
-		processFormState.formDisabled = true
-	}
-
-	return {
-		create,
-		edit,
-		close,
-	}
-}

src/views/hard/hard-door-flow/index.vue

@@ -11,34 +11,25 @@
 							<dict-select v-model="state.queryForm.bizType" dict-code="hard_door_flow_biz" />
 						</el-form-item>
 						<el-form-item style="width: 400px" 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="getDataList">{{ $t("common.queryBtn") }}</el-button>
+							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
+								}}</el-button>
 							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 						</el-form-item>
 					</el-row>
 				</el-form>
 				<div class="mb8" style="width: 100%">
-					<right-toolbar
+					<right-toolbar v-model:showSearch="showSearch" :export="'dzc_hardDoorFlow_export'"
-						v-model:showSearch="showSearch"
+						@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
-						:export="'dzc_hardDoorFlow_export'"
+						@queryTable="getDataList"></right-toolbar>
-						@exportExcel="exportExcel"
-						class="ml10 mr20"
-						style="float: right"
-						@queryTable="getDataList"
-					></right-toolbar>
 				</div>
 			</el-row>
-			<el-table
+			<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-				:data="state.dataList"
+				:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
-				v-loading="state.loading"
+				@sort-change="sortChangeHandle">
-				border
-				:cell-style="tableStyle.cellStyle"
-				:header-cell-style="tableStyle.headerCellStyle"
-				@selection-change="selectionChangHandle"
-				@sort-change="sortChangeHandle"
-			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="80" />
 				<el-table-column label="流程">
@@ -61,7 +52,7 @@
 				<el-table-column label="开门流程">
 					<el-table-column prop="requestOpenDto" label="请求开门参数" width="180">
 						<template #default="{ row }">
-							<preview-json :json="row.requestOpenDto" />
+							:json="row.requestOpenDto" />
 						</template>
 					</el-table-column>
 					<el-table-column prop="requestOpenVo" label="请求开门返回" width="180">
@@ -111,7 +102,8 @@
 					<el-table-column prop="payTime" label="支付成功时间" width="180" />
 				</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" />
 		</div>
 	</div>
 </template>

src/views/supermarketerp/purchaseManagement/smErpCgBack/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>
@@ -11,14 +11,6 @@
 						<span class="font-bold">单据日期：</span>
 						<span>{{ baseDataForm.inventoryDate }}</span>
 					</div>
-					<div style="width: 33.33%; height: 28px; line-height: 28px">
-						<span class="font-bold">经办人：</span>
-						<span>{{ baseDataForm.handlerUserId }}</span>
-					</div>
-					<div style="width: 33.33%; height: 28px; line-height: 28px">
-						<span class="font-bold">关联补货申请：</span>
-						<span>{{ baseDataForm.linkCode }}</span>
-					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">货商：</span>
 						<span>{{ baseDataForm.supplierId }}</span>
@@ -29,32 +21,13 @@
 					</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" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
-						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" :disabled="disabled" />
+						<el-date-picker v-model="baseDataForm.inventoryDate" style="width: 200px" :disabled="disabled" value-format="YYYY-MM-DD" />
-					</el-form-item>
-					<el-form-item label="关联入库单" prop="linkCode">
-						<el-input
-							v-model="baseDataForm.linkCode"
-							:suffix-icon="Search"
-							@click="handleClickLinkCode"
-							readonly
-							placeholder="请选择采购入库单"
-							style="width: 200px"
-							:disabled="disabled"
-						/>
-					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
-						<SelectHandlerUser
-							v-model.trim="baseDataForm.handlerUserId"
-							placeholder="请选择经办人"
-							style="width: 200px"
-							:disabled="disabled"
-						/>
 					</el-form-item>
 					<el-form-item label="货商" prop="supplierId">
 						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
@@ -67,12 +40,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
@@ -92,10 +65,14 @@
 				:column-config="{ resizable: true }"
 				:row-config="{ isHover: true }"
 				:resizable-config="{ dragMode: 'fixed' }"
-				:data="state.editableTableData"
+				:checkbox-config="{ highlight: true, range: true }"
+				:data="vxeTableData"
 				:edit-rules="validRules"
-				@checkbox-all="selectChangeEvent"
+				show-footer
-				@checkbox-change="selectChangeEvent"
+				:footer-data="[{ seq: '合计', totalAmount }]"
+				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 7 }]"
+				@checkbox-all=""
+				@checkbox-change=""
 				size="mini"
 				align="center"
 			>
@@ -104,49 +81,74 @@
 				<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="{}">
+				<vxe-column field="productNature" title="商品性质">
+					<template #default="{ row }">
+						{{ supermarket_nature.find((item: any) => item.value == row.productNature)?.label || "" }}
+					</template>
+				</vxe-column>
+				<vxe-column field="selectedUnitObj" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
-						<el-select v-model="row.unitId" placeholder="请选择包装单位">
+						<el-select v-model="row.selectedUnitObj" value-key="id" placeholder="请选择包装单位" @change="onUnitChange(row)">
 							<el-option
-								v-if="row.erpUnitVos?.length > 0"
 								v-for="item in row.erpUnitVos"
 								:key="item.id"
-								:label="item.unit"
+								:label="item.spec ? item.unit + '-' + item.spec : item.unit"
-								:value="item.id"
+								:value="item"
 							/>
-							<el-option v-else :key="row.id" :label="row.unit" :value="row.unitId" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
-						<span v-if="row.unitId">{{ row.unit ?? row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.unit }}</span>
+						<span>{{ row.selectedUnitObj?.unit ?? "请选择" }}</span>
-						<span v-else style="color: #c0c4cf">请选择</span>
+					</template>
+				</vxe-column>
+				<vxe-column field="spec" title="规格">
+					<template #default="{ row }">
+						{{ row.selectedUnitObj?.spec }}
 					</template>
 				</vxe-column>
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-					<template #edit="{ row }">
+					<template #edit="{ row, $rowIndex }">
-						<el-input v-model="row.quantity" />
+						<el-input-number
+							v-if="row.productNature == '1'"
+							v-model="row.quantity"
+							:min="0"
+							:precision="0"
+							@change="onRowValueChange(row, $rowIndex)"
+						/>
+						<el-input-number v-else v-model="row.quantity" :min="0" :precision="2" @change="onRowValueChange(row, $rowIndex)" />
 					</template>
 				</vxe-column>
-				<vxe-column field="unitPrice" title="进价">
+				<vxe-column field="purchasePrice" title="原进价">
 					<template #default="{ row }">
-						{{
+						{{ displayPrice(row.selectedUnitObj?.purchasePrice || 0) }}
-							row.purchasePrice
-								? displayPrice(row.purchasePrice)
-								: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
-						}}
 					</template>
 				</vxe-column>
-				<vxe-column field="totalAmount" title="累计总金额">
+				<vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #default="{ row }">
-						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
+						{{ row?.selectedUnitObj?.realPrice || 0 }}
-							{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
+					</template>
-						</span>
+					<template #edit="{ row, $rowIndex }">
-						<span v-if="row.unitId && row.quantity && row.erpUnitVos">
+						<el-input-number
-							{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+							v-if="row.selectedUnitObj"
-						</span>
+							v-model="row.selectedUnitObj.realPrice"
+							:min="0"
+							:precision="2"
+							@change="onRowValueChange(row, $rowIndex)"
+						/>
+					</template>
+				</vxe-column>
+				<vxe-column field="totalAmount" title="累计总金额" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+					<template #default="{ row }">
+						{{ row?.selectedUnitObj?.totalAmount }}
+					</template>
+					<template #edit="{ row, $rowIndex }">
+						<el-input-number v-if="row.selectedUnitObj" v-model="row.selectedUnitObj.totalAmount" :min="0" :precision="2" />
+					</template>
+					<template #footer="{ row }">
+						<span style="color: #2e5cf6; font-weight: bold">{{ totalAmount }} 元</span>
 					</template>
 				</vxe-column>
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
@@ -166,227 +168,195 @@
 				<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
-				ref="linkCodeDialogRef"
-				title="关联采购订单"
-				:getTableData="() => getCgInventoryPage({ inventoryType: '3' })"
-				@getSelectedLinkCode="getSelectedLinkCode"
-			/>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted } from "vue"
+import { ref, reactive, computed, onMounted, defineAsyncComponent } from "vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
-import { getPlanCode, getErpSpuSimpleAll, getCgInventoryPage } from "/@/api/supermarketerp/common"
+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 { Search } from "@element-plus/icons-vue"
+import { displayPrice, storePrice } from "/@/utils/formatMoney"
-import LinkCodeDialog from "/@/views/supermarketerp/components/link-code-dialog.vue"
-import { displayPrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
+import { useDict } from "/@/hooks/dict"
 
 const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/select-dialog.vue"))
+const { supermarket_nature } = useDict("supermarket_nature")
 
 const props = withDefaults(
 	defineProps<{
-		formId: string | undefined
+		formId: string
 		disabled: boolean
 	}>(),
 	{
-		formId: undefined,
+		formId: "",
-		disabled: true,
+		disabled: false,
 	},
 )
 const emit = defineEmits(["close"])
 
-const loading = ref(false) // 采购计划加载
+const loading = ref(false)
 const disabled = ref(false)
-const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
+const erpSpuSelectDialogRef = ref()
-const linkCodeDialogRef = ref() // 关联采购申请单对话框ref
+const baseFormRef = ref()
-const baseDataFormRef = ref() // 基本数据表单ref
+const vxeTableRef = ref<VxeTableInstance<any>>()
-const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
+const baseInfoRef = ref()
-const baseDataInfoRef = ref() // 基本信息ref
+
-// 基本信息表单数据
 const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
-	handlerUserId: "",
-	checkStatus: "",
-	checkUserId: "",
-	checkTime: "",
 	supplierId: "",
 	remark: "",
 	orderType: "2",
-	totalAmount: "",
 	inventoryType: "4",
 })
-const state = reactive<{
+const vxeTableData = ref<any>([])
-	editableTableData: any[]
+const erpSpuSimpleAll = ref<any>([])
-	erpSpuItemsMemo: any[]
-	selectedRowsErpSpuIds: string[]
-	erpSpuSimpleAll: any
-}>({
-	editableTableData: [], // 可编辑表格数据
-	erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存
-	selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId
-	erpSpuSimpleAll: [], // 简要商品列表
-})
 
-// 基本信息表单校验规则
 const dataRules = ref({
-	inventoryCode: [{ required: true, message: "出入库记录表编号不能为空", trigger: "blur" }],
+	inventoryCode: [{ required: true, message: "编号不能为空", trigger: "blur" }],
-	inventoryDate: [{ 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" }],
 })
 
+// 合计总金额
+const totalAmount = computed(() =>
+	vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.totalAmount || 0), 0).toFixed(2),
+)
+
+onMounted(async () => {
+	await 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)])
+		const [cgPlanData] = await Promise.allSettled([getObj(id)]).then((results) =>
-			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+			results.map((result) => (result.status === "fulfilled" ? result.value : null)),
-			.finally(() => (loading.value = false))
+		)
 
 		if (cgPlanData && cgPlanData.code === 0) {
 			Object.assign(baseDataForm, cgPlanData.data)
-			state.editableTableData = cgPlanData.data.items
+			vxeTableData.value = cgPlanData.data.items.map((item: any) => {
-			state.erpSpuItemsMemo = cgPlanData.data.items
+				const selectedUnitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
+				return {
+					...item,
+					selectedUnitObj: {
+						...selectedUnitObj,
+						realPrice: Number(displayPrice(item?.realPrice, "")) || 0,
+						totalAmount: Number(displayPrice(item?.totalAmount, "")),
+					},
+				}
+			})
 		}
 	} else {
 		loading.value = true
 		// 获取采购退货编号
-		const [planCode] = await Promise.allSettled([getPlanCode({ type: 4 })])
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 4 })]).then((results) =>
-			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+			results.map((result) => (result.status === "fulfilled" ? result.value : null)),
-			.finally(() => (loading.value = false))
+		)
 		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)
+	erpSpuSimpleAllData && erpSpuSimpleAllData.code === 0 && (erpSpuSimpleAll.value = erpSpuSimpleAllData.data)
-}
-
-// 点击关联采购申请编号
-const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(3)
-
-// 获取选择的采购申请
-const getSelectedLinkCode = (selectionRows: any) => {
-	console.log("被选择的关联数据", selectionRows)
-
-	baseDataForm.linkCode = selectionRows.inventoryCode
-	state.editableTableData = selectionRows.items
-	state.erpSpuItemsMemo = selectionRows.items
-}
-
-// 删除选中的行
-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)
-	}
 }
 
 // 点击商品选择
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
-// 获取被选择的商品行
+// 商品选择回调
 const getSelectedRows = (selectionRows: any) => {
-	console.log("被选择的商品行", selectionRows)
+	console.log("selectionRows", 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)
+			const firstUnit = addItem.erpUnitVos[0]
-			if (index !== -1) return state.erpSpuItemsMemo[index]
+			return {
-			return { ...addItem, isNew: true }
+				...addItem,
+				erpUnitVos: addItem.erpUnitVos.map((item: any) => ({ ...item, realPrice: Number(displayPrice(item.purchasePrice, "")) })),
+				selectedUnitObj: {
+					...firstUnit,
+					realPrice: Number(displayPrice(firstUnit.purchasePrice, "")),
+					totalAmount: 1 * Number(displayPrice(firstUnit.purchasePrice, "")),
+				},
+				unitId: firstUnit.id,
+				quantity: 1,
+				isNew: true,
+			}
 		})
-	// 仅添加新勾选的项
+	vxeTableData.value.push(...addedItems)
-	state.editableTableData = [...state.editableTableData, ...addedItems]
 
-	// 筛选取消勾选的项
+	console.log("vxeTableData.value", vxeTableData.value)
-	const removedItems = state.editableTableData.filter(
+}
-		(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
+
-	)
+// 删除选中的行
-	// 仅移除取消勾选的项
+const removeRow = () => {
-	state.editableTableData = state.editableTableData.filter(
+	const $table = vxeTableRef.value
-		(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
+	if ($table) {
-	)
+		const selectRecords = $table.getCheckboxRecords()
-	// state.editableTableData.push(item)
+		if (selectRecords.length > 0) {
-	// nextTick(() => {
+			vxeTableData.value = vxeTableData.value.filter((item: any) => !selectRecords.some((row) => row.erpSpuId === item.erpSpuId))
-	// 	const $table = editableTableRef.value
+		}
-	// 	if ($table) {
+	}
-	// 		$table.setRow(item)
+}
-	// 	}
+
-	// })
+// 包装单位选择联动
-	console.log("state.editableTableData", state.editableTableData)
+const onUnitChange = (row: any) => {
+	// 更新 unitId
+	row.unitId = row.selectedUnitObj.id
+	// 更新 realPrice
+	row.selectedUnitObj.realPrice = Number(displayPrice(row.realPrice ?? row.selectedUnitObj.purchasePrice, ""))
+	// 重新计算行内累计总金额
+	row.selectedUnitObj.totalAmount = Number((row.quantity * Number(row.selectedUnitObj.realPrice || 0)).toFixed(2))
+}
+
+// 数量、进价变动联动
+const onRowValueChange = (row: any, $rowIndex: number) => {
+	row.selectedUnitObj.totalAmount = Number((row.quantity * Number(row.selectedUnitObj.realPrice || 0)).toFixed(2))
 }
 
 // 整理数据
-const cgPlanSpuItems = computed(() => {
+const settledTableItems = computed(() => {
-	return state.editableTableData.map((item: any) => {
+	return vxeTableData.value.map((item: any) => {
-		if (item.erpUnitVos) {
+		// const unit = item.erpUnitVos.find((unitItem: any) => unitItem.id === item.unitId)
-			const unit = item.erpUnitVos.find((unitItem: any) => unitItem.id === item.unitId)
+		const selectedUnitObj = item.selectedUnitObj
-			return {
+		return {
-				id: item.isNew ? undefined : item.id,
+			id: item.isNew ? "" : item.id,
-				erpSpuId: item.erpSpuId,
+			erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
+			quantity: item.quantity,
-				unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
+			productNature: item.productNature,
-				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
+			unitPrice: selectedUnitObj.purchasePrice ? Number(selectedUnitObj?.purchasePrice) : 0,
-				remark: item.remark,
+			realPrice: selectedUnitObj.realPrice ? storePrice(selectedUnitObj?.realPrice) : 0,
-				unitId: item.unitId,
+			totalAmount: storePrice(Number(selectedUnitObj?.totalAmount || 0)),
-				orderType: baseDataForm.orderType,
+			remark: item.remark,
-			}
+			unitId: selectedUnitObj.id,
-		} else {
+			orderType: baseDataForm.orderType,
-			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,
-				orderType: baseDataForm.orderType,
-			}
 		}
 	})
 })
@@ -396,40 +366,34 @@ const { formValidate, submitData } = useSmProcessFormAction()
 // 点击继续添加
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
-	console.log("state.editableTableData", state.editableTableData)
+	console.log("vxeTableData.value", vxeTableData.value)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
+	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
 		clearData()
 }
 
 // 点击保存
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
-	console.log("state.editableTableData", state.editableTableData)
+	console.log("vxeTableData.value", vxeTableData.value)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
+	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+		(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
+		if (["id", "inventoryCode", "inventoryDate", "inventoryType", "orderType"].includes(key)) continue
 		baseDataForm[key] = ""
 	}
-	state.editableTableData = []
+	vxeTableData.value = []
-	state.erpSpuItemsMemo = []
-	state.selectedRowsErpSpuIds = []
 	return true
 }
 
 // 点击打印
-const printEvent = () => {
+// const printEvent = () => {
-	tablePrint(editableTableRef.value, baseDataInfoRef.value, state.editableTableData, 23, "采购退货")
+// 	tablePrint(vxeTableRef.value, baseInfoRef.value, vxeTableData.value, 23, "采购退货")
-}
+// }
-
-onMounted(() => {
-	getInitData()
-})
 </script>

src/views/supermarketerp/purchaseManagement/smErpCgBack/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">
@@ -15,23 +15,19 @@
 							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
+					<!-- <el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
-					</el-form-item>
+					</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
@@ -69,34 +65,17 @@
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
-				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
+				<!-- <el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip /> -->
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="{ row }">
-						<dict-tag :options="check_status" :value="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 />-->
+				<el-table-column prop="totalAmount" label="出库总金额" show-overflow-tooltip>
+					<template #default="{ row }">
+						{{ displayPrice(row.totalAmount) }}
+					</template>
+				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpInventoryRecords_edit'" @click="edit(scope.row)">
-							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
-							icon="MessageBox"
-							text
-							type="success"
-							@click="edit(scope.row)"
-						>
-							详情
-						</el-button>
-						<el-button
-							v-else
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'supermarket_smErpInventoryRecords_edit'"
-							@click="edit(scope.row)"
-						>
 							编辑
 						</el-button>
 						<el-button
@@ -108,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" />
+		<sm-form v-else :formId="formId" :disabled="formDisabled" @close="formClose" />
-
-		<!-- 审批抽屉 -->
-		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
 	</div>
 </template>
 
@@ -135,71 +101,29 @@
 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 { displayPrice } from "/@/utils/formatMoney"
-import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { tableRow, 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: "4",
 	},
 	pageList: fetchList,
 })
+const showForm = ref(false)
+const formDisabled = ref(false)
+const formId = ref("")
 
-//  table hook
+// 新增
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+const create = () => {
-
+	formDisabled.value = false
-// 清空搜索条件
+	formId.value = ""
-const resetQuery = () => {
+	showForm.value = true
-	// 清空搜索条件
-	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
-	getDataList()
-}
-
-// 导出excel
-const exportExcel = () => {
-	// downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购退货.xlsx")
-}
-
-// 多选事件
-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 deal = (row: tableRow) => {
-	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
-	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
-}
-// 审批提交事件
-const taskSubmitEvent = () => {
-	getDataList()
 }
 
 // 删除操作
@@ -218,4 +142,41 @@ const handleDelete = async (ids: string[]) => {
 		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()
+}
+
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购退货.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 </script>

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

@@ -1,5 +1,7 @@
 <template>
-	<div class="layout-padding">
+	<div>暂无数据</div>
+
+	<div v-if="false" class="layout-padding">
 		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
 			<el-row>
 				<div class="mb8" style="width: 100%">
@@ -99,7 +101,6 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"
-import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -143,8 +144,6 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, close } = useSmProcessTableAction(processFormState)
-
 const formClose = () => {
 	close()
 	getDataList()

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

@@ -20,10 +20,6 @@
 							:isDisplayName="true"
 						/>
 					</div> -->
-					<div style="width: 33.33%; height: 28px; line-height: 28px">
-						<span class="font-bold">关联补货申请：</span>
-						<span>{{ baseDataForm.linkCode }}</span>
-					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">货商：</span>
 						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" :isDisplayName="true" />
@@ -40,7 +36,7 @@
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" :disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
-						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" :disabled="disabled" />
+						<el-date-picker v-model="baseDataForm.inventoryDate" style="width: 200px" :disabled="disabled" value-format="YYYY-MM-DD" />
 					</el-form-item>
 					<!-- <el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
@@ -102,7 +98,7 @@
 				:edit-rules="validRules"
 				show-footer
 				:footer-data="[{ seq: '合计', totalAmount }]"
-				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 6 }]"
+				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 7 }]"
 				@checkbox-all=""
 				@checkbox-change=""
 				size="mini"
@@ -131,14 +127,16 @@
 								:value="item"
 							/>
 						</el-select>
-						<!-- <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> -->
 					</template>
 					<template #default="{ row }">
 						<span>{{ row.selectedUnitObj?.unit ?? "请选择" }}</span>
 					</template>
 				</vxe-column>
+				<vxe-column field="spec" title="规格">
+					<template #default="{ row }">
+						{{ row.selectedUnitObj?.spec }}
+					</template>
+				</vxe-column>
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row, $rowIndex }">
 						<el-input-number
@@ -259,7 +257,6 @@ const dataRules = ref({
 	inventoryDate: [{ required: true, message: "单据日期不能为空", trigger: "blur" }],
 	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })
-
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	selectedUnitObj: [{ required: true, message: "必须选择" }],
 	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
@@ -323,7 +320,7 @@ const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 const getSelectedRows = (selectionRows: any[]) => {
 	console.log("selectionRows", selectionRows)
 
-	// 只添加新商品
+	// 只添加新勾选的商品
 	const addedItems = selectionRows
 		.filter((item: any) => !vxeTableData.value.some((vxeTableItem: any) => vxeTableItem.erpSpuId === item.erpSpuId))
 		.map((addItem: any) => {

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

@@ -75,6 +75,7 @@
 						{{ displayPrice(row.totalAmount) }}
 					</template>
 				</el-table-column>
+				<el-table-column prop="createBy" label="创建人" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
 						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpInventoryRecords_edit'" @click="edit(scope.row)">

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

@@ -1,5 +1,7 @@
 <template>
-	<div class="layout-padding">
+	<div>暂无数据</div>
+
+	<div v-if="false" class="layout-padding">
 		<div v-if="!processFormState.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">
@@ -116,7 +118,6 @@ import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgPlan"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
-import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -161,8 +162,6 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, close } = useSmProcessTableAction(processFormState)
-
 const formClose = () => {
 	close()
 	getDataList()

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

@@ -1,5 +1,7 @@
 <template>
-	<div class="layout-padding">
+	<div>暂无数据</div>
+
+	<div v-if="false" class="layout-padding">
 		<div v-if="!processFormState.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">
@@ -125,9 +127,6 @@
 		</div>
 
 		<sm-form v-else :formId="processFormState.formId" :disabled="processFormState.formDisabled" @close="formClose" />
-
-		<!-- 审批抽屉 -->
-		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
 	</div>
 </template>
 
@@ -137,7 +136,6 @@ 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 { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -185,23 +183,11 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const { create, edit, close } = useSmProcessTableAction(processFormState)
-
 const formClose = () => {
 	close()
 	getDataList()
 }
 
-// 点击开始处理
-const deal = (row: tableRow) => {
-	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
-	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
-}
-// 审批提交事件
-const taskSubmitEvent = () => {
-	getDataList()
-}
-
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {

src/views/supermarketerp/stockTaking/form.vue

@@ -95,7 +95,8 @@
 				<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 }}
 						</div>
 					</template>
 				</vxe-column>
@@ -144,17 +145,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 +408,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(
+			realPrice: item.pdPrice,
-				displayPrice(
+			// realPrice: Number(
-					item.erpUnitVos.reduce((pre: any, cur: any) => pre + cur.purchasePrice * Number(cur.realNumber), 0),
+			// 	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(
 				(
@@ -428,8 +435,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 +454,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() &&

src/views/supermarketerp/supermarketSpu/components/product-inventory.vue

@@ -2,24 +2,27 @@
 	<el-row>
 		<el-col :span="8" class="mb20">
 			<el-form-item label="期初库存" prop="stock" class="flex w-full h-full">
-				<el-input-number v-model="stock" :min="0" :precision="0" />
+				<el-input-number v-model="stock" :min="0" :precision="2" />
 			</el-form-item>
 		</el-col>
 
 		<el-col :span="8" class="mb20">
 			<el-form-item label="库存上限" prop="inventoryUpperLimit">
-				<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="0" />
+				<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="2" />
 			</el-form-item>
 		</el-col>
 
 		<el-col :span="8" class="mb20">
 			<el-form-item label="库存下限" prop="inventoryLowerLimit">
-				<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="0" />
+				<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="2" />
 			</el-form-item>
 		</el-col>
 
 		<el-alert type="warning" show-icon :closable="false">
-			注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖
+			<span class="text-lg">
+				注：此处库存数应该填写最小售卖单位的总库存，否则无法换算成完整的库存扣减。每卖出一个包装形式的商品，都会进行总库存数 -
+				内装数，从而进行多种包装形式的售卖。
+			</span>
 		</el-alert>
 	</el-row>
 </template>