From 8b863ccd9635548385fa18b93401befac7924a56 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Thu, 26 Dec 2024 17:28:43 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=93=8D=E5=BA=94=E5=BC=8F=E9=80=82=E9=85=8D?= =?UTF-8?q?=E3=80=82=E8=B6=85=E5=B8=82erp=E7=9A=84=E8=B4=A7=E5=95=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E6=96=B0=E5=A2=9E=E8=B4=A7=E5=95=86?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E3=80=82=E6=99=BA=E6=85=A7=E8=B6=85=E5=B8=82=E7=9A=84?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=96=B0=E5=A2=9E=E7=9A=84=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=92=8C=E5=93=81=E7=89=8C=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/supermarket/supermarketSpu.ts | 63 +- src/api/supermarketerp/smErpSupplier.ts | 56 +- src/views/admin/system/menu/form.vue | 447 +++++++------ src/views/admin/system/menu/i18n/en.ts | 71 +- src/views/admin/system/menu/i18n/zh-cn.ts | 59 +- src/views/home/index.vue | 31 +- .../nav-menu.vue => navMenu/index.vue} | 78 ++- src/views/home/widgets/index.vue | 7 +- src/views/supermarket/supermarketSpu/form.vue | 632 +++++++++--------- .../supermarketerp/smErpSupplier/form.vue | 264 ++++---- .../supermarketerp/smErpSupplier/index.vue | 254 +++---- 11 files changed, 1042 insertions(+), 920 deletions(-) rename src/views/home/{widgets/components/nav-menu.vue => navMenu/index.vue} (65%) 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 @@ 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 @@ diff --git a/src/views/home/widgets/components/nav-menu.vue b/src/views/home/navMenu/index.vue similarity index 65% rename from src/views/home/widgets/components/nav-menu.vue rename to src/views/home/navMenu/index.vue index 86bad6a..c2660de 100644 --- a/src/views/home/widgets/components/nav-menu.vue +++ b/src/views/home/navMenu/index.vue @@ -1,26 +1,18 @@ - - - + diff --git a/src/views/gen/design/form.vue b/src/views/gen/design/form.vue index 3b1652c..1b3f48a 100644 --- a/src/views/gen/design/form.vue +++ b/src/views/gen/design/form.vue @@ -13,7 +13,7 @@ - +supermarket_supermarketAuxiliaryCode_ supermarket_supermarketAuxiliaryCode_export \ No newline at end of file + diff --git a/src/views/supermarket/supermarketAuxiliaryCode/index.vue b/src/views/supermarket/supermarketAuxiliaryCode/index.vue index 18c03ef..487128c 100644 --- a/src/views/supermarket/supermarketAuxiliaryCode/index.vue +++ b/src/views/supermarket/supermarketAuxiliaryCode/index.vue @@ -1,132 +1,149 @@ \ No newline at end of file + diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue index d4a8d02..4657bdd 100644 --- a/src/views/supermarket/supermarketSpu/form.vue +++ b/src/views/supermarket/supermarketSpu/form.vue @@ -158,7 +158,7 @@ - + @@ -183,8 +183,25 @@ - Config - Role + aaaa + + + + + + + + @@ -204,6 +221,8 @@ import { useDict } from '/@/hooks/dict'; import { useMessage } from '/@/hooks/message'; import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu'; import { rule } from '/@/utils/validate'; +import { BasicTableProps, useTable } from '/@/hooks/table'; +import { fetchList } from '/@/api/supermarket/supermarketAuxiliaryCode'; const emit = defineEmits(['refresh']); const tabPaneEnum = ['基础信息', '包装单位', '辅助条码']; @@ -267,6 +286,24 @@ const { supermarket_nature, status } = useDict('supermarket_nature', 'status'); const categoryOptions = ref([]); // 商品分类的下拉选项 const brandOptions = ref([]); // 超市品牌的下拉选项 +// 辅助条码state +const auxiliaryCodeState: BasicTableProps = reactive({ + queryForm: {}, + pageList: fetchList, +}); +const auxiliaryCodeTableRef = ref(); +// 辅助条码多选变量 +const auxiliaryCodeSelectObjs = ref([]) as any; +const { getDataList: getAuxiliaryCodeList, tableStyle } = useTable(auxiliaryCodeState); +// 辅助条码多选事件 +const auxiliaryCodeSelectionChangHandle = (objs: { id: string }[]) => { + auxiliaryCodeSelectObjs.value = objs; +}; +// 表格行点击事件 +const HandleAuxiliaryCodeRowClick = (row: any) => { + auxiliaryCodeTableRef.value.toggleRowSelection(row); +}; + // 初始化表单数据 const getsupermarketSpuData = (id: string) => { // 获取数据 @@ -296,6 +333,7 @@ const openDialog = async (id: string) => { getsupermarketSpuData(id); } + // 获取分类选项 if (categoryOptions.value.length <= 0) { try { const res = await getSupermarketCategory(); @@ -305,6 +343,7 @@ const openDialog = async (id: string) => { } } + // 获取品牌选项 if (brandOptions.value.length <= 0) { try { const res = await getSupermarketBrand(); @@ -313,6 +352,9 @@ const openDialog = async (id: string) => { brandOptions.value = []; } } + + // 获取辅助条码列表 + getAuxiliaryCodeList(); }; // 提交 diff --git a/src/views/supermarket/supermarketUnit/form.vue b/src/views/supermarket/supermarketUnit/form.vue new file mode 100644 index 0000000..0e25370 --- /dev/null +++ b/src/views/supermarket/supermarketUnit/form.vue @@ -0,0 +1,138 @@ + + + diff --git a/src/views/supermarket/supermarketUnit/index.vue b/src/views/supermarket/supermarketUnit/index.vue new file mode 100644 index 0000000..2c74c03 --- /dev/null +++ b/src/views/supermarket/supermarketUnit/index.vue @@ -0,0 +1,149 @@ + + + From 42b7918ff18cea0fa3b8e821c596ef75265f422b Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 30 Dec 2024 10:51:16 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/supermarket/supermarketCategory.ts | 41 ++++++ .../supermarket/supermarketCategory/form.vue | 137 ++++++++++++++++++ .../supermarket/supermarketCategory/index.vue | 136 +++++++++++++++++ 3 files changed, 314 insertions(+) create mode 100644 src/api/supermarket/supermarketCategory.ts create mode 100644 src/views/supermarket/supermarketCategory/form.vue create mode 100644 src/views/supermarket/supermarketCategory/index.vue diff --git a/src/api/supermarket/supermarketCategory.ts b/src/api/supermarket/supermarketCategory.ts new file mode 100644 index 0000000..f1f3e39 --- /dev/null +++ b/src/api/supermarket/supermarketCategory.ts @@ -0,0 +1,41 @@ +import request from "/@/utils/request" + +export function fetchList(query?: Object) { + return request({ + url: '/supermarket/supermarketCategory/page', + method: 'get', + params: query + }) +} + +export function addObj(obj?: Object) { + return request({ + url: '/supermarket/supermarketCategory', + method: 'post', + data: obj + }) +} + +export function getObj(id?: string) { + return request({ + url: '/supermarket/supermarketCategory/' + id, + method: 'get' + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: '/supermarket/supermarketCategory', + method: 'delete', + data: ids + }) +} + +export function putObj(obj?: Object) { + return request({ + url: '/supermarket/supermarketCategory', + method: 'put', + data: obj + }) +} + diff --git a/src/views/supermarket/supermarketCategory/form.vue b/src/views/supermarket/supermarketCategory/form.vue new file mode 100644 index 0000000..8b9aa67 --- /dev/null +++ b/src/views/supermarket/supermarketCategory/form.vue @@ -0,0 +1,137 @@ + + + diff --git a/src/views/supermarket/supermarketCategory/index.vue b/src/views/supermarket/supermarketCategory/index.vue new file mode 100644 index 0000000..eb2508d --- /dev/null +++ b/src/views/supermarket/supermarketCategory/index.vue @@ -0,0 +1,136 @@ + + +