Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

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

@@ -150,15 +150,16 @@
 						<el-input v-model="row.quantity" />
 					</template>
 				</vxe-column>
-				<vxe-column field="unitPrice" title="进价">
-					<template #default="{ row }">
-						{{
-							row.purchasePrice
-								? displayPrice(row.purchasePrice)
-								: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
-						}}
-					</template>
-				</vxe-column>
+
+        <vxe-column field="unitPrice" title="进价">
+          <template #default="{ row }">
+            {{
+              row.purchasePrice
+                  ? displayPrice(row.purchasePrice)
+                  : displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
+            }}
+          </template>
+        </vxe-column>
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
 						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">