diff --git a/src/api/supermarket/supermarketSpu.ts b/src/api/supermarket/supermarketSpu.ts
index 22c1aa6..0e51f14 100644
--- a/src/api/supermarket/supermarketSpu.ts
+++ b/src/api/supermarket/supermarketSpu.ts
@@ -1,41 +1,54 @@
-import request from "/@/utils/request"
+import request from '/@/utils/request';
export function fetchList(query?: Object) {
- return request({
- url: '/supermarket/supermarketSpu/page',
- method: 'get',
- params: query
- })
+ return request({
+ url: '/supermarket/supermarketSpu/page',
+ method: 'get',
+ params: query,
+ });
}
export function addObj(obj?: Object) {
- return request({
- url: '/supermarket/supermarketSpu',
- method: 'post',
- data: obj
- })
+ return request({
+ url: '/supermarket/supermarketSpu',
+ method: 'post',
+ data: obj,
+ });
}
export function getObj(id?: string) {
- return request({
- url: '/supermarket/supermarketSpu/' + id,
- method: 'get'
- })
+ return request({
+ url: '/supermarket/supermarketSpu/' + id,
+ method: 'get',
+ });
}
export function delObjs(ids?: Object) {
- return request({
- url: '/supermarket/supermarketSpu',
- method: 'delete',
- data: ids
- })
+ return request({
+ url: '/supermarket/supermarketSpu',
+ method: 'delete',
+ data: ids,
+ });
}
export function putObj(obj?: Object) {
- return request({
- url: '/supermarket/supermarketSpu',
- method: 'put',
- data: obj
- })
+ return request({
+ url: '/supermarket/supermarketSpu',
+ method: 'put',
+ data: obj,
+ });
}
+export function getSupermarketCategory(): any {
+ return request({
+ url: '/supermarket/supermarketCategory/simpleAll',
+ method: 'get',
+ });
+}
+
+export function getSupermarketBrand(): any {
+ return request({
+ url: '/supermarket/supermarketBrand/simpleAll',
+ method: 'get',
+ });
+}
diff --git a/src/api/supermarketerp/smErpSupplier.ts b/src/api/supermarketerp/smErpSupplier.ts
index 423b0c4..034bc16 100644
--- a/src/api/supermarketerp/smErpSupplier.ts
+++ b/src/api/supermarketerp/smErpSupplier.ts
@@ -1,41 +1,47 @@
-import request from "/@/utils/request"
+import request from '/@/utils/request';
export function fetchList(query?: Object) {
- return request({
- url: '/supermarketerp/smErpSupplier/page',
- method: 'get',
- params: query
- })
+ return request({
+ url: '/supermarketerp/smErpSupplier/page',
+ method: 'get',
+ params: query,
+ });
}
export function addObj(obj?: Object) {
- return request({
- url: '/supermarketerp/smErpSupplier',
- method: 'post',
- data: obj
- })
+ return request({
+ url: '/supermarketerp/smErpSupplier',
+ method: 'post',
+ data: obj,
+ });
}
export function getObj(id?: string) {
- return request({
- url: '/supermarketerp/smErpSupplier/' + id,
- method: 'get'
- })
+ return request({
+ url: '/supermarketerp/smErpSupplier/' + id,
+ method: 'get',
+ });
}
export function delObjs(ids?: Object) {
- return request({
- url: '/supermarketerp/smErpSupplier',
- method: 'delete',
- data: ids
- })
+ return request({
+ url: '/supermarketerp/smErpSupplier',
+ method: 'delete',
+ data: ids,
+ });
}
export function putObj(obj?: Object) {
- return request({
- url: '/supermarketerp/smErpSupplier',
- method: 'put',
- data: obj
- })
+ return request({
+ url: '/supermarketerp/smErpSupplier',
+ method: 'put',
+ data: obj,
+ });
}
+export function getSupplierTypeOptions(): any {
+ return request({
+ url: '/supermarketerp/smErpSupplierType/simpleAll',
+ method: 'get',
+ });
+}
diff --git a/src/views/admin/system/menu/form.vue b/src/views/admin/system/menu/form.vue
index 0cf2666..db8f59c 100644
--- a/src/views/admin/system/menu/form.vue
+++ b/src/views/admin/system/menu/form.vue
@@ -1,127 +1,138 @@
-
-
-
-
- 菜单
- 按钮
-
-
-
-
-
-
-
-
- {{ state.ruleForm.menuType === '0' ? t('sysmenu.name') : t('sysmenu.buttonName') }}
-
-
-
-
-
-
-
-
- {{ t('sysmenu.permission') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('sysmenu.keepAlive') }}
-
-
-
- 否
- 是
-
-
-
-
-
- {{ $t('sysmenu.visible') }}
-
-
-
- 否
- 是
-
-
-
-
-
-
-
- {{ $t('sysmenu.param') }}
-
-
-
- 否
- 是
-
-
-
-
-
- {{ $t('sysmenu.embedded') }}
-
-
-
- 否
- 是
-
-
-
-
+
+
+
+
+ 菜单
+ 按钮
+
+
+
+
+
+
+
+
+ {{ state.ruleForm.menuType === '0' ? t('sysmenu.name') : t('sysmenu.buttonName') }}
+
+
+
+
+
+
+
+
+ {{ t('sysmenu.permission') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('sysmenu.keepAlive') }}
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+ {{ $t('sysmenu.visible') }}
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+
+
+ {{ $t('sysmenu.param') }}
+
+
+
+ 否
+ 是
+
+
+
+
+
+
+ {{ $t('sysmenu.embedded') }}
+
+
+
+ 否
+ 是
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/src/views/admin/system/menu/i18n/en.ts b/src/views/admin/system/menu/i18n/en.ts
index 29149d0..db73035 100644
--- a/src/views/admin/system/menu/i18n/en.ts
+++ b/src/views/admin/system/menu/i18n/en.ts
@@ -1,37 +1,38 @@
export default {
- sysmenu: {
- index: '#',
- name: 'menu name',
- buttonName: 'button name',
- sortOrder: 'sortOrder',
- path: 'path',
- menuType: 'menuType',
- keepAlive: 'keepAlive',
- permission: 'permission',
- inputNameTip: 'input name',
- parentId: 'parent menu',
- embedded: 'embedded',
- param: 'param',
- component: 'component',
- visible: 'visible',
- icon: 'icon',
- inputMenuIdTip: 'input menuId',
- inputPermissionTip: 'input permission',
- inputPathTip: 'input path',
- inputParentIdTip: 'input parentId',
- inputIconTip: 'input icon',
- inputVisibleTip: 'input visible',
- inputSortOrderTip: 'input sortOrder',
- inputKeepAliveTip: 'input keepAlive',
- inputMenuTypeTip: 'input menuType',
- inputCreateByTip: 'input createBy',
- inputCreateTimeTip: 'input createTime',
- inputUpdateByTip: 'input updateBy',
- inputUpdateTimeTip: 'input updateTime',
- inputDelFlagTip: 'input delFlag',
- inputTenantIdTip: 'input tenantId',
- inputEmbeddedTip: 'input embedded',
- inputComponentTip: 'input component',
- deleteDisabledTip: 'menu inclusion subordinates cannot be deleted',
- },
+ sysmenu: {
+ index: '#',
+ name: 'menu name',
+ buttonName: 'button name',
+ sortOrder: 'sortOrder',
+ path: 'path',
+ menuType: 'menuType',
+ keepAlive: 'keepAlive',
+ permission: 'permission',
+ inputNameTip: 'input name',
+ parentId: 'parent menu',
+ embedded: 'embedded',
+ param: 'param',
+ component: 'component',
+ visible: 'visible',
+ icon: 'icon',
+ homeIcon: 'homeIcon',
+ inputMenuIdTip: 'input menuId',
+ inputPermissionTip: 'input permission',
+ inputPathTip: 'input path',
+ inputParentIdTip: 'input parentId',
+ inputIconTip: 'input icon',
+ inputVisibleTip: 'input visible',
+ inputSortOrderTip: 'input sortOrder',
+ inputKeepAliveTip: 'input keepAlive',
+ inputMenuTypeTip: 'input menuType',
+ inputCreateByTip: 'input createBy',
+ inputCreateTimeTip: 'input createTime',
+ inputUpdateByTip: 'input updateBy',
+ inputUpdateTimeTip: 'input updateTime',
+ inputDelFlagTip: 'input delFlag',
+ inputTenantIdTip: 'input tenantId',
+ inputEmbeddedTip: 'input embedded',
+ inputComponentTip: 'input component',
+ deleteDisabledTip: 'menu inclusion subordinates cannot be deleted',
+ },
};
diff --git a/src/views/admin/system/menu/i18n/zh-cn.ts b/src/views/admin/system/menu/i18n/zh-cn.ts
index 506901a..8095a1d 100644
--- a/src/views/admin/system/menu/i18n/zh-cn.ts
+++ b/src/views/admin/system/menu/i18n/zh-cn.ts
@@ -1,31 +1,32 @@
export default {
- sysmenu: {
- index: '#',
- name: '菜单名称',
- buttonName: '按钮名称',
- sortOrder: '排序',
- path: '路由',
- menuType: '类型',
- keepAlive: '缓冲',
- permission: '权限标识',
- inputNameTip: '请输入菜单名称',
- parentId: '上级菜单',
- embedded: '内嵌',
- param: '带参',
- component: '组件',
- visible: '显示',
- icon: '图标',
- inputMenuIdTip: '',
- inputPermissionTip: '请输入权限标识',
- inputPathTip: '请输入路由路径',
- inputParentIdTip: '请选择上级菜单',
- inputIconTip: '请选择图标',
- inputVisibleTip: '请选择是否显示',
- inputSortOrderTip: '请输入排序',
- inputKeepAliveTip: '请选择是否缓冲',
- inputMenuTypeTip: '请选择菜单类型',
- inputEmbeddedTip: '请选择是否内嵌',
- inputComponentTip: '请输入组件名称',
- deleteDisabledTip: '菜单包含下级不能删除',
- },
+ sysmenu: {
+ index: '#',
+ name: '菜单名称',
+ buttonName: '按钮名称',
+ sortOrder: '排序',
+ path: '路由',
+ menuType: '类型',
+ keepAlive: '缓冲',
+ permission: '权限标识',
+ inputNameTip: '请输入菜单名称',
+ parentId: '上级菜单',
+ embedded: '内嵌',
+ param: '带参',
+ component: '组件',
+ visible: '显示',
+ icon: '图标',
+ homeIcon: '首页图标',
+ inputMenuIdTip: '',
+ inputPermissionTip: '请输入权限标识',
+ inputPathTip: '请输入路由路径',
+ inputParentIdTip: '请选择上级菜单',
+ inputIconTip: '请选择图标',
+ inputVisibleTip: '请选择是否显示',
+ inputSortOrderTip: '请输入排序',
+ inputKeepAliveTip: '请选择是否缓冲',
+ inputMenuTypeTip: '请选择菜单类型',
+ inputEmbeddedTip: '请选择是否内嵌',
+ inputComponentTip: '请输入组件名称',
+ deleteDisabledTip: '菜单包含下级不能删除',
+ },
};
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index e3ecbb5..62575c1 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,24 +1,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -38,6 +30,7 @@ const loading = ref(false);
const navMenuList = ref([]);
const navMenuListTop = ref([]);
const currentActiveMenuId = ref('');
+const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
// 获取菜单列表
const getNavMenuList = async () => {
@@ -48,7 +41,7 @@ const getNavMenuList = async () => {
});
if (res.code == 0 && res.data.length > 0) {
navMenuList.value = res.data;
- navMenuListTop.value = res.data.map((item: any) => ({ id: item.id, name: item.name, path: item.path }));
+ navMenuListTop.value = res.data.map((item: any) => ({ id: item.id, name: item.name, path: item.path, menuPic: item.menuPic }));
}
} catch (error) {
navMenuList.value = [];
@@ -62,7 +55,7 @@ const navMenuListBottom = computed(() => {
if (navMenuList.value) {
const currentMenuItem = navMenuList.value.find((item: any) => item.id == currentActiveMenuId.value);
if (currentMenuItem && currentMenuItem.children) {
- return currentMenuItem.children.map((item: any) => ({ id: item.id, name: item.name, path: item.path }));
+ return currentMenuItem.children.map((item: any) => ({ id: item.id, name: item.name, path: item.path, menuPic: item.menuPic }));
}
} else {
return [];
@@ -80,9 +73,9 @@ onMounted(async () => {
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index 9a3eb90..13561d0 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -150,7 +150,6 @@ const allCompsList = computed(() => {
const myCompsList = computed(() => {
// 支持列表
const myGrid = [
- 'nav-menu',
'calendar',
'current-user',
'news',
@@ -229,9 +228,9 @@ onMounted(() => {