diff --git a/pages.json b/pages.json index 1860990..63fc9fa 100644 --- a/pages.json +++ b/pages.json @@ -94,6 +94,14 @@ "navigationStyle": "custom" } } + ,{ + "path" : "pages/modules/pallet-add-record", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index fc4cffc..c8135c4 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -36,6 +36,19 @@ }; }, created () { + this.menuList = [ + // {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/man-paichan'}, + // {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'}, + // {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/modules/mater-inventory'} + {id: '1', name: '原材料入库', icon: 'RF04', path: '/pages/modules/rawmater-instore'}, + {id: '2', name: '原材料出库', icon: 'RF06', path: '/pages/modules/rawmater-outstore'}, + {id: '3', name: '搬运任务', icon: 'RF07', path: '/pages/modules/carry-task'}, + {id: '4', name: '组盘解绑', icon: 'RF08', path: '/pages/modules/zupan-unbind'}, + {id: '5', name: '指令管理', icon: 'RF01', path: '/pages/modules/zlmanage'}, + {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, + {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}, + {id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'} + ] if (this.roles === 'A1,A2,') { this.menuList = [ // {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/man-paichan'}, @@ -47,7 +60,8 @@ {id: '4', name: '组盘解绑', icon: 'RF04', path: '/pages/modules/zupan-unbind'}, {id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'}, {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, - {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'} + {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}, + {id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'} ] } if (this.roles === 'A1,') { @@ -56,7 +70,8 @@ {id: '2', name: '原材料出库', icon: 'RF07', path: '/pages/modules/rawmater-outstore'}, {id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'}, {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, - {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'} + {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}, + {id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'} ] } if (this.roles === 'A2,') { diff --git a/pages/login/login.vue b/pages/login/login.vue index 401b4ae..355dcfb 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -164,7 +164,7 @@ _wh(80%, 100%) right 0 bottom 0 - opacity: 0.3 + opacity: 0.2 _bis('../../static/image/bg.png', 100%,,bottom) .form-wraper width 100% diff --git a/pages/modules/pallet-add-record.vue b/pages/modules/pallet-add-record.vue new file mode 100644 index 0000000..f47e33e --- /dev/null +++ b/pages/modules/pallet-add-record.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png index d2b969b..6417a79 100644 Binary files a/static/image/menu/RF04.png and b/static/image/menu/RF04.png differ diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png index 775f2e8..1c72599 100644 Binary files a/static/image/menu/RF05.png and b/static/image/menu/RF05.png differ diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png index af989ff..7e9ddd2 100644 Binary files a/static/image/menu/RF06.png and b/static/image/menu/RF06.png differ diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png index 30c871f..78cca87 100644 Binary files a/static/image/menu/RF08.png and b/static/image/menu/RF08.png differ diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png index 972a492..ab42ca3 100644 Binary files a/static/image/menu/RF09.png and b/static/image/menu/RF09.png differ diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png index 15c177a..a6b7439 100644 Binary files a/static/image/menu/RF10.png and b/static/image/menu/RF10.png differ diff --git a/utils/getData02.js b/utils/getData02.js index 97465e1..f10cfad 100644 --- a/utils/getData02.js +++ b/utils/getData02.js @@ -41,3 +41,14 @@ export const handTaskoperation = (type, id) => request({ task_uuid: id } }) + +/** + * 托盘号补录--c + */ +export const handRecord = (st, mt) => request({ + url:'api/hand/record', + data: { + sub_tray: st, + mother_tray: mt + } +})