diff --git a/pages.json b/pages.json index 630678f..7909402 100644 --- a/pages.json +++ b/pages.json @@ -138,6 +138,14 @@ } } + ,{ + "path" : "pages/manage/point-reset", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/manage/point-reset.vue b/pages/manage/point-reset.vue new file mode 100644 index 0000000..6aba034 --- /dev/null +++ b/pages/manage/point-reset.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/utils/getData2.js b/utils/getData2.js index cbd79b8..d9ae91e 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -49,9 +49,9 @@ export const resumeMoveWasteFoilv3 = (flag, scode, ecode) => request({ data: {flag: flag, startPoint: scode, endPoint: ecode} }) // 废箔搬运 -export const startMoveWasteFoilv2 = (code) => request({ +export const startMoveWasteFoilv2 = (code, sp) => request({ url:'api/pda/other/startMoveWasteFoil/v2', - data: {point_code: code} + data: {point_code: code, start_point: sp} }) export const resumeMoveWasteFoilv2 = (flag, code) => request({ url:'api/pda/other/resumeMoveWasteFoil/v2', @@ -200,4 +200,8 @@ export const getWeightCacheInfos = () => request({ export const doSubVolumeDown = (code) => request({ url:'api/pda/nbj/doSubVolumeDown', data: {point_code: code} +}) +export const getWastePointList = (type) => request({ + url:'api/schBasePoint/getWastePointList?point_type=' + type, + method: 'get' }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index ab9cf11..73ca3dd 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -7,7 +7,7 @@ export const authority = () => { [ {path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]}, {path: 'RF02', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]}, - {path: 'RF03', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]}, + {path: 'RF03', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}, {title: '漏斗复位', path: '/pages/manage/point-reset'}]}, {path: 'RF04', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}, {title: '重量维护', path: '/pages/manage/weight-bind'}, {title: '套轴申请', path: '/pages/manage/axis-application'}]}, {path: 'RF05', title: '装箱区', sonTree: [{title: '装箱暂存管理', path: '/pages/manage/pack-storage'}]}, {path: 'RF06', title: '分切管理', sonTree: [{title: '分切上料', path: '/pages/manage/split-feed'}, {title: '分切下料', path: '/pages/manage/split-cut'}, {title: '子卷维护', path: '/pages/manage/sub-vol-bind'}, {title: '子卷下线', path: '/pages/manage/sub-vol-offline'}]}, @@ -35,4 +35,8 @@ export const queryOrderInfo = () => { data: [{container_name: 'R-A11ED00002-241206144453-A1_014_521 2', zc_point: 'zc_point'}] } return res +} +export const getWastePointList = (type) => { + let res = [{point_code: 'A' + type}] + return res } \ No newline at end of file