From 8e22166f2ea3b96ad8d2d5beda7c2b19eb85bc46 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 31 Dec 2024 17:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E5=88=86=E7=B1=BB=E6=97=B6?=
=?UTF-8?q?=E6=AE=B5=E6=94=B9=E4=B8=BA=E5=A4=9A=E9=80=89=E3=80=82=E5=95=86?=
=?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=E6=98=BE=E7=A4=BA=E5=B0=81=E9=9D=A2?=
=?UTF-8?q?=E5=9B=BE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/canteen/canteenCategory/form.vue | 167 +++++++--------
src/views/canteen/canteenCategory/index.vue | 201 +++++++++---------
src/views/supermarket/supermarketSpu/form.vue | 24 +--
.../supermarket/supermarketSpu/index.vue | 11 +-
4 files changed, 204 insertions(+), 199 deletions(-)
diff --git a/src/views/canteen/canteenCategory/form.vue b/src/views/canteen/canteenCategory/form.vue
index ad333f8..b38dc3f 100644
--- a/src/views/canteen/canteenCategory/form.vue
+++ b/src/views/canteen/canteenCategory/form.vue
@@ -1,101 +1,99 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue
index 3da8798..f00ea30 100644
--- a/src/views/canteen/canteenCategory/index.vue
+++ b/src/views/canteen/canteenCategory/index.vue
@@ -1,135 +1,134 @@
-
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
- 新 增
-
-
- 删除
-
-
-
-
-
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
+ @sort-change="sortChangeHandle"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
-
-
-
-
+
+
+
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index cd071cc..b445e05 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -1,8 +1,8 @@
-
-
+
+
@@ -27,7 +27,7 @@
-
+
@@ -183,10 +183,10 @@
-
+
-
+
@@ -213,6 +213,7 @@ import { fetchList } from '/@/api/supermarketerp/smErpSupplier';
import { rule } from '/@/utils/validate';
import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
import supermarketUnit from './components/supermarketUnit/index.vue';
+import { TabPaneName } from 'element-plus';
const emit = defineEmits(['refresh']);
@@ -310,6 +311,7 @@ const getsupermarketSpuData = (id: string) => {
// 打开弹窗
const openDialog = async (id: string) => {
visible.value = true;
+ currentTabPaneIndex.value = 0;
form.id = '';
form.supermarketUnitEntityList = [];
form.supermarketAuxiliaryCodeEntityList = [];
@@ -356,6 +358,11 @@ const openDialog = async (id: string) => {
}
};
+// tab栏切换
+const handleTabChange = (name: TabPaneName) => {
+ currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name);
+};
+
// 提交
const onSubmit = async () => {
console.log(form);
@@ -391,10 +398,3 @@ defineExpose({
openDialog,
});
-
-
diff --git a/src/views/supermarket/supermarketSpu/index.vue b/src/views/supermarket/supermarketSpu/index.vue
index cf54c36..e39e767 100644
--- a/src/views/supermarket/supermarketSpu/index.vue
+++ b/src/views/supermarket/supermarketSpu/index.vue
@@ -60,11 +60,15 @@
- {{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId).name }}
+ {{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
-
-
+
+
+
+
+
+
@@ -112,6 +116,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table';
import { fetchList, delObjs, getSupermarketCategory } from '/@/api/supermarket/supermarketSpu';
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'));