fix:修改冲突

src/views/supermarketerp/supermarketSpu/components/package-unit.vue

@@ -16,9 +16,7 @@
 		<el-tooltip effect="light" placement="right">
 			<template #content>
 				<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
-          <p>
+					<p>注：口味管理则可以实现通过对该商品的口味划分+设置改口味的基础库存，以此实现对某个的口味商品进行不同包装形式售卖</p>
-            注：口味管理则可以实现通过对该商品的口味划分+设置改口味的基础库存，以此实现对某个的口味商品进行不同包装形式售卖
-          </p>
 				</el-alert>
 			</template>
 			<el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
@@ -212,26 +210,6 @@ const slotInputChange = (slotParams: any) => {
 }
 
 // 底部新增行
-const pushEvent = (row?: rowVU | undefined) => {
-	const newRow = {} as rowVU
-	if (row) {
-		Object.assign(newRow, row)
-	} else {
-		row = {
-			id: "tmp_" + nanoid(5),
-			barCode: "",
-			spec: "",
-			unit: "",
-			status: "0",
-			packageNum: 1,
-			purchasePrice: 0,
-			retailPrice: 0.01,
-			promotionPrice: 0,
-			costPrice: 0,
-			tasteName: "",
-			tasteId: "",
-		}
-		Object.assign(newRow, row)
 const pushEvent = (flag?: "flag" | undefined) => {
 	const newRow: rowVU = {
 		id: "tmp_" + nanoid(5),