From 1259d3f779f4c8a6c03a006bc228023fa009ad07 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 18 Mar 2025 16:07:54 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=8E=9F=E6=96=99=E7=B2=89=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/getData2.js | 15 + src/config/mork.js | 654 ++++++++++++++++++ src/pages/login/Home.vue | 4 +- .../xinrui/storage/outstorage/RawOutStore.vue | 185 +++++ src/router/index.js | 5 + 5 files changed, 861 insertions(+), 2 deletions(-) create mode 100644 src/config/mork.js create mode 100644 src/pages/xinrui/storage/outstorage/RawOutStore.vue diff --git a/src/config/getData2.js b/src/config/getData2.js index 2a0710a..e3f40e7 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -588,3 +588,18 @@ export const insideInConfirm = (vcode, code) => post('api/pda/st/in/insideInConf vehicle_code: vcode, point_code: code }) + +/** 原料粉直接出库 */ +// 1.1扫描站点码 +export const pfoutScanpoint = (val1, val2) => post('api/pda/st/out/pfout/scanpoint2', { + point_code: val1, + storagevehicle_code: val2 +}) +// 1.2 出库确认 +export const pfoutConfirmoutstore = (val1, val2, val3, val4) => post('api/pda/st/out/pfout/confirmoutstore2', { + accountId: accountId, + storagevehicle_code: val1, + point_code: val2, + bucketunique: val3, + out_qty: val4 +}) diff --git a/src/config/mork.js b/src/config/mork.js new file mode 100644 index 0000000..8c29401 --- /dev/null +++ b/src/config/mork.js @@ -0,0 +1,654 @@ +/* eslint-disable */ +export const loginApi = (user, password) => { + let res = { + "result": { + "account_id": "1", + "user_name": "admin", + "nick_name": "管理员", + "token": "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiJkNzYxYmRlOGE2OGM0YzEyODBmODJlMzc5MWQ4MjhkOSIsImF1dGgiOiJhZG1pbiIsInN1YiI6ImFkbWluIn0.dG5q0g8ocy9IjAgRQi7nRZGp2Uh13M7Yu1CIF4t7a6tj1sJpQlY4yvKmvCQ1xDhxlhw8Y3NpOYIttw1PWbYwAA" + }, + "code": "1", + "desc": "登陆成功" + } + return res +} + +export const authority = () => { + let res = { + "result": { + "accountid": "1", + "path": "RF_menu", + "component": "0", + "name": "手持菜单", + "sonTree": [ + { + "accountid": "1", + "path": "RF01", + "component": "1", + "name": "打印管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFSoftWasteBagPrint", + "component": "2", + "name": "软废袋标签打印", + "menu_id": "173", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFSoftWasteBarrelPrint", + "component": "2", + "name": "软废组桶标签打印", + "menu_id": "174", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFReworkBarrelPrint", + "component": "2", + "name": "返工料桶标签打印", + "menu_id": "226", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFFinishProdBarrelPrint", + "component": "2", + "name": "产成品组桶标签打印", + "menu_id": "227", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFChengPinBarrelPrint", + "component": "2", + "name": "成品组桶标签打印", + "menu_id": "228", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFBarrelBagUpdate", + "component": "2", + "name": "桶袋标签更新", + "menu_id": "289", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFCleaningGroupBarrel", + "component": "2", + "name": "清洗组桶标签打印", + "menu_id": "320", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFPeifenBarrelPrint", + "component": "2", + "name": "配粉间桶标签打印", + "menu_id": "321", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFAbnormalBarrelPrint", + "component": "2", + "name": "异常桶标签打印", + "menu_id": "322", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFMiningSoftWasteBarrel", + "component": "2", + "name": "矿用软废组桶", + "menu_id": "1741", + "username": "admin" + } + ], + "menu_id": "317", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF02", + "component": "1", + "name": "入库管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFNewMaterInStoreGroup", + "component": "2", + "name": "新料入库组盘", + "menu_id": "290", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFFinishMaterInStoreGroup", + "component": "2", + "name": "产成品入库组盘", + "menu_id": "291", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcedureReworkInStoreGroup", + "component": "2", + "name": "工序返工入库", + "menu_id": "292", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFLikuReworkInStoreGroup", + "component": "2", + "name": "立库返工入库", + "menu_id": "293", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFSoftWasteInStoreGroup", + "component": "2", + "name": "软废入库组盘", + "menu_id": "294", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFRemnantInStoreGroup", + "component": "2", + "name": "零头粉入库组盘", + "menu_id": "295", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFInsideSoftWasteInStore", + "component": "2", + "name": "内部软废入库", + "menu_id": "451", + "username": "admin" + } + ], + "menu_id": "213", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF03", + "component": "1", + "name": "出库管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFPeifenOutStore", + "component": "2", + "name": "配粉出库", + "menu_id": "296", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFReturnMaterOutStore", + "component": "2", + "name": "退货出库", + "menu_id": "297", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFOtherOutStore", + "component": "2", + "name": "其他出库", + "menu_id": "298", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFCheckOutStore", + "component": "2", + "name": "检验出库", + "menu_id": "299", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFSaleOutStore", + "component": "2", + "name": "销售出库", + "menu_id": "300", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFRawOutStore", + "component": "2", + "name": "原料粉直接出库", + "menu_id": "301", + "username": "admin" + }, + ], + "menu_id": "323", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF04", + "component": "1", + "name": "在库管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFRawMaterCheck", + "component": "2", + "name": "原材料盘点", + "menu_id": "305", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFPinpanManage", + "component": "2", + "name": "手持拼盘管理", + "menu_id": "306", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFChaipanManage", + "component": "2", + "name": "手持拆盘管理", + "menu_id": "307", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFPowderMaterMoveStore", + "component": "2", + "name": "粉料移库", + "menu_id": "3051", + "username": "admin" + } + ], + "menu_id": "324", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF05", + "component": "1", + "name": "清洗管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFSoftWasteCleanInStore", + "component": "2", + "name": "软废清洗入库", + "menu_id": "319", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFSoftWasteCleanOutStore", + "component": "2", + "name": "软废清洗出库", + "menu_id": "318", + "username": "admin" + } + ], + "menu_id": "219", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF06", + "component": "1", + "name": "生产管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFCleanWork", + "component": "2", + "name": "清洗作业", + "menu_id": "303", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessMakePowder", + "component": "2", + "name": "配粉工序", + "menu_id": "355", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessGrindBall", + "component": "2", + "name": "球磨工序", + "menu_id": "356", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessSpray", + "component": "2", + "name": "喷雾工序", + "menu_id": "357", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessMix", + "component": "2", + "name": "混合工序", + "menu_id": "358", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessDry", + "component": "2", + "name": "干燥工序", + "menu_id": "359", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessSeDry", + "component": "2", + "name": "二次晾晒工序", + "menu_id": "360", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessChuimo", + "component": "2", + "name": "锤磨工序", + "menu_id": "361", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessYatuan", + "component": "2", + "name": "压团工序", + "menu_id": "362", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessGranulation", + "component": "2", + "name": "制粒工序", + "menu_id": "363", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcessWipe", + "component": "2", + "name": "擦筛工序", + "menu_id": "364", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFXingcaiDeliver", + "component": "2", + "name": "型材发货", + "menu_id": "447", + "username": "admin" + } + ], + "menu_id": "220", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF07", + "component": "1", + "name": "质量管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFRawMaterInspection", + "component": "2", + "name": "原材料质检", + "menu_id": "308", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProcedureInspection", + "component": "2", + "name": "工序质检", + "menu_id": "309", + "username": "admin" + } + ], + "menu_id": "221", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF08", + "component": "1", + "name": "立库管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFLikuEmptyInOutStore", + "component": "2", + "name": "立库空盘出入库", + "menu_id": "304", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFProductInstore", + "component": "2", + "name": "生产入库", + "menu_id": "312", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFWeighExceptionHandle", + "component": "2", + "name": "称重异常处理", + "menu_id": "354", + "username": "admin" + } + ], + "menu_id": "222", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF09", + "component": "1", + "name": "空托盘管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFProcessCallEmptyTray", + "component": "2", + "name": "工序呼叫空盘", + "menu_id": "326", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFEmptyTrayInStore", + "component": "2", + "name": "手持空托盘入库", + "menu_id": "301", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFEmptyTrayOutStore", + "component": "2", + "name": "手持空托盘出库", + "menu_id": "302", + "username": "admin" + } + ], + "menu_id": "325", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF10", + "component": "1", + "name": "调度管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFInstructManage", + "component": "2", + "name": "指令管理", + "menu_id": "310", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFFixedPointTask", + "component": "2", + "name": "定点作业", + "menu_id": "311", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFPointOperate", + "component": "2", + "name": "点位操作", + "menu_id": "328", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFInstructQuery", + "component": "2", + "name": "指令查询", + "menu_id": "445", + "username": "admin" + } + ], + "menu_id": "224", + "username": "admin" + }, + { + "accountid": "1", + "path": "RF30", + "component": "1", + "name": "设备管理", + "sonTree": [ + { + "accountid": "1", + "path": "RFMaintainExecution", + "component": "2", + "name": "设备保养执行-维修工", + "menu_id": "416", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFMaintainConfirm", + "component": "2", + "name": "设备保养确认-生产员", + "menu_id": "408", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFEquipRepair", + "component": "2", + "name": "设备报修", + "menu_id": "410", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFEquipRepairExecute", + "component": "2", + "name": "设备维修执行", + "menu_id": "409", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFSparePartInstore", + "component": "2", + "name": "备品备件入库", + "menu_id": "412", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFSparePartOutstore", + "component": "2", + "name": "备品备件出库", + "menu_id": "413", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFUseReturn", + "component": "2", + "name": "领用还回", + "menu_id": "414", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFRunLogFill", + "component": "2", + "name": "运行记录", + "menu_id": "415", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFEquipRepairConfirm", + "component": "2", + "name": "设备维修确认", + "menu_id": "411", + "username": "admin" + }, + { + "accountid": "1", + "path": "RFSearchRepairTask", + "component": "2", + "name": "报修任务查询", + "menu_id": "435", + "username": "admin" + } + ], + "menu_id": "223", + "username": "admin" + } + ], + "menu_id": "172", + "username": "admin" + }, + "code": "1", + "desc": "查询成功!" + } + return res +} + +export const handRequest = () => { + let res = { + code: '1', + desk: 'ok' + } + return res +} \ No newline at end of file diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue index 7bb5d40..fe4e821 100644 --- a/src/pages/login/Home.vue +++ b/src/pages/login/Home.vue @@ -138,7 +138,7 @@ export default { }, toPage2 (e) { let name = e.path.substr(2) - if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill' || name === 'XingcaiDeliver' || name === 'PowderMaterMoveStore') { + if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'RawOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill' || name === 'XingcaiDeliver' || name === 'PowderMaterMoveStore') { this.$store.dispatch('setKeepAlive', [name]) } this.$router.push(e.path.substr(2)) @@ -164,7 +164,7 @@ export default { }, goInner (path) { let name = path.substr(1) - if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill' || name === 'PowderMaterMoveStore') { + if (name === 'ProcedureInspection' || name === 'SoftWasteBarrelPrint' || name === 'NewMaterInStoreGroup' || name === 'SoftWasteInStoreGroup' || name === 'FinishProdBarrelPrint' || name === 'ChengPinBarrelPrint' || name === 'BarrelBagUpdate' || name === 'ReworkBarrelPrint' || name === 'SoftWasteBagPrint' || name === 'ChaipanManage' || name === 'RawMaterCheck' || name === 'ProductInstore' || name === 'PeifenOutStore' || name === 'RawOutStore' || name === 'ReturnMaterOutStore' || name === 'OtherOutStore' || name === 'CheckOutStore' || name === 'SaleOutStore' || name === 'SoftWasteCleanOutStore' || name === 'CleaningGroupBarrel' || name === 'PeifenBarrelPrint' || name === 'AbnormalBarrelPrint' || name === 'SoftWasteCleanInStore' || name === 'ProcessMakePowder' || name === 'ProcessGrindBall' || name === 'ProcessSpray' || name === 'ProcessMix' || name === 'ProcessDry' || name === 'ProcessSeDry' || name === 'ProcessChuimo' || name === 'ProcessYatuan' || name === 'ProcessGranulation' || name === 'ProcessWipe' || name === 'MaintainExecution' || name === 'MaintainConfirm' || name === 'EquipRepair' || name === 'EquipRepairExecute' || name === 'EquipRepairConfirm' || name === 'SparePartInstore' || name === 'SparePartOutstore' || name === 'UseReturn' || name === 'RunLogFill' || name === 'PowderMaterMoveStore') { this.$store.dispatch('setKeepAlive', [name]) } this.$router.push(path) diff --git a/src/pages/xinrui/storage/outstorage/RawOutStore.vue b/src/pages/xinrui/storage/outstorage/RawOutStore.vue new file mode 100644 index 0000000..29c2747 --- /dev/null +++ b/src/pages/xinrui/storage/outstorage/RawOutStore.vue @@ -0,0 +1,185 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index 3e302a1..35ae3ab 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -41,6 +41,7 @@ const OtherOutStore = r => require.ensure([], () => r(require('../pages/xinrui/s const CheckOutStore = r => require.ensure([], () => r(require('../pages/xinrui/storage/outstorage/CheckOutStore')), 'outstorage') const SaleOutStore = r => require.ensure([], () => r(require('../pages/xinrui/storage/outstorage/SaleOutStore')), 'outstorage') const PeifenOutStore = r => require.ensure([], () => r(require('../pages/xinrui/storage/outstorage/PeifenOutStore')), 'outstorage') +const RawOutStore = r => require.ensure([], () => r(require('../pages/xinrui/storage/outstorage/RawOutStore')), 'outstorage') const SoftWasteCleanOutStore = r => require.ensure([], () => r(require('../pages/xinrui/storage/outstorage/SoftWasteCleanOutStore')), 'outstorage') // 空托盘管理 const EmptyTrayInStore = r => require.ensure([], () => r(require('../pages/xinrui/storage/emptytray/EmptyTrayInStore')), 'emptytray') @@ -269,6 +270,10 @@ export default new Router({ path: '/PeifenOutStore', // 配粉出库-配粉扫桶出库 component: PeifenOutStore }, + { + path: '/RawOutStore', // 原料粉直接出库 + component: RawOutStore + }, { path: '/ReturnMaterOutStore', // 退货出库-原辅料退货出库 component: ReturnMaterOutStore