From e533e19435c32b43490e7d6419d9e60eb361972f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Wed, 4 Dec 2024 17:07:19 +0800 Subject: [PATCH] 1.0.0 --- api/reportFlow/index.js | 9 + pages.json | 27 ++- pages/index.vue | 97 ++++++-- pages/login.vue | 2 +- pages/mine/about/index.vue | 2 +- pages/produceManagement/process/process.vue | 63 +++-- .../reportWorkOrderList.vue | 117 ++++++++++ .../requisition/requisition.vue | 40 +++- .../produceManagement/workorder/workorder.vue | 2 +- pages/qualityManagement/IPQC/IPQC.vue | 215 +++++++++++++++++- static/logo.png | Bin 27192 -> 12549 bytes store/modules/user.js | 2 +- 12 files changed, 500 insertions(+), 76 deletions(-) create mode 100644 pages/produceManagement/reportWorkOrderList/reportWorkOrderList.vue diff --git a/api/reportFlow/index.js b/api/reportFlow/index.js index 7f09395..4b39fd0 100644 --- a/api/reportFlow/index.js +++ b/api/reportFlow/index.js @@ -24,4 +24,13 @@ export function ProcessReportWork(params) { method: 'get', params }) +} + +// 获取工单下的报工列表 +export function GetWorkOrderReportWorkList(params) { + return request({ + url: '/mobile/reportflow/get_workorder_reportwork_list', + method: 'get', + params + }) } \ No newline at end of file diff --git a/pages.json b/pages.json index 9f2f138..6162bbe 100644 --- a/pages.json +++ b/pages.json @@ -73,24 +73,27 @@ } }, { - "path" : "pages/produceManagement/requisition/requisition", - "style" : - { - "navigationBarTitleText" : "物料领用" + "path": "pages/produceManagement/requisition/requisition", + "style": { + "navigationBarTitleText": "物料领用" } }, { - "path" : "pages/produceManagement/process/process", - "style" : - { - "navigationBarTitleText" : "工序报工" + "path": "pages/produceManagement/process/process", + "style": { + "navigationBarTitleText": "工序报工" } }, { - "path" : "pages/qualityManagement/IPQC/IPQC", - "style" : - { - "navigationBarTitleText" : "IPQC制程检验" + "path": "pages/qualityManagement/IPQC/IPQC", + "style": { + "navigationBarTitleText": "IPQC制程检验" + } + }, + { + "path": "pages/produceManagement/reportWorkOrderList/reportWorkOrderList", + "style": { + "navigationBarTitleText": "工单报工清单" } } ], diff --git a/pages/index.vue b/pages/index.vue index c008b67..0d5e21e 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -23,7 +23,7 @@ - + @@ -34,6 +34,17 @@ + + + + + + + {{ item.name }} + + + + @@ -64,61 +75,79 @@ export default { icon: 'download-filled', url: '/pages/produceManagement/requisition/requisition', params: { - processId: 15, - processName: '首工序' + processId: 10, + processName: '物料领用' } }, { name: '机械加工', - icon: 'star-filled', + icon: 'redo-filled', url: '/pages/produceManagement/process/process', params: { - processId: 16, + processId: 20, processName: '机械加工' } }, { - name: '加工检查', - icon: 'star-filled', + name: '中间检查', + icon: 'redo-filled', url: '/pages/produceManagement/process/process', params: { - processId: 17, - processName: '加工检查' + processId: 30, + processName: '中间检查' } }, { name: '手工研磨', - icon: 'star-filled', + icon: 'redo-filled', url: '/pages/produceManagement/process/process', params: { - processId: 18, + processId: 40, processName: '手工研磨' } }, { - name: '机械研磨', - icon: 'star-filled', + name: '机研磨', + icon: 'redo-filled', url: '/pages/produceManagement/process/process', params: { - processId: 19, - processName: '机械研磨' + processId: 50, + processName: '机研磨' } }, { name: '精研磨', - icon: 'star-filled', + icon: 'redo-filled', url: '/pages/produceManagement/process/process', params: { - processId: 20, + processId: 60, processName: '精研磨' } }, + { + name: '入库检查', + icon: 'redo-filled', + url: '/pages/produceManagement/process/process', + params: { + processId: 70, + processName: '入库检查' + } + }, + { + name: '出厂', + icon: 'redo-filled', + url: '/pages/produceManagement/process/process', + params: { + processId: 80, + processName: '出厂' + } + }, { name: '出货', icon: 'upload-filled', url: '/pages/produceManagement/process/process', params: { - processId: 21, + processId: 90, processName: '出货' } }, @@ -126,9 +155,16 @@ export default { name: '制程检验\n(不良跟踪)', icon: 'folder-add-filled', url: '/pages/qualityManagement/IPQC/IPQC' + }, + { + name: '工单列表', + icon: 'wallet-filled', + url: '/pages/produceManagement/reportWorkOrderList/reportWorkOrderList' } ], - // 涂装模块 + // 工序顺序(0为默认首顺序) + processSort: [0, 10, 20, 30, 40, 50, 60, 70,80,90], + // 喷涂线模块 paintingOptions: [ { name: '扫码报工', @@ -139,15 +175,25 @@ export default { // 物料模块 materialOptions: [ { - name: '产线备料', - icon: 'upload-filled', + name: '入料', + icon: 'download', url: '' }, { - name: '产线备料', - icon: 'upload-filled', + name: '出料', + icon: 'upload', url: '' - } + }, + { + name: '盘点', + icon: 'calendar', + url: '' + }, + { + name: '清单', + icon: 'list', + url: '' + }, ] }; }, @@ -161,8 +207,9 @@ export default { // 产线功能 changeProduceGrid(e) { let _url = this.produceOptions[e.detail.index].url; - const _params = this.produceOptions[e.detail.index].params; + let _params = this.produceOptions[e.detail.index].params; if (_params) { + _params.processSort = JSON.stringify(this.processSort); _url += `?${tansParams(_params)}`; } uni.navigateTo({ diff --git a/pages/login.vue b/pages/login.vue index bf9479f..0afea8f 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -2,7 +2,7 @@ - 总装车间PDA + 北泽阀门-产线PDA