diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index f178ce2..87bc001 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -194,11 +194,11 @@
-
+
@@ -273,8 +273,8 @@ const form = reactive({
inventoryUpperLimit: 0,
inventoryLowerLimit: 0,
grossMargin: 0,
- supermarketUnitEntityList: [],
- supermarketAuxiliaryCodeEntityList: [],
+ smErpUnitEntityList: [],
+ smErpAuxiliaryCodeEntityList: [],
})
// 定义校验规则
const dataRules = {
@@ -289,8 +289,8 @@ const dataRules = {
picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],
status: [{ required: true, message: "请选择商品状态", trigger: "blur" }],
supplierId: [{ required: true, message: "请选择货商", trigger: "blur" }],
- supermarketUnitEntityList: [{ required: true, message: "请添加包装单位", trigger: "change" }],
- supermarketAuxiliaryCodeEntityList: [{ required: true, message: "请添加辅助条码", trigger: "change" }],
+ smErpUnitEntityList: [{ required: true, message: "请添加包装单位", trigger: "change" }],
+ smErpAuxiliaryCodeEntityList: [{ required: true, message: "请添加辅助条码", trigger: "change" }],
}
const { supermarket_nature, status } = useDict("supermarket_nature", "status")
const categoryOptions = ref([]) // 商品分类的下拉选项
@@ -302,7 +302,7 @@ const getsupermarketSpuData = async (id: string) => {
// 获取数据
loading.value = true
const res = await getObj(id).finally(() => (loading.value = false))
- res.data.supermarketUnitEntityList.map((item: any) => {
+ res.data.smErpUnitEntityList.map((item: any) => {
item.costPrice = displayPrice(item.costPrice, "")
item.promotionPrice = displayPrice(item.promotionPrice, "")
item.purchasePrice = displayPrice(item.purchasePrice, "")
@@ -369,16 +369,16 @@ const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) useMessage().warning("基础信息必填项未填写完整")
- if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0)
+ if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0)
useMessage().warning("请添加包装单位")
- if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0)
+ if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0)
useMessage().warning("请添加辅助条码")
if (!valid) return false
try {
loading.value = true
if (form.id) {
- form.supermarketUnitEntityList.map((item: any) => {
+ form.smErpUnitEntityList.map((item: any) => {
item.costPrice = storePrice(item.costPrice)
item.promotionPrice = storePrice(item.promotionPrice)
item.purchasePrice = storePrice(item.purchasePrice)
@@ -388,7 +388,7 @@ const onSubmit = async () => {
delete item.isNew
}
})
- form.supermarketAuxiliaryCodeEntityList.map((item: any) => {
+ form.smErpAuxiliaryCodeEntityList.map((item: any) => {
if (item.isNew) {
item.id = ""
delete item.isNew
@@ -396,14 +396,14 @@ const onSubmit = async () => {
})
await putObj(form)
} else {
- form.supermarketUnitEntityList.map((item: any) => {
+ form.smErpUnitEntityList.map((item: any) => {
item.id = ""
item.costPrice = storePrice(item.costPrice)
item.promotionPrice = storePrice(item.promotionPrice)
item.purchasePrice = storePrice(item.purchasePrice)
item.retailPrice = storePrice(item.retailPrice)
})
- form.supermarketAuxiliaryCodeEntityList.map((item: any) => {
+ form.smErpAuxiliaryCodeEntityList.map((item: any) => {
item.id = ""
})
await addObj(form)