diff --git a/api/product.js b/api/product.js index d3b2c64..ea1d0da 100644 --- a/api/product.js +++ b/api/product.js @@ -1,6 +1,6 @@ import http from '@/http/api.js' // 工序接收 查询数据 - const loadNotReceived = (params) => { +const loadNotReceived = (params) => { return http.request({ url: '/blade-desk/prMakeRec/loadNotReceived', method: 'GET', @@ -9,7 +9,7 @@ import http from '@/http/api.js' } // 工序接收 / - const workPlanReceive = (params) => { +const workPlanReceive = (params) => { return http.request({ url: '/blade-desk/produceMonitor/workPlanReceive', method: 'POST', @@ -18,7 +18,7 @@ import http from '@/http/api.js' } // 工序报工查询 /prMakeRec/loadCurrentWp - const loadCurrentWp = (params) => { +const loadCurrentWp = (params) => { return http.request({ url: '/blade-desk/prMakeRec/loadCurrentWp', method: 'GET', @@ -26,7 +26,7 @@ import http from '@/http/api.js' }) } // 工序报工提交 /prMakeRec/saveMakeRec - const saveMakeRec = (data) => { +const saveMakeRec = (data) => { return http.request({ url: '/blade-desk/prMakeRec/saveMakeRec', method: 'POST', @@ -34,9 +34,55 @@ import http from '@/http/api.js' }) } +// 工序检验查询 +const loadProTest = (params) => { + return http.request({ + url: '/blade-desk/pdaLoad/loadProTest/' + params.cardNo, + method: 'GET', + }) +} +// 系统字段查询 +const dictionaryNew = (params) => { + return http.request({ + url: '/blade-system/dict/dictionary', + method: 'GET', + params + }) +} +// 工序检验保存 /pdaLoad/saveProCheck +const saveProCheck = (data) => { + return http.request({ + url: '/blade-desk/pdaLoad/saveProCheck', + method: 'POST', + data: data + }) +} + +// 获取镀后入库的数据 +const getAfterPlatInCardNo = (params) => { + return http.request({ + url: '/blade-desk/plateAround/getAfterPlatInCardNo', + method: 'get', + params + }) +} +// 保存镀后入库的数据 +const saveAfterPlatIn = (data) => { + return http.request({ + url: '/blade-desk/plateAround/savePlateAfterEnter', + method: 'POST', + data: data + }) +} + export default { - loadNotReceived, + loadNotReceived, workPlanReceive, loadCurrentWp, - saveMakeRec + saveMakeRec, + loadProTest, + dictionaryNew, + saveProCheck, + getAfterPlatInCardNo, + saveAfterPlatIn } \ No newline at end of file diff --git a/api/system/dict.js b/api/system/dict.js index bb7d06f..b1c6d7e 100644 --- a/api/system/dict.js +++ b/api/system/dict.js @@ -3,7 +3,7 @@ import http from '@/http/api.js' // export const dictionary = (params) => { return http.request({ - url: '/api/blade-system/dict/dictionary', + url: '/blade-system/dict/dictionary', method: 'GET', params }) @@ -12,7 +12,7 @@ export const dictionary = (params) => { export const parentList = (params) => { return http.request({ - url: '/api/blade-system/dict/parent-list', + url: '/blade-system/dict/parent-list', method: 'GET', params }) @@ -20,7 +20,7 @@ export const parentList = (params) => { export const remove = (ids) => { return http.request({ - url: '/api/blade-system/dict/remove', + url: '/blade-system/dict/remove', method: 'post', params: { ids, @@ -30,7 +30,7 @@ export const remove = (ids) => { export const add = (row) => { return http.request({ - url: '/api/blade-system/dict/submit', + url: '/blade-system/dict/submit', method: 'post', data: row }) @@ -38,7 +38,7 @@ export const add = (row) => { export const update = (row) => { return http.request({ - url: '/api/blade-system/dict/submit', + url: '/blade-system/dict/submit', method: 'post', data: row }) @@ -46,7 +46,7 @@ export const update = (row) => { export const dictTree = (params) => { return http.request({ - url: '/api/blade-system/dict/tree?code=DICT', + url: '/blade-system/dict/tree?code=DICT', method: 'GET', params }) @@ -54,7 +54,7 @@ export const dictTree = (params) => { export const child = (params) => { return http.request({ - url: '/api/blade-system/dict/child-list', + url: '/blade-system/dict/child-list', method: 'GET', params }) diff --git a/pages/index/menu.js b/pages/index/menu.js index 065c50a..f1ec0ff 100644 --- a/pages/index/menu.js +++ b/pages/index/menu.js @@ -27,7 +27,7 @@ const menus = { color: '#00b7ee', type: '' } - }, + }, // { // key: "afterPlaReceive", // title: "镀后接收", @@ -40,7 +40,7 @@ const menus = { // type: '' // } // }, - { + { key: "workReport", title: "工序报工", url: "../plan/workReport", @@ -76,8 +76,39 @@ const menus = { type: '' } }, + { + key: "afterPlatingInStore", + title: "镀后入库", + url: "../production/afterPlatingInStore", + bgColor: '', + limit: 'RB2307', + icon: { + size: 20, + color: '#00b7ee', + type: '' + } + + }, ] }, + { + title: '质量管理', + children: [ + { + key: "processIns", + title: "工序检验", + url: "../production/processIns", + bgColor: '', + limit: 'RB2306', + icon: { + size: 20, + color: '#00b7ee', + type: '' + } + }, + ] + }, + { title: '设备管理', children: [ diff --git a/pages/production/afterPlatingInStore.vue b/pages/production/afterPlatingInStore.vue index d27080c..f1df623 100644 --- a/pages/production/afterPlatingInStore.vue +++ b/pages/production/afterPlatingInStore.vue @@ -1,212 +1,281 @@ \ No newline at end of file diff --git a/pages/production/processIns.vue b/pages/production/processIns.vue index fddc745..c7701f3 100644 --- a/pages/production/processIns.vue +++ b/pages/production/processIns.vue @@ -1,246 +1,345 @@ \ No newline at end of file diff --git a/static/images/menus/afterPlatingInStore.png b/static/images/menus/afterPlatingInStore.png index 7196801..98a6621 100644 Binary files a/static/images/menus/afterPlatingInStore.png and b/static/images/menus/afterPlatingInStore.png differ diff --git a/static/images/menus/processIns.png b/static/images/menus/processIns.png index 8ac799f..337d23a 100644 Binary files a/static/images/menus/processIns.png and b/static/images/menus/processIns.png differ