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

# Conflicts:
#	src/views/supermarketerp/supermarketSpu/components/package-unit.vue

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

@@ -1,28 +1,26 @@
 <template>
 	<el-row class="mb-2">
 		<el-button type="primary" @click="pushEvent()">新增</el-button>
-    <el-tooltip effect="light" placement="right">
-      <template #content>
-        <el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
-          <p>
-            注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
-            例如：一瓶矿泉水内装填'1',为售卖的最小基础单位，如果想按箱卖，在继续添加包装单位为箱，内装为24
-          </p>
-        </el-alert>
-      </template>
-      <el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
-    </el-tooltip>
-    <el-button type="success" @click="tasteFormRef.openDialog()">口味管理</el-button>
-    <el-tooltip effect="light" placement="right">
-      <template #content>
-        <el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
-          <p>
-            注：口味管理则可以实现通过对该商品的口味划分+设置改口味的基础库存，以此实现对某个的口味商品进行不同包装形式售卖
-          </p>
-        </el-alert>
-      </template>
-      <el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
-    </el-tooltip>
+		<el-tooltip effect="light" placement="right">
+			<template #content>
+				<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
+					<p>
+						注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
+						例如：一瓶矿泉水内装填'1',为售卖的最小基础单位，如果想按箱卖，在继续添加包装单位为箱，内装为24
+					</p>
+				</el-alert>
+			</template>
+			<el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
+		</el-tooltip>
+		<el-button type="success" @click="tasteFormRef.openDialog()">口味管理</el-button>
+		<el-tooltip effect="light" placement="right">
+			<template #content>
+				<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
+					<p>注：口味管理则可以实现通过对该商品的口味划分+设置改口味的基础库存，以此实现对某个的口味商品进行不同包装形式售卖</p>
+				</el-alert>
+			</template>
+			<el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
+		</el-tooltip>
 	</el-row>
 
 	<vxe-table
@@ -212,6 +210,7 @@ const slotInputChange = (slotParams: any) => {
 }
 
 // 底部新增行
+<<<<<<< HEAD
 const pushEvent = (row?: rowVU | undefined) => {
 	const newRow = {} as rowVU
 	if (row) {
@@ -247,6 +246,23 @@ const pushEvent = (row?: rowVU | undefined) => {
         tasteName: "",
         tasteId: "",
       }
+=======
+const pushEvent = (flag?: "flag" | undefined) => {
+	const newRow: rowVU = {
+		id: "tmp_" + nanoid(5),
+		barCode: "",
+		spec: "",
+		unit: "",
+		status: "0",
+		packageNum: 1,
+		purchasePrice: 0,
+		retailPrice: 0.01,
+		promotionPrice: 0,
+		costPrice: 0,
+		tasteName: "",
+		tasteId: "",
+	}
+>>>>>>> 09ed9cd1a67bafec7fdb6796de0dcfbb0b357dec
 
       if (flag) newRow.flag = "defaultPackageUnitRow"