diff --git a/components/SearchBox.vue b/components/SearchBox.vue index 24deec5..71fa162 100644 --- a/components/SearchBox.vue +++ b/components/SearchBox.vue @@ -10,7 +10,7 @@ @blur="handleBlur" @confirm="handleSend"> - + diff --git a/pages.json b/pages.json index f99307d..dfbdf4d 100644 --- a/pages.json +++ b/pages.json @@ -183,6 +183,22 @@ ,{ "path" : "pages/entry/mater-group-to-store", "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/mode/switch-in-out", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/common/mater-list", + "style" : { "navigationStyle": "custom", "enablePullDownRefresh": true, @@ -191,7 +207,15 @@ } ,{ - "path" : "pages/entry/change-mode", + "path" : "pages/mode/pick", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/mode/command", "style" : { "navigationStyle": "custom" diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue new file mode 100644 index 0000000..14c9f5e --- /dev/null +++ b/pages/common/mater-list.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue index a1e2da1..92f81c3 100644 --- a/pages/entry/mater-group-to-store.vue +++ b/pages/entry/mater-group-to-store.vue @@ -6,113 +6,89 @@ - 物料 + 物料编码 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
物料编码物料名称物料规格单位物料单重物料批次物料数量载具编码仓库编码
{{e.material_code}}{{e.material_name}}{{e.material_spec}}{{e.unit_id}}{{e.single_weight}}{{e.pcsn}}{{e.qty}}{{e.vehicle_code}}{{e.stor_code}}
-
-
- - - - - - - - - - + + 物料名称 + + + + + + + + 物料规格 + + + + + + + + 单位 + + + + + + + 物料单重 - - + + - + 物料批次 - - + + - + 物料数量 - - + + - - + + 载具编码 - - + + - - + + 仓库编码 - - + + - - - - - - + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index 3a91786..b72e901 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -41,12 +41,13 @@ return { userName: '', menuList: [ - {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '设备操控', path: '/pages/entry/change-mode'}, {title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]}, + {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '组盘入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]}, {title: '出库管理', path: 'RF02', sonTree: [{title: '托盘出库', path: '/pages/outbound/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/task-manage'}]} + {title: '任务管理', path: 'RF06', sonTree: [{title: '任务管理', path: '/pages/task/task-manage'}]}, + {title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]} ], show: false, secM: [], diff --git a/pages/entry/change-mode.vue b/pages/mode/command.vue similarity index 61% rename from pages/entry/change-mode.vue rename to pages/mode/command.vue index ef3371b..ca31d2e 100644 --- a/pages/entry/change-mode.vue +++ b/pages/mode/command.vue @@ -35,10 +35,8 @@ - - - - + + @@ -46,7 +44,7 @@ + + diff --git a/pages/mode/switch-in-out.vue b/pages/mode/switch-in-out.vue new file mode 100644 index 0000000..5c3a9c6 --- /dev/null +++ b/pages/mode/switch-in-out.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png new file mode 100644 index 0000000..15c177a Binary files /dev/null and b/static/image/menu/RF07.png differ