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 diff --git a/pages/mine/about/index.vue b/pages/mine/about/index.vue index a16a4ad..bfc24cf 100644 --- a/pages/mine/about/index.vue +++ b/pages/mine/about/index.vue @@ -2,7 +2,7 @@ - + diff --git a/pages/produceManagement/process/process.vue b/pages/produceManagement/process/process.vue index 7da36d8..51c90fa 100644 --- a/pages/produceManagement/process/process.vue +++ b/pages/produceManagement/process/process.vue @@ -10,10 +10,7 @@ - - - - + @@ -31,15 +28,18 @@ - + + @@ -71,6 +71,7 @@ export default { return { processId: -1, processName: '', + lineCode: '', groupCode: '', loading: false, @@ -82,7 +83,9 @@ export default { // unit: '单位', planNum: 0, finishNum: 0, - badNum: 0 + badNum: 0, + worker: '', + jobDate: '' // sort: '排序', // workorderDate: '工单日期', // priority: '优先级', @@ -97,7 +100,7 @@ export default { // stoveCode: '炉子编码', // workshopCode: '车间编码', // routeCode: '路线编码', - // groupCode: '组编码' + // groupCode: '组编码', }, uModal: { show: false, @@ -117,18 +120,39 @@ export default { }, methods: { // 扫工单码结果 - scanConfirm(val) { + async scanConfirm(val) { const params = { workorder: val, processId: this.processId }; - console.log(params); - reportWorkOrderApi.GetProcessReportWorkDetail(params).then((res) => { - if (res.code === 200) { - this.formData = res.data; - this.formData.finishNum = res.data.planNum; + + const res1 = await reportWorkOrderApi.GetWorkOrderDetail(params); + if (res1.code === 200) { + if(!res1.data){ + this.uModal.content = '工单号不存在！'; + this.openModal(); + this.clear(); + return; } - }); + this.formData = res1.data; + } + const res2 = await reportWorkOrderApi.GetProcessReportWorkDetail(params); + if (res2.code === 200) { + if (!res2.data) { + this.formData.finishNum = 0; + this.formData.badNum = 0; + this.formData.worker = ''; + } else { + this.formData.finishNum = res2.data.finishNum; + this.formData.badNum = res2.data.badNum; + this.formData.worker = res2.data.worker; + if (this.formData.finishNum > 0) { + this.uModal.title = '报工提醒'; + this.uModal.content = '此工序该工单已报工过！'; + this.openModal(); + } + } + } }, // 清空form clear() { @@ -147,9 +171,9 @@ export default { this.uModal.show = false; }, submit() { - if (!this.check()) { - return; - } + // if (!this.check()) { + // return; + // } this.uModal2.content = '是否确认报工'; this.uModal2.show = true; }, @@ -174,7 +198,8 @@ export default { workorder: this.formData.workorder, processId: this.processId, finish_num: this.formData.finishNum, - bad_num: this.formData.badNum + bad_num: this.formData.badNum, + worker: this.formData.worker }; reportWorkOrderApi.ProcessReportWork(params).then((res) => { if (res.code === 200) { diff --git a/pages/produceManagement/reportWorkOrderList/reportWorkOrderList.vue b/pages/produceManagement/reportWorkOrderList/reportWorkOrderList.vue new file mode 100644 index 0000000..90a6986 --- /dev/null +++ b/pages/produceManagement/reportWorkOrderList/reportWorkOrderList.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/pages/produceManagement/requisition/requisition.vue b/pages/produceManagement/requisition/requisition.vue index 7214ac4..9a28b3f 100644 --- a/pages/produceManagement/requisition/requisition.vue +++ b/pages/produceManagement/requisition/requisition.vue @@ -22,7 +22,7 @@ --> - + @@ -50,11 +50,15 @@ - + + + + + @@ -80,11 +84,13 @@ export default { onLoad: function (option) { this.processId = option.processId; this.processName = option.processName; + this.processSort = JSON.parse(option.processSort); }, data() { return { processId: -1, processName: '', + processSort: [], lineCode: '', groupCode: '', loading: false, @@ -137,11 +143,32 @@ export default { }; reportWorkOrderApi.GetWorkOrderDetail(params).then((res) => { if (res.code === 200) { + if(!res.data){ + this.uModal.content = '工单号不存在！'; + this.openModal(); + this.clear(); + return; + } this.formData = res.data; this.formData.finishNum = res.data.planNum; + // if (this.formData.finishNum > 0) { + // this.uModal.title = '报工提醒'; + // this.uModal.content = '该工单已领料过！'; + // this.openModal(); + // } } }); }, + // 检查工序顺序 + checkProcessSort(){ + if(this.processId){ + for(let index in this.processSort){ + + } + }else{ + return false; + } + }, // 清空form clear() { this.formData = { @@ -165,9 +192,10 @@ export default { modalConfirm() { const params = { workorder: this.formData.workorder, - process: this.processId, + processId: this.processId, finish_num: this.formData.finishNum, - bad_num: 0 + bad_num: 0, + worker: this.formData.worker }; reportWorkOrderApi.ProcessReportWork(params).then((res) => { if (res.code === 200) { @@ -183,9 +211,9 @@ export default { diff --git a/static/logo.png b/static/logo.png index 665ad60..7fc8ce0 100644 Binary files a/static/logo.png and b/static/logo.png differ diff --git a/store/modules/user.js b/store/modules/user.js index efbda23..dec6519 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -85,7 +85,7 @@ const user = { } else { commit('SET_ROLES', ['ROLE_DEFAULT']) } - console.log(username,avatar,res.data.roles); + // console.log(username,avatar,res.data.roles); commit('SET_NAME', username) commit('SET_AVATAR', avatar) resolve(res)