diff --git a/locale/en-1.json b/locale/en-1.json index 5170457..fc0251b 100644 --- a/locale/en-1.json +++ b/locale/en-1.json @@ -25,6 +25,7 @@ "button.confirmlowershaft": "Confirm axis below", "button.emptydiskrecycle": "Empty disk recycle", "button.upperfullroll": "Upper Full roll", + "button.weigh-check": "Weigh check", "filter.bill-code": "Bill code", "filter.warehouse": "Warehouse", "filter.woodenbox": "Woodenbox", @@ -83,6 +84,7 @@ "grid.corename": "Core name", "grid.areaname": "Area name", "grid.signnum": "Allocated quantity", + "grid.woodenboxcode": "Woodenbox code", "select.uppershaft": "Upper shaft", "select.lowershaft": "Lower shaft", "select.leftroll": "Left roll", diff --git a/locale/id-1.json b/locale/id-1.json index f8f67a3..6f487d5 100644 --- a/locale/id-1.json +++ b/locale/id-1.json @@ -25,6 +25,7 @@ "button.confirmlowershaft": "Konfirmasi sumbu bawah", "button.emptydiskrecycle": "Daur Ulang Disk Kosong", "button.upperfullroll": "Penuh", + "button.weigh-check": "Verifikasi bobot", "filter.bill-code": "Kode dokumen", "filter.warehouse": "gudang", "filter.woodenbox": "Kotak kayu", @@ -81,6 +82,7 @@ "grid.corename": "Nama inti", "grid.areaname": "Nama daerah", "grid.signnum": "Jumlah yang dialokasikan", + "grid.woodenboxcode": "Kode Kardus Kayu", "select.uppershaft": "Poros Atas", "select.lowershaft": "Poros bawah", "select.leftroll": "Gulung Kiri", diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json index 566f69a..7703997 100644 --- a/locale/zh-Hans-1.json +++ b/locale/zh-Hans-1.json @@ -25,6 +25,7 @@ "button.confirmlowershaft": "确认下轴", "button.emptydiskrecycle": "空盘回收", "button.upperfullroll": "上满卷", + "button.weigh-check": "称重校验", "filter.bill-code": "单据编码", "filter.warehouse": "仓库", "filter.woodenbox": "木箱", @@ -60,7 +61,7 @@ "grid.confirm-man": "确认人", "grid.confirm-time": "确认时间", "grid.storagevehicle-code": "箱号", - "grid.weight": "净重", + "grid.weight": "重量", "grid.check-area": "盘点库区", "grid.check-point": "盘点货位", "grid.material-code": "物料编码", @@ -84,6 +85,7 @@ "grid.corename": "管芯名称", "grid.areaname": "区域名称", "grid.signnum": "已分配数量", + "grid.woodenboxcode": "木箱码", "select.uppershaft": "上轴", "select.lowershaft": "下轴", "select.leftroll": "左卷", diff --git a/pages.json b/pages.json index 80cb78f..5e73c12 100644 --- a/pages.json +++ b/pages.json @@ -152,6 +152,14 @@ "navigationStyle": "custom" } + } + ,{ + "path" : "pages/SecondPhase/finished/InStoreConfirm", + "style" : + { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/SecondPhase/slitting/DoInitShaft", diff --git a/pages/SecondPhase/finished/InStoreConfirm.vue b/pages/SecondPhase/finished/InStoreConfirm.vue new file mode 100644 index 0000000..ccc7dc6 --- /dev/null +++ b/pages/SecondPhase/finished/InStoreConfirm.vue @@ -0,0 +1,201 @@ + + + diff --git a/utils/mork2.js b/utils/mork2.js index 1a03965..fe60591 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -66,7 +66,8 @@ export const allAuthority = () => { {menu_id: '7', path: 'RF06', title: '成品入库', sonTree: [ {menu_id: '1', title: '退货口入库', path: '/pages/SecondPhase/finished/ReturnToStore'}, {menu_id: '2', title: '异常口入库', path: '/pages/SecondPhase/finished/abnorToStore'}, - {menu_id: '3', title: '木箱称重', path: '/pages/SecondPhase/finished/BoxWeight'} + {menu_id: '3', title: '木箱称重', path: '/pages/SecondPhase/finished/BoxWeight'}, + {menu_id: '4', title: '生产入库', path: '/pages/SecondPhase/finished/InStoreConfirm'} ]}, {menu_id: '8', path: 'RF13', title: '立库库存', sonTree: [ {menu_id: '1', title: '空木箱库存', path: '/pages/SecondPhase/lvt/EmptyBox'}