From 2fb927c499a90bd5f0009fa3166e59acdcd7a2ec Mon Sep 17 00:00:00 2001 From: xiangxy Date: Tue, 2 Sep 2025 18:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=B7=E6=8B=BC=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +- pages.json | 559 ++++++++++++------------ pages/SecondPhase/slitting/Zjpindan.vue | 115 +++++ utils/getData3.js | 16 +- utils/mork2.js | 3 +- 5 files changed, 417 insertions(+), 280 deletions(-) create mode 100644 pages/SecondPhase/slitting/Zjpindan.vue diff --git a/manifest.json b/manifest.json index 2701b4c..6a0e9a4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__3A002CD", "description" : "海亮铜箔二期手持系统", - "versionName" : "1.3.9", - "versionCode" : 139, + "versionName" : "1.4.0", + "versionCode" : 140, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 8889165..5b57e0a 100644 --- a/pages.json +++ b/pages.json @@ -254,310 +254,310 @@ "navigationStyle": "custom" } } - ,{ - "path" : "pages/SecondPhase/EmptyVehicleInStore", + ,{ + "path" : "pages/SecondPhase/EmptyVehicleInStore", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/EmptyBoxInStore", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/DeliveryUnbind", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/DeliveryUnbindConfirm", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/SboProdProgress", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/SboProcess", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/BakeProcess", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/ManmadeBake", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/SurfaceProcess", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/SlittingFeeding", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjCasing", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjDelivery", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjInStore", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjOutStore", - "style" : - { - "navigationStyle": "custom" - } - + } - - ,{ - "path" : "pages/SecondPhase/point/PointManage", + ,{ + "path" : "pages/SecondPhase/EmptyBoxInStore", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/point/ErrorOutUnlock", + + } + ,{ + "path" : "pages/SecondPhase/DeliveryUnbind", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/finished/ReturnToStore", + + } + ,{ + "path" : "pages/SecondPhase/DeliveryUnbindConfirm", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/finished/abnorToStore", + + } + ,{ + "path" : "pages/SecondPhase/production/SboProdProgress", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/SlittingCutting", + + } + ,{ + "path" : "pages/SecondPhase/production/SboProcess", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/DoInitShaft", + + } + ,{ + "path" : "pages/SecondPhase/production/BakeProcess", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/production/ZjCheck", + + } + ,{ + "path" : "pages/SecondPhase/production/ManmadeBake", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/PaperBind", + + } + ,{ + "path" : "pages/SecondPhase/production/SurfaceProcess", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/CacheCut", + + } + ,{ + "path" : "pages/SecondPhase/slitting/SlittingFeeding", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/CacheClean", + + } + ,{ + "path" : "pages/SecondPhase/slitting/ZjCasing", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/finished/BoxWeight", + + } + ,{ + "path" : "pages/SecondPhase/slitting/ZjDelivery", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ShaftSave", + + } + ,{ + "path" : "pages/SecondPhase/slitting/ZjInStore", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjSave", + + } + ,{ + "path" : "pages/SecondPhase/slitting/ZjOutStore", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/StockingArea", + + } + + ,{ + "path" : "pages/SecondPhase/point/PointManage", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/AGVPass", + + } + ,{ + "path" : "pages/SecondPhase/point/ErrorOutUnlock", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/production/ZjContainer", + + } + ,{ + "path" : "pages/SecondPhase/finished/ReturnToStore", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/lvt/EmptyBox", + + } + ,{ + "path" : "pages/SecondPhase/finished/abnorToStore", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/point/ManPass", + + } + ,{ + "path" : "pages/SecondPhase/slitting/SlittingCutting", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/production/PrintTable", + + } + ,{ + "path" : "pages/SecondPhase/slitting/DoInitShaft", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/SubRollWeight", + + } + ,{ + "path" : "pages/SecondPhase/production/ZjCheck", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/UpperShaftCut", + + } + ,{ + "path" : "pages/SecondPhase/slitting/PaperBind", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/AxisApply", + + } + ,{ + "path" : "pages/SecondPhase/slitting/CacheCut", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/UpperShaftCut2", + + } + ,{ + "path" : "pages/SecondPhase/slitting/CacheClean", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/production/ZjInStore", + + } + ,{ + "path" : "pages/SecondPhase/finished/BoxWeight", "style" : { "navigationStyle": "custom" } - + + } + ,{ + "path" : "pages/SecondPhase/slitting/ShaftSave", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/ZjSave", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/StockingArea", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/AGVPass", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/production/ZjContainer", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/lvt/EmptyBox", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/point/ManPass", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/production/PrintTable", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/SubRollWeight", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/UpperShaftCut", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/ProductManage/AxisApply", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/UpperShaftCut2", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/production/ZjInStore", + "style" : + { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/SecondPhase/production/BoxStock", @@ -566,151 +566,158 @@ "navigationStyle": "custom" } - } - ,{ - "path" : "pages/SecondPhase/slitting/CallShaft", + } + ,{ + "path" : "pages/SecondPhase/slitting/CallShaft", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/UnAxisBack", + + } + ,{ + "path" : "pages/ProductManage/UnAxisBack", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/CallPaperShaft", + + } + ,{ + "path" : "pages/ProductManage/CallPaperShaft", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/UpperShaftCut", + + } + ,{ + "path" : "pages/ProductManage/UpperShaftCut", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/EmptyBoxOutStore", + + } + ,{ + "path" : "pages/SecondPhase/EmptyBoxOutStore", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/SubRollPackUnbind", + + } + ,{ + "path" : "pages/SecondPhase/SubRollPackUnbind", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/RemainShaftBack", + + } + ,{ + "path" : "pages/ProductManage/RemainShaftBack", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/CallAxisSeq", + + } + ,{ + "path" : "pages/SecondPhase/slitting/CallAxisSeq", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/SlittingCutting2", + + } + ,{ + "path" : "pages/SecondPhase/slitting/SlittingCutting2", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/RollCacheManage", + + } + ,{ + "path" : "pages/SecondPhase/slitting/RollCacheManage", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/RequestShaft", + + } + ,{ + "path" : "pages/ProductManage/RequestShaft", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/ProductManage/ScanRoll", + + } + ,{ + "path" : "pages/ProductManage/ScanRoll", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/BoxReturn", + + } + ,{ + "path" : "pages/SecondPhase/BoxReturn", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/BaitRoll", + + } + ,{ + "path" : "pages/SecondPhase/slitting/BaitRoll", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/EmptyAxisReturn", + + } + ,{ + "path" : "pages/SecondPhase/slitting/EmptyAxisReturn", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/ManMaintain", + + } + ,{ + "path" : "pages/SecondPhase/ManMaintain", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/CacheSave", + + } + ,{ + "path" : "pages/SecondPhase/slitting/CacheSave", "style" : { "navigationStyle": "custom" } - - } - ,{ - "path" : "pages/SecondPhase/slitting/CallAxis", + + } + ,{ + "path" : "pages/SecondPhase/slitting/CallAxis", "style" : { "navigationStyle": "custom" } - - } + + } + ,{ + "path" : "pages/SecondPhase/slitting/Zjpindan", + "style" : + { + "navigationStyle": "custom" + } + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/slitting/Zjpindan.vue b/pages/SecondPhase/slitting/Zjpindan.vue new file mode 100644 index 0000000..6ed6816 --- /dev/null +++ b/pages/SecondPhase/slitting/Zjpindan.vue @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/utils/getData3.js b/utils/getData3.js index 6a7ff79..d3de6ab 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -587,4 +587,18 @@ export const doCallTubeShaftShow = (code) => request({ export const doCallTubeShaft = (code, row) => request({ url:'api/pda/slitter/doCallTubeShaft', data: {device_code: code, row: row} -}) \ No newline at end of file +}) + +/** + * 子卷拼单(二期-分切管理) + */ +// 1、查询可用点位 +export const getConmbinationlnfo = (parea) => request({ + url:'/api/pda/slitter/getConmbinationlnfo', + data: {product_area: parea} +}) +// 2、拼单 +export const conCombination = (rows) => request({ + url:'api/pda/slitter/conCombination', + data: {rows: rows} +}) diff --git a/utils/mork2.js b/utils/mork2.js index 38a89dc..d31ea94 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -110,7 +110,8 @@ export const allAuthority = () => { {menu_id: '8', title: '空轴绑定', path: '/pages/SecondPhase/slitting/EmptyAxisBind'}, {menu_id: '8', title: '空轴退回', path: '/pages/SecondPhase/slitting/EmptyAxisReturn'}, {menu_id: '8', title: '分切暂存维护', path: '/pages/SecondPhase/slitting/CacheSave'}, - {menu_id: '8', title: '呼叫套轴', path: '/pages/SecondPhase/slitting/CallAxis'} + {menu_id: '8', title: '呼叫套轴', path: '/pages/SecondPhase/slitting/CallAxis'}, + {menu_id: '8', title: '子卷拼单', path: '/pages/SecondPhase/slitting/Zjpindan'} ]}, {menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [ {menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},