From 1fa746d6cb8abdc520af1840c1b47c8d185a1401 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 22 Jul 2024 17:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 56 ++++++++++++ pages/entry/empty-tray-to-store.vue | 102 +++++++++++++++++++++ pages/entry/group-to-store.vue | 117 ++++++++++++++++++++++++ pages/home/home.vue | 101 ++++++++++++++++---- pages/in/store-info.vue | 19 ++++ pages/login/login.vue | 2 +- pages/login/upgrade.vue | 2 +- pages/outbound/empty-tray-out-store.vue | 90 ++++++++++++++++++ pages/outbound/out-store-confirm.vue | 19 ++++ pages/pick/pick-task.vue | 19 ++++ pages/task/equip-task-manage.vue | 19 ++++ static/image/menu/RF01.png | Bin 4185 -> 3870 bytes static/image/menu/RF02.png | Bin 2390 -> 2456 bytes static/image/menu/RF03.png | Bin 3065 -> 1846 bytes static/image/menu/RF04.png | Bin 2394 -> 3239 bytes static/image/menu/RF05.png | Bin 2265 -> 2601 bytes static/image/menu/RF07.png | Bin 2456 -> 0 bytes static/image/menu/RF09.png | Bin 2601 -> 0 bytes 18 files changed, 526 insertions(+), 20 deletions(-) create mode 100644 pages/entry/empty-tray-to-store.vue create mode 100644 pages/entry/group-to-store.vue create mode 100644 pages/in/store-info.vue create mode 100644 pages/outbound/empty-tray-out-store.vue create mode 100644 pages/outbound/out-store-confirm.vue create mode 100644 pages/pick/pick-task.vue create mode 100644 pages/task/equip-task-manage.vue delete mode 100644 static/image/menu/RF07.png delete mode 100644 static/image/menu/RF09.png diff --git a/pages.json b/pages.json index 76958a1..7b3d408 100644 --- a/pages.json +++ b/pages.json @@ -96,6 +96,62 @@ } } + ,{ + "path" : "pages/entry/group-to-store", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/entry/empty-tray-to-store", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/outbound/empty-tray-out-store", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/outbound/out-store-confirm", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/in/store-info", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/pick/pick-task", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/task/equip-task-manage", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue new file mode 100644 index 0000000..6b84cd4 --- /dev/null +++ b/pages/entry/empty-tray-to-store.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue new file mode 100644 index 0000000..6a0a262 --- /dev/null +++ b/pages/entry/group-to-store.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index 72d40c9..6b63722 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -5,7 +5,7 @@ {{userName}} - 欢迎进入华弘手持系统! + 欢迎进入恒森WMS手持系统! @@ -15,14 +15,23 @@ - - + + {{e.title}} + + {{title}} + + + {{e.title}} + + + + @@ -32,18 +41,17 @@ return { userName: '', menuList: [ - {id: 1, title: '拆包机搬运', icon: 'RF01', path: '/pages/manage/cbj-carry'}, - {id: 2, title: '压机搬运', icon: 'RF02', path: '/pages/manage/press-carry'}, - {id: 3, title: '物料报废', icon: 'RF03', path: '/pages/manage/mater-scrap'}, - {id: 4, title: '人工分拣', icon: 'RF04', path: '/pages/manage/man-sort'}, - {id: 5, title: '任务管理', icon: 'RF05', path: '/pages/manage/task-manage'}, - {id: 6, title: '指令管理', icon: 'RF06', path: '/pages/manage/inst-manage'}, - {id: 7, title: '压制混碾满料搬运', icon: 'RF07', path: '/pages/manage/yzhnml-carry'}, - {id: 8, title: '条码解绑', icon: 'RF08', path: '/pages/manage/vehicle-unbind'}, - {id: 9, title: '组盘查看', icon: 'RF09', path: '/pages/manage/group-task'} + {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]}, + {title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/empty-tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]}, + {title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', path: '/pages/in/store-info'}]}, + {title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]}, + {title: '盘点管理', path: 'RF05', sonTree: [{title: '盘点作业', path: '/pages/check/check-task'}]}, + {title: '任务管理', path: 'RF06', sonTree: [{title: '设备作业管理', path: '/pages/task/equip-task-manage'}]} ], show: false, - secM: [] + secM: [], + icon: '', + title: '' }; }, created () { @@ -52,12 +60,16 @@ } }, methods: { - async _authority () { - let res = await authority() - this.menuList = [...res.sonTree] - + toPage1 (e) { + if (e.sonTree.length > 0) { + this.show = true + this.secM = e.sonTree + + this.icon = e.path + this.title = e.title + } }, - toPage (e) { + toPage2 (e) { let url = e.path + '?title=' + e.title uni.redirectTo({ url: url @@ -153,4 +165,57 @@ .menu-name _font(28rpx, 38rpx, #444,,center) padding 0 20rpx +.sec_menu_wraper + position fixed + bottom 0 + left 0 + width 100% + background-color #f4f5f5 + box-shadow 0 -8px 16px 0 rgba(28,31,33,.1) + border-top-left-radius 20rpx + border-top-right-radius 20rpx + z-index 2017 + transition all .3s +.modal + position fixed + bottom 0 + left 0 + _wh(100%, 100%) + background-color rgba(0,0,0,0.8) + z-index 2010 +.sec_menu_w + width calc(100% - 76rpx) + margin 30rpx auto 60rpx auto + _fj(flex-start) + flex-wrap wrap +.sec_menu-item + _wh(30%, 120rpx) + margin-bottom 20rpx + border-radius 10rpx + background-size 40% auto + background-position right 90% + background-repeat no-repeat + &:nth-child(3n+2) + margin-left 5% + margin-right 5% + &:nth-child(5n+1) .menu-name_inner + background linear-gradient(to right, rgba(73,102,255,0.8) 0%, rgba(117,142,255,0.8) 100%) + &:nth-child(5n+2) .menu-name_inner + background linear-gradient(to right, rgba(254, 168, 20,0.8) 0%, rgba(255, 177, 1,0.8) 100%) + &:nth-child(5n+3) .menu-name_inner + background linear-gradient(to right, rgba(0, 228, 153,0.8) 0%, rgba(0, 241, 197,0.8) 100%) + &:nth-child(5n+4) .menu-name_inner + background linear-gradient(to right, rgba(162, 86, 171,0.8) 0%, rgba(183,120,190,0.8) 100%) + &:nth-child(5n+5) .menu-name_inner + background linear-gradient(to right, rgba(146, 94, 52,0.8) 0%, rgba(162, 116, 79,0.8) 100%) +.menu-name_inner + _wh(100%, 100%) + _fj(center) + _font(28rpx, 30rpx, #fff, 700, center) + border-radius 10rpx + padding 10rpx + overflow hidden +.pop-title + margin 60rpx 38rpx 0 38rpx + _font(30rpx, 60rpx, #000,700,center) diff --git a/pages/in/store-info.vue b/pages/in/store-info.vue new file mode 100644 index 0000000..239d03a --- /dev/null +++ b/pages/in/store-info.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/pages/login/login.vue b/pages/login/login.vue index 1373267..b5755ef 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,7 +1,7 @@