- -
+
-
+ {{i.label}}
+
+ -
{{i.label}}
@@ -30,7 +33,7 @@ export default {
},
data () {
return {
- menus: [
+ menus1: [
{
label: '刻字上料',
router: '/letteringload'
@@ -40,15 +43,29 @@ export default {
router: '/letteringclimb'
},
{
- label: '临时人工刻字上料',
+ label: '临时人工上料',
router: '/temporaryletteringload'
}
+ ],
+ menus2: [
+ {
+ label: '刻字工序',
+ router: '/letteringprocess'
+ },
+ {
+ label: '刻字机选择',
+ router: '/letteringmachineselect'
+ },
+ {
+ label: '任务列表',
+ router: '/letteringtasklist'
+ }
]
}
},
computed: {
title () {
- let res = ['刻字上料', '刻字爬坡', '临时人工刻字上料'][Number(this.$route.meta.guidePath) - 1]
+ let res = ['刻字上料', '刻字爬坡', '临时人工上料', '刻字工序', '刻字机选择', '任务列表'][Number(this.$route.meta.guidePath) - 1]
return res
},
...mapGetters(['keepAlive'])
diff --git a/src/pages/modules/lettering/lettering-machine-select.vue b/src/pages/modules/lettering/lettering-machine-select.vue
new file mode 100644
index 0000000..17758d6
--- /dev/null
+++ b/src/pages/modules/lettering/lettering-machine-select.vue
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 选择 |
+ 序号 |
+ 设备号 |
+ 工单号 |
+ 计划数量 |
+ 生产数量 |
+ 物料规格 |
+ 重量(kg) |
+ 数量 |
+ 物料编号 |
+ 物料名称 |
+
+
+
+
+ |
+
+ |
+ {{ e.device_code }} |
+ {{e.material_code}} |
+ {{e.material_spec}} |
+ {{e.deviceinstor_weight | unitskg}} |
+ {{ e.deviceinstor_qty | numeric(3) }} |
+ {{ e.task_code }} |
+ {{ e.update_time }} |
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/modules/lettering/lettering-process.vue b/src/pages/modules/lettering/lettering-process.vue
new file mode 100644
index 0000000..037b87e
--- /dev/null
+++ b/src/pages/modules/lettering/lettering-process.vue
@@ -0,0 +1,238 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/modules/lettering/lettering-task-list.vue b/src/pages/modules/lettering/lettering-task-list.vue
new file mode 100644
index 0000000..9486d95
--- /dev/null
+++ b/src/pages/modules/lettering/lettering-task-list.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 序号 |
+ 日期 |
+ 任务号 |
+ 起点 |
+ 终点 |
+ 物料规格 |
+ 上料重量(kg) |
+ 分配重量 |
+ 任务状态 |
+ 执行步骤 |
+
+
+
+
+ | {{ e.sep_on }} |
+ {{ e.create_time }} |
+ {{e.task_code}} |
+ {{e.material_code}} |
+ {{e.material_spec}} |
+ {{e.material_qty | unitskg}} |
+ {{ e.material_name }} |
+
+
+
+
+
+ 当前任务号不是第一个任务是否确认下料?
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 5186e8d..8dac9d9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -28,6 +28,9 @@ const letteringIndex = r => require.ensure([], () => r(require('@page/modules/le
const letteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-load')), 'lettering')
const letteringClimb = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-climb')), 'lettering')
const TemporaryLetteringLoad = r => require.ensure([], () => r(require('@page/modules/lettering/temporary-lettering-load')), 'lettering')
+const letteringProcess = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-process')), 'lettering')
+const letteringMachineSelect = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-machine-select')), 'lettering')
+const letteringTaskList = r => require.ensure([], () => r(require('@page/modules/lettering/lettering-task-list')), 'lettering')
const cleanIndex = r => require.ensure([], () => r(require('@page/modules/clean/index')), 'clean')
const cleaningLoading = r => require.ensure([], () => r(require('@page/modules/clean/cleaning-loading')), 'clean')
@@ -154,6 +157,18 @@ export default new Router({
path: '/temporaryletteringload',
component: TemporaryLetteringLoad,
meta: {guidePath: '3'}
+ }, {
+ path: '/letteringprocess',
+ component: letteringProcess,
+ meta: {guidePath: '4'}
+ }, {
+ path: '/letteringmachineselect',
+ component: letteringMachineSelect,
+ meta: {guidePath: '5'}
+ }, {
+ path: '/letteringtasklist',
+ component: letteringTaskList,
+ meta: {guidePath: '6'}
}
]
},