diff --git a/.env.production b/.env.production index c39c953..b150b78 100644 --- a/.env.production +++ b/.env.production @@ -2,8 +2,7 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/wmsapi' +VUE_APP_BASE_API = '/api' ## 配置 正式接口地址 -VUE_APP_URL = "https://supervise.yxtsoft.com" -VUE_APP_REPORT_URL = "" +VUE_APP_URL = "https://wms.yxtsoft.com" diff --git a/public/favicon.ico b/public/favicon.ico index 6401429..fea5aa5 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/loginImg/logo.png b/src/assets/loginImg/logo.png index ffeb81c..fea5aa5 100644 Binary files a/src/assets/loginImg/logo.png and b/src/assets/loginImg/logo.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 599facd..d02ff62 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,7 +1,7 @@ diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index ae7d453..40388ee 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -44,7 +44,7 @@ alwaysShow: true, component: 'baseInfo', meta: { - icon: 'el-icon-menu', + icon: 'el-icon-notebook-1', title: '基础信息' }, name: '/baseInfo', @@ -53,337 +53,641 @@ alwaysShow: true, component: 'brands', meta: { - icon: 'el-icon-help', - title: '品牌管理' + title: '仓库设置' }, name: '/baseInfo/brands', - path: '/baseInfo/brands' - }, { - alwaysShow: true, - component: 'category', - meta: { - icon: 'el-icon-help', - title: '类别管理' + path: '/baseInfo/brands', + children: [ + { + alwaysShow: true, + component: 'brands', + meta: { + title: '仓库管理' + }, + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, - name: '/baseInfo/category', - path: '/baseInfo/category' - }, - { - alwaysShow: true, - component: 'unit', - meta: { - icon: 'el-icon-help', - title: '单位管理' + { + alwaysShow: true, + component: 'brands', + meta: { + title: '库区管理' + }, + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, - name: '/baseInfo/unit', - path: '/baseInfo/unit' - }, - { - alwaysShow: true, - component: 'factory', - meta: { - icon: 'el-icon-help', - title: '厂家管理' + { + alwaysShow: true, + component: 'brands', + meta: { + title: '货架管理' + }, + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, - name: '/baseInfo/factory', - path: '/baseInfo/factory' + ] }, + { alwaysShow: true, - component: 'goods', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '商品管理' + title: '供应商管理' }, - name: '/baseInfo/goods', - path: '/baseInfo/goods' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, + + + // { + // alwaysShow: true, + // component: 'brands', + // meta: { + // icon: 'el-icon-help', + // title: '品牌管理' + // }, + // name: '/baseInfo/brands', + // path: '/baseInfo/brands' + // }, { + // alwaysShow: true, + // component: 'category', + // meta: { + // icon: 'el-icon-help', + // title: '类别管理' + // }, + // name: '/baseInfo/category', + // path: '/baseInfo/category' + // }, + // { + // alwaysShow: true, + // component: 'unit', + // meta: { + // icon: 'el-icon-help', + // title: '单位管理' + // }, + // name: '/baseInfo/unit', + // path: '/baseInfo/unit' + // }, + // { + // alwaysShow: true, + // component: 'factory', + // meta: { + // icon: 'el-icon-help', + // title: '厂家管理' + // }, + // name: '/baseInfo/factory', + // path: '/baseInfo/factory' + // }, + // { + // alwaysShow: true, + // component: 'goods', + // meta: { + // icon: 'el-icon-help', + // title: '商品管理' + // }, + // name: '/baseInfo/goods', + // path: '/baseInfo/goods' + // }, + // { + // alwaysShow: true, + // component: 'warehouse', + // meta: { + // icon: 'el-icon-help', + // title: '仓库管理' + // }, + // name: '/baseInfo/warehouse', + // path: '/baseInfo/warehouse' + // }, + // { + // alwaysShow: true, + // component: 'warehouseArea', + // meta: { + // icon: 'el-icon-help', + // title: '库区管理' + // }, + // name: '/baseInfo/warehouseArea', + // path: '/baseInfo/warehouseArea' + // }, + // { + // alwaysShow: true, + // component: 'warehouseAreaType', + // meta: { + // icon: 'el-icon-help', + // title: '库区类型管理' + // }, + // name: '/baseInfo/warehouseAreaType', + // path: '/baseInfo/warehouseAreaType' + // }, + // { + // alwaysShow: true, + // component: 'goodsShelves', + // meta: { + // icon: 'el-icon-help', + // title: '库位管理' + // }, + // name: '/baseInfo/goodsShelves', + // path: '/baseInfo/goodsShelves' + // } + + ] + }, + + + { + alwaysShow: true, + component: 'goods', + meta: { + icon: 'el-icon-coin', + title: '商品管理' + }, + name: '/goods', + path: '/goods', + children: [ + { alwaysShow: true, - component: 'warehouse', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '仓库管理' + title: '商品管理' }, - name: '/baseInfo/warehouse', - path: '/baseInfo/warehouse' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'warehouseArea', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '库区管理' + title: '商品类别' }, - name: '/baseInfo/warehouseArea', - path: '/baseInfo/warehouseArea' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'warehouseAreaType', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '库区类型管理' + title: '商品品牌' }, - name: '/baseInfo/warehouseAreaType', - path: '/baseInfo/warehouseAreaType' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, - { - alwaysShow: true, - component: 'goodsShelves', - meta: { - icon: 'el-icon-help', - title: '库位管理' - }, - name: '/baseInfo/goodsShelves', - path: '/baseInfo/goodsShelves' - } + ] }, { alwaysShow: true, - component: 'warehouse', + component: 'goods', meta: { - icon: 'el-icon-menu', - title: '仓库信息' + icon: 'el-icon-truck', + title: '入库管理' }, - name: '/warehouse', - path: '/warehouse', + name: '/goods', + path: '/goods', children: [ - { alwaysShow: true, - component: 'inStorage', - meta: { - icon: 'el-icon-help', - title: '入库管理' - }, - name: '/warehouse/inStorage', - path: '/warehouse/inStorage' - }, - - { - alwaysShow: true, - component: 'reservationInStorage', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '预约入库' + title: '入库预约' }, - name: '/warehouse/reservationInStorage', - path: '/warehouse/reservationInStorage' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'outStorage', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '出库管理' + title: '采购入库' }, - name: '/warehouse/outStorage', - path: '/warehouse/outStorage' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, - // { - // alwaysShow: true, - // component: 'distribution', - // meta: { - // icon: 'el-icon-help', - // title: '配货管理' - // }, - // name: '/warehouse/distribution', - // path: '/warehouse/distribution' - // }, { alwaysShow: true, - component: 'inventory', - meta: { - icon: 'el-icon-help', - title: '库存查询' - }, - name: '/warehouse/inventory', - path: '/warehouse/inventory' - }, { - alwaysShow: true, - component: 'inOutStorage', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '出入库查询' + title: '收货入库' }, - name: '/warehouse/inOutStorage', - path: '/warehouse/inOutStorage' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'stocktaking', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '盘点管理' + title: '销退预约' }, - name: '/warehouse/stocktaking', - path: '/warehouse/stocktaking' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'allocation', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '调拨管理' + title: '销退入库' }, - name: '/warehouse/allocation', - path: '/warehouse/allocation' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, + ] + }, + { + alwaysShow: true, + component: 'goods', + meta: { + icon: 'el-icon-shopping-cart-full', + title: '出库管理' + }, + name: '/goods', + path: '/goods', + children: [ { alwaysShow: true, - component: 'deliveryNotice', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '到货单管理' + title: '出库管理' }, - name: '/warehouse/deliveryNotice', - path: '/warehouse/deliveryNotice' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, + ] + }, + { + alwaysShow: true, + component: 'goods', + meta: { + icon: 'el-icon-takeaway-box', + title: '库存管理' + }, + name: '/goods', + path: '/goods', + children: [ { alwaysShow: true, - component: 'receivingGoods', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '收货单管理' + title: '盘点管理' }, - name: '/warehouse/receivingGoods', - path: '/warehouse/receivingGoods' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'upShelf', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '上架单管理' + title: '库存查询' }, - name: '/warehouse/upShelf', - path: '/warehouse/upShelf' + name: '/baseInfo/brands', + path: '/baseInfo/brands', + children: [ + { + alwaysShow: true, + component: 'brands', + meta: { + title: '库存总量' + }, + name: '/baseInfo/brands', + path: '/baseInfo/brands' + }, + { + alwaysShow: true, + component: 'brands', + meta: { + title: '库存警戒线' + }, + name: '/baseInfo/brands', + path: '/baseInfo/brands' + }, + ] }, + ] + }, + { + alwaysShow: true, + component: 'goods', + meta: { + icon: 'el-icon-bank-card', + title: '财务记账' + }, + name: '/goods', + path: '/goods', + children: [] + }, + { + alwaysShow: true, + component: 'goods', + meta: { + icon: 'el-icon-data-line', + title: '报表查询' + }, + name: '/goods', + path: '/goods', + children: [ { alwaysShow: true, - component: 'oldPartsFactory', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '旧件返厂' + title: '出入库查询' }, - name: '/warehouse/oldPartsFactory', - path: '/warehouse/oldPartsFactory' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, + ] + }, + { + alwaysShow: true, + component: 'goods', + meta: { + icon: 'el-icon-setting', + title: '系统管理' + }, + name: '/goods', + path: '/goods', + children: [ { alwaysShow: true, - component: 'oldPartsCope', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '旧件处理' + title: '用户管理' }, - name: '/warehouse/oldPartsCope', - path: '/warehouse/oldPartsCope' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'oldPartsRecovery', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '旧件回收' + title: '角色管理' }, - name: '/warehouse/oldPartsRecovery', - path: '/warehouse/oldPartsRecovery' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'oldPartsInStorage', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '旧件入库' + title: '安全设置' }, - name: '/warehouse/oldPartsInStorage', - path: '/warehouse/oldPartsInStorage' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, { alwaysShow: true, - component: 'oldPartsInvertory', + component: 'brands', meta: { - icon: 'el-icon-help', - title: '旧件库存' + title: '日志管理' }, - name: '/warehouse/oldPartsInvertory', - path: '/warehouse/oldPartsInvertory' + name: '/baseInfo/brands', + path: '/baseInfo/brands' }, - { - alwaysShow: true, - component: 'oldPartsInAndOutStorage', - meta: { - icon: 'el-icon-help', - title: '旧件出入库查询' - }, - name: '/warehouse/oldPartsInAndOutStorage', - path: '/warehouse/oldPartsInAndOutStorage' - } ] }, - { - path: '/inventory', - component: Layout, - redirect: '/inventory', - meta: { - title: '库存查询' - }, - children: [{ - path: '/inventory/inventory', - component: () => import('@/views/inventory/inventory.vue'), - name: 'Inventory', - meta: { - title: '库存查询', - noCache: true - } - }] - }, - { - path: '/storageage', - component: Layout, - redirect: '/storageage', - meta: { - title: '库龄查询' - }, - children: [{ - path: '/storageage/storageage', - component: () => import('@/views/storageage/storageage.vue'), - name: 'StorageAge', - meta: { - title: '库龄查询', - noCache: true - } - }] - }, - { - path: '/carryover', - component: Layout, - redirect: '/carryover', - meta: { - title: '结转查询' - }, - children: [{ - path: '/carryover/carryforwardrecord', - component: () => import('@/views/carryover/carryforwardrecord.vue'), - name: 'CarryForwardRecord', - meta: { - title: '结转记录查询', - noCache: true - } - }, - { - path: '/carryover/carryoverstock', - component: () => import('@/views/carryover/carryoverstock.vue'), - name: 'CarryoverStock', - meta: { - title: '结转库存查询', - noCache: true - } - } - ] - } + // { + // alwaysShow: true, + // component: 'warehouse', + // meta: { + // icon: 'el-icon-menu', + // title: '仓库信息' + // }, + // name: '/warehouse', + // path: '/warehouse', + // children: [ + + // { + // alwaysShow: true, + // component: 'inStorage', + // meta: { + // icon: 'el-icon-help', + // title: '入库管理' + // }, + // name: '/warehouse/inStorage', + // path: '/warehouse/inStorage' + // }, + + // { + // alwaysShow: true, + // component: 'reservationInStorage', + // meta: { + // icon: 'el-icon-help', + // title: '预约入库' + // }, + // name: '/warehouse/reservationInStorage', + // path: '/warehouse/reservationInStorage' + // }, + // { + // alwaysShow: true, + // component: 'outStorage', + // meta: { + // icon: 'el-icon-help', + // title: '出库管理' + // }, + // name: '/warehouse/outStorage', + // path: '/warehouse/outStorage' + // }, + // // { + // // alwaysShow: true, + // // component: 'distribution', + // // meta: { + // // icon: 'el-icon-help', + // // title: '配货管理' + // // }, + // // name: '/warehouse/distribution', + // // path: '/warehouse/distribution' + // // }, + // { + // alwaysShow: true, + // component: 'inventory', + // meta: { + // icon: 'el-icon-help', + // title: '库存查询' + // }, + // name: '/warehouse/inventory', + // path: '/warehouse/inventory' + // }, { + // alwaysShow: true, + // component: 'inOutStorage', + // meta: { + // icon: 'el-icon-help', + // title: '出入库查询' + // }, + // name: '/warehouse/inOutStorage', + // path: '/warehouse/inOutStorage' + // }, + // { + // alwaysShow: true, + // component: 'stocktaking', + // meta: { + // icon: 'el-icon-help', + // title: '盘点管理' + // }, + // name: '/warehouse/stocktaking', + // path: '/warehouse/stocktaking' + // }, + // { + // alwaysShow: true, + // component: 'allocation', + // meta: { + // icon: 'el-icon-help', + // title: '调拨管理' + // }, + // name: '/warehouse/allocation', + // path: '/warehouse/allocation' + // }, + // { + // alwaysShow: true, + // component: 'deliveryNotice', + // meta: { + // icon: 'el-icon-help', + // title: '到货单管理' + // }, + // name: '/warehouse/deliveryNotice', + // path: '/warehouse/deliveryNotice' + // }, + // { + // alwaysShow: true, + // component: 'receivingGoods', + // meta: { + // icon: 'el-icon-help', + // title: '收货单管理' + // }, + // name: '/warehouse/receivingGoods', + // path: '/warehouse/receivingGoods' + // }, + // { + // alwaysShow: true, + // component: 'upShelf', + // meta: { + // icon: 'el-icon-help', + // title: '上架单管理' + // }, + // name: '/warehouse/upShelf', + // path: '/warehouse/upShelf' + // }, + // { + // alwaysShow: true, + // component: 'oldPartsFactory', + // meta: { + // icon: 'el-icon-help', + // title: '旧件返厂' + // }, + // name: '/warehouse/oldPartsFactory', + // path: '/warehouse/oldPartsFactory' + // }, + // { + // alwaysShow: true, + // component: 'oldPartsCope', + // meta: { + // icon: 'el-icon-help', + // title: '旧件处理' + // }, + // name: '/warehouse/oldPartsCope', + // path: '/warehouse/oldPartsCope' + // }, + // { + // alwaysShow: true, + // component: 'oldPartsRecovery', + // meta: { + // icon: 'el-icon-help', + // title: '旧件回收' + // }, + // name: '/warehouse/oldPartsRecovery', + // path: '/warehouse/oldPartsRecovery' + // }, + // { + // alwaysShow: true, + // component: 'oldPartsInStorage', + // meta: { + // icon: 'el-icon-help', + // title: '旧件入库' + // }, + // name: '/warehouse/oldPartsInStorage', + // path: '/warehouse/oldPartsInStorage' + // }, + // { + // alwaysShow: true, + // component: 'oldPartsInvertory', + // meta: { + // icon: 'el-icon-help', + // title: '旧件库存' + // }, + // name: '/warehouse/oldPartsInvertory', + // path: '/warehouse/oldPartsInvertory' + // }, + // { + // alwaysShow: true, + // component: 'oldPartsInAndOutStorage', + // meta: { + // icon: 'el-icon-help', + // title: '旧件出入库查询' + // }, + // name: '/warehouse/oldPartsInAndOutStorage', + // path: '/warehouse/oldPartsInAndOutStorage' + // } + // ] + // }, + + + // { + // path: '/inventory', + // component: Layout, + // redirect: '/inventory', + // meta: { + // title: '库存查询' + // }, + // children: [{ + // path: '/inventory/inventory', + // component: () => import('@/views/inventory/inventory.vue'), + // name: 'Inventory', + // meta: { + // title: '库存查询', + // noCache: true + // } + // }] + // }, + // { + // path: '/storageage', + // component: Layout, + // redirect: '/storageage', + // meta: { + // title: '库龄查询' + // }, + // children: [{ + // path: '/storageage/storageage', + // component: () => import('@/views/storageage/storageage.vue'), + // name: 'StorageAge', + // meta: { + // title: '库龄查询', + // noCache: true + // } + // }] + // }, + // { + // path: '/carryover', + // component: Layout, + // redirect: '/carryover', + // meta: { + // title: '结转查询' + // }, + // children: [{ + // path: '/carryover/carryforwardrecord', + // component: () => import('@/views/carryover/carryforwardrecord.vue'), + // name: 'CarryForwardRecord', + // meta: { + // title: '结转记录查询', + // noCache: true + // } + // }, + // { + // path: '/carryover/carryoverstock', + // component: () => import('@/views/carryover/carryoverstock.vue'), + // name: 'CarryoverStock', + // meta: { + // title: '结转库存查询', + // noCache: true + // } + // } + // ] + // } ] } }, diff --git a/src/settings.js b/src/settings.js index 76c3128..e4399ab 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '仓储管理', + title: '商享通WMS', /** * @type {boolean} true | false diff --git a/vue.config.js b/vue.config.js index bf9a4cf..da1a366 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,7 +6,7 @@ function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || '仓储管理' // page title +const name = defaultSettings.title || '商享通WMS' // page title // 如果端口设置为80， // 使用管理员权限执行命令行。