diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js index 6bb71b4..67284cc 100644 --- a/src/api/production/generateReport.js +++ b/src/api/production/generateReport.js @@ -48,3 +48,4 @@ export const getLiuHuaPrintData= data => createAPI(`dailyPlan/getLiuHuaPrintData export const getTvList=data => createAPI(`dailyPlan/getTvList`, 'post', data) +export const getBadCodeList=data => createAPI(`dailyPlan/getBadCodeList`, 'post', data) diff --git a/src/views/modules/print/print_seqNo_label.js b/src/views/modules/print/print_seqNo_label.js index 71ca55e..6764f66 100644 --- a/src/views/modules/print/print_seqNo_label.js +++ b/src/views/modules/print/print_seqNo_label.js @@ -71,6 +71,10 @@ export function printSeqNoLabel(printList) { LODOP.ADD_PRINT_TEXT(175,265,110,20,"工序:"+printData.itemDesc); LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(132,159,68,20,printData.jobType); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Alignment",3); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); } // LODOP.PRINT_DESIGN(); LODOP.PREVIEW(); diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue index d859af9..f0cadc7 100644 --- a/src/views/modules/production/cancelSfdc.vue +++ b/src/views/modules/production/cancelSfdc.vue @@ -450,6 +450,40 @@ serialNumber: null, columnType: null, align: 'right' + }, { + tableId: "sfdcList", + tableName: this.$route.meta.title, + columnProp: "defectDesc", + columnLabel: "不良处理方式", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 85, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'left' + }, { + tableId: "sfdcList", + tableName: this.$route.meta.title, + columnProp: "defectRemark", + columnLabel: "不良处理备注", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 150, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'left' }, { tableId: "sfdcList", tableName: this.$route.meta.title, diff --git a/src/views/modules/production/cancelSfdcForWareHouse.vue b/src/views/modules/production/cancelSfdcForWareHouse.vue index 49eb4ee..101fb29 100644 --- a/src/views/modules/production/cancelSfdcForWareHouse.vue +++ b/src/views/modules/production/cancelSfdcForWareHouse.vue @@ -392,6 +392,40 @@ serialNumber: null, columnType: null, align: 'right' + }, { + tableId: "sfdcList", + tableName: this.$route.meta.title, + columnProp: "defectDesc", + columnLabel: "不良处理方式", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 85, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'left' + }, { + tableId: "sfdcList", + tableName: this.$route.meta.title, + columnProp: "defectRemark", + columnLabel: "不良处理备注", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 150, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'left' }, { tableId: "sfdcList", tableName: this.$route.meta.title, diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index 055bbc2..c30f719 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -484,18 +484,33 @@ -
- 不良品分析 +
+ 不良处理 + + + + + + + + + + + + - - 操作员 - - - - + + + + + + + - - + +
@@ -586,6 +601,7 @@ stopWork, continueWork, getTvList, + getBadCodeList, } from '@/api/production/generateReport.js' import Chooselist from '@/views/modules/common/Chooselist' import { @@ -618,7 +634,10 @@ moQty:'', tvList:[], tvId:'', + badCodeList:'', saveHeaderData: { + badCodeNo:'', + badRemark:'', wasteWeight:0, printQty:'', boxWeight:0, @@ -1098,6 +1117,8 @@ this.KGRework=0 this.saveHeaderData.qtyApprove=0 this.saveHeaderData.qtyUnApprove=0 + this.saveHeaderData.badCodeNo='' + this.saveHeaderData.badRemark= '' this.saveHeaderData.qtyRework=0 this.saveHeaderData.moldQty=0 this.saveHeaderData.reportWeight=0 @@ -1350,8 +1371,14 @@ this.tvList = data.rows; }) }, + getBadCodeList(){ + getBadCodeList().then(({data}) => { + this.badCodeList = data.rows; + }) + }, }, created () { + this.getBadCodeList(); this.searchAllTV(); } } diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue index 4987746..8ec9f53 100644 --- a/src/views/modules/production/searchSfdc.vue +++ b/src/views/modules/production/searchSfdc.vue @@ -438,6 +438,40 @@ serialNumber: null, columnType: null, align: 'right' + }, { + tableId: "sfdcList", + tableName: this.$route.meta.title, + columnProp: "defectDesc", + columnLabel: "不良处理方式", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 85, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'left' + }, { + tableId: "sfdcList", + tableName: this.$route.meta.title, + columnProp: "defectRemark", + columnLabel: "不良处理备注", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 150, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'left' }, { tableId: "sfdcList", tableName: this.$route.meta.title,