diff --git a/locale/en-1.json b/locale/en-1.json index 4fd3a42..9912fba 100644 --- a/locale/en-1.json +++ b/locale/en-1.json @@ -22,6 +22,7 @@ "button.surerolldown": "Confirm roll down", "button.returnaxis": "Withdrawal axis", "button.stockup": "Stock up", + "button.confirmlowershaft": "Confirm axis below", "filter.bill-code": "Bill code", "filter.warehouse": "Warehouse", "filter.woodenbox": "Woodenbox", diff --git a/locale/id-1.json b/locale/id-1.json index e5016c2..60d0832 100644 --- a/locale/id-1.json +++ b/locale/id-1.json @@ -22,6 +22,7 @@ "button.surerolldown": "Buku berikutnya", "button.returnaxis": "Pulang", "button.stockup": "Persediaan", + "button.confirmlowershaft": "Konfirmasi sumbu bawah", "filter.bill-code": "Kode dokumen", "filter.warehouse": "gudang", "filter.woodenbox": "Kotak kayu", diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json index 8a44278..418bf59 100644 --- a/locale/zh-Hans-1.json +++ b/locale/zh-Hans-1.json @@ -22,6 +22,7 @@ "button.surerolldown": "确认下卷", "button.returnaxis": "退轴", "button.stockup": "备货", + "button.confirmlowershaft": "确认下轴", "filter.bill-code": "单据编码", "filter.warehouse": "仓库", "filter.woodenbox": "木箱", diff --git a/pages.json b/pages.json index f3e872d..944a5a2 100644 --- a/pages.json +++ b/pages.json @@ -328,6 +328,14 @@ "navigationStyle": "custom" } + } + ,{ + "path" : "pages/SecondPhase/slitting/Cutaxis", + "style" : + { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/SecondPhase/slitting/RollCacheManage", diff --git a/pages/SecondPhase/slitting/Cutaxis.vue b/pages/SecondPhase/slitting/Cutaxis.vue new file mode 100644 index 0000000..3c8aa02 --- /dev/null +++ b/pages/SecondPhase/slitting/Cutaxis.vue @@ -0,0 +1,172 @@ + + + + + + + + + {{$t('filter.area')}} + + + + + + + + + {{$t('filter.device')}} + + + + + + + + + + + {{$t('grid.axisposition')}} + + + + + {{item.text}} + + + + + + + {{$t('button.add')}} + + + + + + + + + {{$t('grid.sub-roll-number')}} + {{$t('grid.axisposition')}} + {{$t('grid.operate')}} + + + + + {{e.container_name}} + {{ options1 | findByValue(e.site)}} + {{$t('button.delete')}} + + + + + + + + {{$t('button.clear')}} + {{$t('button.confirmlowershaft')}} + + + + + \ No newline at end of file diff --git a/utils/getData4.js b/utils/getData4.js index 61c71e6..21b6c3b 100644 --- a/utils/getData4.js +++ b/utils/getData4.js @@ -33,3 +33,13 @@ export const queryPaperMaterial = () => request({ url:'api/pda/paper/queryPaperMaterial', data: {} }) +/** + * 分切下轴-确认下轴 + */ +export const downShafts = (device, code) => request({ + url:'api/pda/slitter/downShafts', + data: { + device_code: device, + container: code + } +}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 7b03a65..d882fa3 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -31,6 +31,7 @@ export const allAuthority = () => { {menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [ {menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'}, {menu_id: '6', title: '分切下料2', path: '/pages/SecondPhase/slitting/SlittingCutting2'}, + {menu_id: '6', title: '分切下轴', path: '/pages/SecondPhase/slitting/Cutaxis'}, {menu_id: '7', title: '穿拔轴初始化', path: '/pages/SecondPhase/slitting/DoInitShaft'}, {menu_id: '8', title: '纸管绑定', path: '/pages/SecondPhase/slitting/PaperBind'}, {menu_id: '8', title: '分切暂存下料', path: '/pages/SecondPhase/slitting/CacheCut'},