From 41d4439efe80fb45ee2f4761cf4db65225dc2bb9 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 8 Jan 2025 17:03:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/supermarketSpu/form.vue | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index f3dbe65..5b64478 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -19,11 +19,18 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -107,13 +114,6 @@
-
-
-
-
-
-
-
From 941320790571485f48cad09e2d43b261c36e68e3 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Wed, 8 Jan 2025 17:29:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B6=85=E5=B8=82=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80=E5=B9=B6=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=95=86=E6=88=B7=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/canteen/canteenOnlineSpu/form.vue | 1 +
.../supermarket/supermarketBrand/form.vue | 22 +-
.../supermarket/supermarketBrand/index.vue | 9 +-
.../supermarket/supermarketCategory/form.vue | 159 +++++++------
.../supermarket/supermarketCategory/index.vue | 18 +-
.../supermarketAuxiliaryCode/form.vue | 2 +-
.../components/supermarketUnit/form.vue | 18 +-
src/views/supermarket/supermarketSpu/form.vue | 82 ++++---
.../supermarketerp/smErpSupplier/form.vue | 24 +-
.../supermarketerp/smErpSupplier/index.vue | 16 +-
.../supermarketerp/smErpSupplierType/form.vue | 105 +++++----
.../smErpSupplierType/index.vue | 212 ++++++++++--------
12 files changed, 349 insertions(+), 319 deletions(-)
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index 42eb444..f909c89 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -163,6 +163,7 @@ const getcanteenOnlineSpuData = (id: string) => {
Object.assign(form, res.data, {
price: Number(displayPrice(res.data.price, '')),
marketPrice: Number(displayPrice(res.data.marketPrice, '')),
+ status: '' + res.data.status,
});
})
.finally(() => {
diff --git a/src/views/supermarket/supermarketBrand/form.vue b/src/views/supermarket/supermarketBrand/form.vue
index 77d67da..3bddb84 100644
--- a/src/views/supermarket/supermarketBrand/form.vue
+++ b/src/views/supermarket/supermarketBrand/form.vue
@@ -2,31 +2,37 @@
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
{{ item.label }}
@@ -61,6 +67,7 @@ const { status } = useDict('status');
// 提交表单数据
const form = reactive({
id: '',
+ merchantId: '',
name: '',
picUrl: '',
sort: 0,
@@ -70,6 +77,7 @@ const form = reactive({
// 定义校验规则
const dataRules = ref({
+ merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
name: [{ required: true, message: '品牌名称不能为空', trigger: 'blur' }],
sort: [{ validator: rule.number, trigger: 'blur' }],
});
diff --git a/src/views/supermarket/supermarketBrand/index.vue b/src/views/supermarket/supermarketBrand/index.vue
index aeb3663..af7a60f 100644
--- a/src/views/supermarket/supermarketBrand/index.vue
+++ b/src/views/supermarket/supermarketBrand/index.vue
@@ -50,15 +50,15 @@
-
-
+
+
-
+
@@ -92,11 +92,8 @@ import { fetchList, delObjs } from '/@/api/supermarket/supermarketBrand';
import { useMessage, useMessageBox } from '/@/hooks/message';
import { useDict } from '/@/hooks/dict';
-// 图片基础路径
-const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-// 定义查询字典
const { status } = useDict('status');
// 定义变量内容
diff --git a/src/views/supermarket/supermarketCategory/form.vue b/src/views/supermarket/supermarketCategory/form.vue
index 8b9aa67..609686e 100644
--- a/src/views/supermarket/supermarketCategory/form.vue
+++ b/src/views/supermarket/supermarketCategory/form.vue
@@ -1,103 +1,101 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.label }}
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/views/supermarket/supermarketCategory/index.vue b/src/views/supermarket/supermarketCategory/index.vue
index dc71454..95d0ef1 100644
--- a/src/views/supermarket/supermarketCategory/index.vue
+++ b/src/views/supermarket/supermarketCategory/index.vue
@@ -7,7 +7,7 @@
- 查询
+ 查询
重置
@@ -47,18 +47,22 @@
@sort-change="sortChangeHandle"
>
-
-
+
+
-
+
+
+
+
+
-
+
-
-
+
+
-
+
diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
index 0a9b3ce..78dd8eb 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
@@ -2,25 +2,25 @@
-
+
-
+
-
+
-
+
@@ -29,31 +29,31 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index f3dbe65..f851758 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -3,180 +3,178 @@
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{{ item.label }}
-
+
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
+
-
+
@@ -225,6 +223,7 @@ const tabPaneActiveName = computed(() => tabPaneEnum[currentTabPaneIndex.value])
// 提交表单数据
const form = reactive({
id: '',
+ merchantId: '',
productCode: '',
barcode: '',
productName: '',
@@ -238,7 +237,6 @@ const form = reactive({
costPrice: 0,
stock: 0,
giveIntegral: 0,
- merchantId: '',
specification: '',
origin: '',
packingQuantity: 0,
@@ -263,6 +261,7 @@ const form = reactive({
});
// 定义校验规则
const dataRules = {
+ merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
productCode: [{ required: true, message: '货号不能为空', trigger: 'blur' }],
barcode: [{ required: true, message: '自编码/条码不能为空', trigger: 'blur' }],
productName: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
@@ -271,7 +270,6 @@ const dataRules = {
brandId: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
status: [{ required: true, message: '请选择商品状态', trigger: 'blur' }],
- merchantId: [{ required: true, message: '商户编号不能为空', trigger: 'blur' }],
supplierId: [{ required: true, message: '请选择货商', trigger: 'blur' }],
supermarketUnitEntityList: [{ required: true, message: '请添加包装单位', trigger: 'change' }],
supermarketAuxiliaryCodeEntityList: [{ required: true, message: '请添加辅助条码', trigger: 'change' }],
diff --git a/src/views/supermarketerp/smErpSupplier/form.vue b/src/views/supermarketerp/smErpSupplier/form.vue
index 889611b..315cec9 100644
--- a/src/views/supermarketerp/smErpSupplier/form.vue
+++ b/src/views/supermarketerp/smErpSupplier/form.vue
@@ -2,13 +2,13 @@
-
+
-
+
@@ -22,55 +22,55 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{{ item.label }}
@@ -78,7 +78,7 @@
-
+
diff --git a/src/views/supermarketerp/smErpSupplier/index.vue b/src/views/supermarketerp/smErpSupplier/index.vue
index 0106c50..eedfced 100644
--- a/src/views/supermarketerp/smErpSupplier/index.vue
+++ b/src/views/supermarketerp/smErpSupplier/index.vue
@@ -60,9 +60,9 @@
- {{
- supplierType.length > 0 && supplierType?.find((item: any) => item.id == scope.row.supplierType)?.typeName
- }}
+
+ {{ supplierType.length > 0 && supplierType?.find((item: any) => item.id == scope.row.supplierType)?.typeName }}
+
@@ -82,11 +82,12 @@
type="primary"
v-auth="'supermarketerp_smErpSupplier_edit'"
@click="formDialogRef.openDialog(scope.row.supplierId)"
- >编辑
- 删除
+ 编辑
+
+
+ 删除
+
@@ -106,7 +107,6 @@ import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-// 定义查询字典
const { status } = useDict('status');
// 定义变量内容
diff --git a/src/views/supermarketerp/smErpSupplierType/form.vue b/src/views/supermarketerp/smErpSupplierType/form.vue
index e3d40bc..dc43588 100644
--- a/src/views/supermarketerp/smErpSupplierType/form.vue
+++ b/src/views/supermarketerp/smErpSupplierType/form.vue
@@ -1,71 +1,69 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/supermarketerp/smErpSupplierType/index.vue b/src/views/supermarketerp/smErpSupplierType/index.vue
index 2ab0258..ef2ecca 100644
--- a/src/views/supermarketerp/smErpSupplierType/index.vue
+++ b/src/views/supermarketerp/smErpSupplierType/index.vue
@@ -1,65 +1,96 @@
-
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
- 新 增
-
-
- 删除
-
-
-
-
-
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删 除
+
+
+
+
+
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
+
+
-
-
-
-