From 4e92efbd0e8b7b73ef382f6fb1a5d2faa6e4ac15 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Mon, 9 May 2022 15:03:49 +0800 Subject: [PATCH] =?UTF-8?q?2022-05-09=20=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/api/yieldReport/com_finish_roll.js | 2 + src/api/yieldReport/com_merge_roll.js | 3 + src/api/yieldReport/produce_report_normal.js | 11 +-- .../modules/yieldReport/com_finish_roll.vue | 39 ++++++++- .../modules/yieldReport/com_merge_roll.vue | 57 ++++++++++++- .../yieldReport/com_produce_report_normal.vue | 33 +++++++- .../modules/yieldReport/com_separate_roll.vue | 18 ++++- .../yieldReport/not_over_finish_roll.vue | 36 ++++++++- .../modules/yieldReport/print_roll_label.js | 76 +++++++++++++++++- static/img/sfdc_ul.jpg | Bin 0 -> 3950 bytes 11 files changed, 252 insertions(+), 25 deletions(-) create mode 100644 static/img/sfdc_ul.jpg diff --git a/src/App.vue b/src/App.vue index d1b6c03..5494da7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ data() { return { query: {}, - version: '1.2.3' + version: '1.2.4' } }, created() { diff --git a/src/api/yieldReport/com_finish_roll.js b/src/api/yieldReport/com_finish_roll.js index d80d020..a65891e 100644 --- a/src/api/yieldReport/com_finish_roll.js +++ b/src/api/yieldReport/com_finish_roll.js @@ -51,3 +51,5 @@ export const repackFinishRollWithNoFqc = data => createAPI(`schedule/repackFinis // 分切订单获取报工数量的请求 export const getSplitOrderCurrentRollReportedQty = data => createAPI('schedule/getSplitOrderCurrentRollReportedQty','POST',data) +//查询打印的数据 +export const getSfdcFlowLabelData = data => createAPI('scheduling/getSfdcFlowLabelData', 'POST', data) diff --git a/src/api/yieldReport/com_merge_roll.js b/src/api/yieldReport/com_merge_roll.js index 7dd4d94..8473ba0 100644 --- a/src/api/yieldReport/com_merge_roll.js +++ b/src/api/yieldReport/com_merge_roll.js @@ -8,3 +8,6 @@ export const checkMergeSfdcRoll = data => createAPI('schedule/checkMergeSfdcRoll // 执行合并卷的操作 export const processMergeSfdcRoll = data => createAPI('schedule/processMergeSfdcRoll', 'POST', data) + +//查询打印的数据 +export const getSfdcFlowLabelData = data => createAPI('scheduling/getSfdcFlowLabelData', 'POST', data) diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index 2ab5f86..6b1cafb 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -81,12 +81,5 @@ export const switchrollReverse = data => createAPI('schedule/switchrollReverse', //查询班次数据 export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data) - - - - - - - - - +//查询打印的数据 +export const getSfdcFlowLabelData = data => createAPI('scheduling/getSfdcFlowLabelData', 'POST', data) diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index 7dc5150..97d129c 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/src/views/modules/yieldReport/com_finish_roll.vue @@ -252,8 +252,15 @@ import { getSfdcMaterialByRollNo, checkFinishRollWithNoFqc, finishRollWithNoFqc, - getSORoutingPreviousOperationItemNo + getSORoutingPreviousOperationItemNo, + getSfdcFlowLabelData,/*执行打印的请求*/ } from '@/api/yieldReport/com_finish_roll.js'; + + /*打印标签专用的js*/ + import { + printSfdcLabel, + } from "@/views/modules/yieldReport/print_roll_label.js"; + export default { name: "com_finish_roll", data() { @@ -848,8 +855,20 @@ export default { if(data.code == 500){ this.$message.error(data.msg); }else{ - //关闭当前的页面 - this.closeDialog(); + //判断是否打印卷标签 + if(data.rollNo != ''){ + //需要打印标签 + let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo, + rollNo: data.rollNo}; + this.printSfdcFlowLabel(printRow); + //延时一秒关闭 --预防没有出标签 + setTimeout(() => { + this.closeDialog(); + }, 1000); + }else{ + //关闭当前的页面 + this.closeDialog(); + } } }) }, @@ -894,6 +913,20 @@ export default { this.pageData.remark = username+"更改了班次." }, + /*打印流转标签*/ + printSfdcFlowLabel(sfdcRow){ + //先查询打印的卷信息 + getSfdcFlowLabelData(sfdcRow).then(({data}) => { + //开始打印标签 + if(data.code === 200){ + let printList = data.printList; + printSfdcLabel(printList); + }else{ + this.$message.error(data.msg); + } + }); + }, + }, created() { // this.factoryList() diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue index e1ee40d..6dd802a 100644 --- a/src/views/modules/yieldReport/com_merge_roll.vue +++ b/src/views/modules/yieldReport/com_merge_roll.vue @@ -53,7 +53,14 @@ getMergeRollPageData, checkMergeSfdcRoll,/*校验是否合并卷*/ processMergeSfdcRoll,/*执行合并卷的操作*/ + getSfdcFlowLabelData,/*执行打印的请求*/ } from "@/api/yieldReport/com_merge_roll.js"; + + /*打印标签专用的js*/ + import { + printSfdcLabel, + } from "@/views/modules/yieldReport/print_roll_label.js"; + export default { data() { return { @@ -259,7 +266,14 @@ export default { this.$message.error(data.msg); } else { this.$message.success(data.msg); - this.closeDialog(); + //先打印再继续关闭 + let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo, + rollNo: data.rollNo}; + this.printSfdcFlowLabel(printRow); + //延时一秒关闭 --预防没有出标签 + setTimeout(() => { + this.closeDialog(); + }, 1000); } }); }); @@ -270,7 +284,14 @@ export default { this.$message.error(data.msg); } else { this.$message.success(data.msg); - this.closeDialog(); + //先打印再继续关闭 + let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo, + rollNo: data.rollNo}; + this.printSfdcFlowLabel(printRow); + //延时一秒关闭 --预防没有出标签 + setTimeout(() => { + this.closeDialog(); + }, 1000); } }); } @@ -296,7 +317,14 @@ export default { this.$message.error(data.msg); } else { this.$message.success(data.msg); - this.closeDialog(); + //先打印再继续关闭 + let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo, + rollNo: data.rollNo}; + this.printSfdcFlowLabel(printRow); + //延时一秒关闭 --预防没有出标签 + setTimeout(() => { + this.closeDialog(); + }, 1000); } }); }); @@ -307,7 +335,14 @@ export default { this.$message.error(data.msg); } else { this.$message.success(data.msg); - this.closeDialog(); + //先打印再继续关闭 + let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo, + rollNo: data.rollNo}; + this.printSfdcFlowLabel(printRow); + //延时一秒关闭 --预防没有出标签 + setTimeout(() => { + this.closeDialog(); + }, 1000); } }); } @@ -316,6 +351,20 @@ export default { }); }, + /*打印流转标签*/ + printSfdcFlowLabel(sfdcRow){ + //先查询打印的卷信息 + getSfdcFlowLabelData(sfdcRow).then(({data}) => { + //开始打印标签 + if(data.code === 200){ + let printList = data.printList; + printSfdcLabel(printList); + }else{ + this.$message.error(data.msg); + } + }); + }, + }, created() { // this.factoryList() diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 3fefd42..5a88888 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -1,3 +1,4 @@ +