From 450877937d2a0f98fe1e5c06292ce85d2aa93382 Mon Sep 17 00:00:00 2001 From: xiangxy Date: Mon, 5 Jan 2026 13:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=A0=81=E5=90=88=E4=B8=80=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 46 +++++++------ pages/SecondPhase/ThreeCodeToOne.vue | 97 ++++++++++++++++++++++++++++ utils/getData3.js | 9 ++- utils/mork2.js | 3 +- 4 files changed, 133 insertions(+), 22 deletions(-) create mode 100644 pages/SecondPhase/ThreeCodeToOne.vue diff --git a/pages.json b/pages.json index cadbcf1..393bea9 100644 --- a/pages.json +++ b/pages.json @@ -718,46 +718,52 @@ "navigationStyle": "custom" } } - ,{ - "path" : "pages/SecondPhase/slitting/ManEmptyAxle", + ,{ + "path" : "pages/SecondPhase/slitting/ManEmptyAxle", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/GdsPrepInOut", + + } + ,{ + "path" : "pages/SecondPhase/slitting/GdsPrepInOut", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/finished/RelabelOut", + + } + ,{ + "path" : "pages/SecondPhase/finished/RelabelOut", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/Task", + + } + ,{ + "path" : "pages/SecondPhase/slitting/Task", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/VehicleUnbind", + + } + ,{ + "path" : "pages/SecondPhase/VehicleUnbind", "style" : { "navigationStyle": "custom" } - - } + } + ,{ + "path" : "pages/SecondPhase/ThreeCodeToOne", + "style" : + { + "navigationStyle": "custom" + } + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/ThreeCodeToOne.vue b/pages/SecondPhase/ThreeCodeToOne.vue new file mode 100644 index 0000000..40e3fea --- /dev/null +++ b/pages/SecondPhase/ThreeCodeToOne.vue @@ -0,0 +1,97 @@ + + + \ No newline at end of file diff --git a/utils/getData3.js b/utils/getData3.js index db47859..1545371 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -666,4 +666,11 @@ export const seeTaskByPoint = (code) => request({ export const vehicleUnbind = (code) => request({ url:'api/twoPda/st/vehicleUnbind', data: {vehicle_code: code} -}) \ No newline at end of file +}) +/** + * 三码合一校验(二期打包间管理-三码合一) + */ +export const checkCode = (ncode, gcode, bcode, ccode) => request({ + url:'api/pdmBiSubpackagerelation/checkCode', + data: {nb_code: ncode, gb_code: gcode, box_code: bcode, customer_code: ccode} +}) diff --git a/utils/mork2.js b/utils/mork2.js index b911d4b..fa64818 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -119,7 +119,8 @@ export const allAuthority = () => { {menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'}, {menu_id: '1', title: '装箱口木箱回库', path: '/pages/SecondPhase/BoxReturn'}, {menu_id: '1', title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'}, - {menu_id: '1', title: '载具解绑', path: '/pages/SecondPhase/VehicleUnbind'} + {menu_id: '1', title: '载具解绑', path: '/pages/SecondPhase/VehicleUnbind'}, + {menu_id: '1', title: '三码合一', path: '/pages/SecondPhase/ThreeCodeToOne'} ]}, {menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [ {menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},