From 3e0b0bbe8f58c364234bcf035b4fc4813911cf28 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 10:55:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
=?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E5=AE=8C=E6=95=B4=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/supermarketSpu/form.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index ad8eb77..45fc134 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -352,6 +352,7 @@ const onSubmit = async () => {
console.log(form);
const valid = await dataFormRef.value.validate().catch(() => {});
+ if (!valid) useMessage().warning('基础信息必填项未填写完整');
if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0) useMessage().warning('请添加包装单位');
if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0) useMessage().warning('请添加辅助条码');
if (!valid) return false;
From f7ba21ac8f7258c18fdbf8ca02b53962efaf8cc8 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 13:06:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E5=95=86?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/supermarketSpu/form.vue | 80 +++++++++----------
1 file changed, 39 insertions(+), 41 deletions(-)
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index fd36bde..48d9007 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -110,40 +110,40 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,11 +156,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -207,9 +207,7 @@
import { useDict } from '/@/hooks/dict';
import { useMessage } from '/@/hooks/message';
import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu';
-import { getObj as getSupermarketUnit } from '/@/api/supermarket/supermarketUnit';
-import { getObj as getSupermarketAuxiliaryCode } from '/@/api/supermarket/supermarketAuxiliaryCode';
-import { fetchList } from '/@/api/supermarketerp/smErpSupplier';
+import { getSupplierTypeOptions } from '/@/api/supermarketerp/smErpSupplier';
import { rule } from '/@/utils/validate';
import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
import supermarketUnit from './components/supermarketUnit/index.vue';
@@ -334,8 +332,8 @@ const openDialog = async (id: string) => {
// 获取货商选项
if (supplierOptions.value.length <= 0) {
try {
- const res = await fetchList();
- supplierOptions.value = res.data.records;
+ const res = await getSupplierTypeOptions();
+ supplierOptions.value = res.data;
} catch (error) {
supplierOptions.value = [];
}