From 4d81353e713278ac99ec406303bccdd471c37e80 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 13 Nov 2024 17:19:49 +0800 Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/Abnormal/AbnormalFeedBack.vue | 36 +++++ .../modules/autoPrint/autoPrintStock.vue | 23 +++ .../autoPrint/autoPrintStockHunlian.vue | 22 +++ .../modules/print/print_inspect_labelForB.js | 101 ++++++++++++ .../modules/print/print_stock_labelReturn.js | 146 ++++++++++++++++++ .../modules/production/generateReport.vue | 15 ++ src/views/modules/production/inspect.vue | 28 +++- .../modules/production/scheduleForSOTask.vue | 14 +- 8 files changed, 377 insertions(+), 8 deletions(-) create mode 100644 src/views/modules/print/print_inspect_labelForB.js create mode 100644 src/views/modules/print/print_stock_labelReturn.js diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue index ffc37be..0e8e2e3 100644 --- a/src/views/modules/Abnormal/AbnormalFeedBack.vue +++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue @@ -477,6 +477,7 @@ status:'', operatorDesc:'', partDesc:'', + id:'', }, upLoadData: { id:0, @@ -627,6 +628,25 @@ this.height = window.innerHeight - 210; }) }, + watch: { + '$route'(to, from) { + if (localStorage.getItem('feedBackId') !== undefined) { + let data = JSON.parse(localStorage.getItem('feedBackId')); + console.log(data) + if (data) { + this.searchData.id = data.id + getAbnormalFeedBackList(this.searchData).then(({data}) => { + this.tableData = data.rows; + this.getDetailModel2(data.rows[0]) + }) + setTimeout(() => { + this.searchData.id = null + },1000) + } + localStorage.removeItem('feedBackId'); + } + } + }, methods: { getAllAbnormalItem(){ getAbnormalCodeList().then(({data}) => { @@ -991,8 +1011,24 @@ }) }, }, + created() { this.getAllAbnormalItem(); + if (localStorage.getItem('feedBackId') !== undefined) { + let data = JSON.parse(localStorage.getItem('feedBackId')); + console.log(data) + if (data) { + this.searchData.id = data.id + getAbnormalFeedBackList(this.searchData).then(({data}) => { + this.tableData = data.rows; + this.getDetailModel2(data.rows[0]) + }) + setTimeout(() => { + this.searchData.id = null + },1000) + } + localStorage.removeItem('feedBackId'); + } } } diff --git a/src/views/modules/autoPrint/autoPrintStock.vue b/src/views/modules/autoPrint/autoPrintStock.vue index b26a773..42db6be 100644 --- a/src/views/modules/autoPrint/autoPrintStock.vue +++ b/src/views/modules/autoPrint/autoPrintStock.vue @@ -10,6 +10,9 @@ getStockPrintList, updateStockPrintFlag } from '@/api/board.js' + import { + printMaterialLabelReturn, + } from "@/views/modules/print/print_stock_labelReturn.js" import { printMaterialLabel, } from "@/views/modules/print/print_stock_label.js" @@ -91,6 +94,26 @@ } printMaterialLabelPreview(array4); } + + if(data.rows8.length>0){ + let array8=[]; + for (let i = 0; i < data.rows8.length; i++) { + for (let j = 0; j { + + }) + } + + } } }) }, diff --git a/src/views/modules/autoPrint/autoPrintStockHunlian.vue b/src/views/modules/autoPrint/autoPrintStockHunlian.vue index ddacf37..745329f 100644 --- a/src/views/modules/autoPrint/autoPrintStockHunlian.vue +++ b/src/views/modules/autoPrint/autoPrintStockHunlian.vue @@ -13,6 +13,9 @@ import { printMaterialLabel, } from "@/views/modules/print/print_stock_label.js" + import { + printMaterialLabelReturn, + } from "@/views/modules/print/print_stock_labelReturn.js" import { printMaterialLabelPreview, } from "@/views/modules/print/print_stock_label_preview.js" @@ -67,6 +70,25 @@ } printMaterialLabelPreview(array2); } + if(data.rows8.length>0){ + let array8=[]; + for (let i = 0; i < data.rows8.length; i++) { + for (let j = 0; j { + + }) + } + + } } }) }, diff --git a/src/views/modules/print/print_inspect_labelForB.js b/src/views/modules/print/print_inspect_labelForB.js new file mode 100644 index 0000000..0f750df --- /dev/null +++ b/src/views/modules/print/print_inspect_labelForB.js @@ -0,0 +1,101 @@ +/*调用js打印标签*/ +import getLodop from '@/utils/LodopFuncs.js' +/*打印材料卷标签*/ +export function printInspectLabelForB(printList) { + const LODOP = getLodop() + // let time=this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') + if (LODOP) { + //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); + LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", ""); + // LODOP.SET_PRINTER_INDEXA("小标签打印机"); + //循环调用打印机 + for(let i = 0; i < printList.length; i++){ + let printData = printList[i]; + LODOP.NewPage(); + LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); + LODOP.ADD_PRINT_TEXT(88,8,108,25,"Part:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(88,50,165,50,printData.partNo+'|'+printData.partDesc); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(153,8,128,24,"Operator:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(153,110,140,20,printData.operatorName); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(132,8,113,25,"Shift:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(132,110,139,25,printData.sShiftNo); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(41,8,98,25,"Job No:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.seqNo); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(173,8,94,25,"Order No:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(173,110,141,25,printData.orderNo); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(64,8,96,25,"Q.T.Y:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(64,70,188,24,printData.qtyRequired+printData.umid); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(194,110,170,25,printData.sScheduledDate); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.ADD_PRINT_TEXT(224,212,156,25,"IATF:16949 Certified"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Alignment",3); + LODOP.ADD_PRINT_LINE(218,2,217,374,0,1); + LODOP.ADD_PRINT_TEXT(12,122,135,30,"报废确认单"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",12); + LODOP.SET_PRINT_STYLEA(0,"Alignment",2); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site); + LODOP.SET_PRINT_STYLEA(0,"FontSize",11); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + 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(63,259,100,25,"确认结果:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",0); + LODOP.ADD_PRINT_TEXT(87,208,173,46,printData.remark); + LODOP.SET_PRINT_STYLEA(0,"FontSize",24); + LODOP.SET_PRINT_STYLEA(0,"Alignment",2); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(42,249,93,25,"Inspector:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(42,329,59,25,printData.userId); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(133,221,156,44,printData.inspectRemark); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.ADD_PRINT_TEXT(12,232,128,24,printData.type); + LODOP.SET_PRINT_STYLEA(0,"FontSize",12); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + } + // LODOP.PRINT_DESIGN(); + LODOP.PREVIEW(); + // LODOP.PRINT(); + console.log("操作成功！") + } +} + + + diff --git a/src/views/modules/print/print_stock_labelReturn.js b/src/views/modules/print/print_stock_labelReturn.js new file mode 100644 index 0000000..24df975 --- /dev/null +++ b/src/views/modules/print/print_stock_labelReturn.js @@ -0,0 +1,146 @@ +/*调用js打印标签*/ +import getLodop from '@/utils/LodopFuncs.js' +/*打印材料卷标签*/ +export function printMaterialLabelReturn(printList) { + const LODOP = getLodop() + if (LODOP) { + //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", ""); + LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", ""); + // LODOP.SET_PRINTER_INDEXA("小标签打印机"); + //循环调用打印机 + for(let i = 0; i < printList.length; i++){ + let printData = printList[i]; + LODOP.NewPage(); + LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); + LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo); + LODOP.ADD_PRINT_TEXT(112,8,133,25,"WareHouse ID:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(112,110,140,25,printData.wareHouseDesc); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(154,8,103,24,"Batch No:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(154,110,140,20,printData.batchNo); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(133,8,124,25,"Location ID:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(133,110,139,25,printData.locationId); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(41,8,132,25,"Part:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(41,56,195,55,printData.partNo+'|'+printData.partDesc); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(175,8,82,25,"Order No:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(175,110,141,25,printData.orderNo); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(91,8,81,25,"Q.T.Y:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(91,87,138,24,printData.qty+printData.umid); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(194,8,113,25,"Trans Date:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(194,110,244,25,printData.transDate); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.ADD_PRINT_TEXT(224,212,156,25,"IATF:16949 Certified"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Alignment",3); + LODOP.ADD_PRINT_LINE(218,2,217,374,0,1); + LODOP.ADD_PRINT_TEXT(9,140,100,30,"退料标签"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",12); + LODOP.SET_PRINT_STYLEA(0,"Alignment",2); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site); + LODOP.SET_PRINT_STYLEA(0,"FontSize",11); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(176,216,100,20,"Valid Date:"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(177,300,100,25,printData.expiredDate); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_TEXT(29,209,189,25,printData.status); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Alignment",2); + LODOP.SET_PRINT_STYLEA(0,"Bold",1); + if(printData.weight!=''&&printData.weight!=0) { + LODOP.ADD_PRINT_TEXT(92,154,100,25,'/'+printData.weight+'KG'); + LODOP.SET_PRINT_STYLEA(0, "FontSize", 10); + LODOP.SET_PRINT_STYLEA(0, "Bold", 1); + } + } + // LODOP.PRINT_DESIGN(); + // LODOP.PREVIEW(); + LODOP.PRINT(); + console.log("操作成功！") + } +} + +// LODOP.SET_PRINT_PAGESIZE(0,1000,700,""); +// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.seqNo); +// LODOP.ADD_PRINT_TEXT(58,8,108,25,"WareHouseId:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.wareHouseId); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(111,8,77,24,"BatchNo:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.batchNo); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(84,8,98,25,"LocationId:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.locationId); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(9,8,72,25,"PartNo:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.partNo); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(136,8,82,25,"OrderNo:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(34,8,56,25,"Qty:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.qty); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(162,8,92,25,"TransDate:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.SET_PRINT_STYLEA(0,"Bold",1); +// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com"); +// LODOP.SET_PRINT_STYLEA(0,"FontSize",10); +// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1); diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index 8cfa065..ed5ee38 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -964,6 +964,17 @@ if(inList.length>0){ printTransNoLabel(inList); } + + this.$nextTick(() => { + setTimeout(() => { + if(data.feedBackId&&data.feedBackId>0){ + let inData={id:data.feedBackId}; + localStorage.setItem('feedBackId', JSON.stringify(inData)) + this.$router.push('Abnormal-AbnormalFeedBack') + } + + },1000) + }) } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -1035,6 +1046,10 @@ getSOScheduleRoutingData(this.searchData).then(({data}) => { this.tableData = data.rows }) + // let inData={id:50}; + // localStorage.setItem('feedBackId', JSON.stringify(inData)) + // this.$router.push('Abnormal-AbnormalFeedBack') + }, selectSFDCToolHist(row){ let params = { diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue index 7665b5a..4b61165 100644 --- a/src/views/modules/production/inspect.vue +++ b/src/views/modules/production/inspect.vue @@ -17,6 +17,7 @@ + @@ -336,9 +337,13 @@ import { printInspectLabel, } from "@/views/modules/print/print_inspect_label.js" + import { + printInspectLabelForB, + } from "@/views/modules/print/print_inspect_labelForB.js" import { printInspectStockLabel, } from "@/views/modules/print/print_inspect_labelForPartStock.js" + export default { name: 'soscheduleRouting', components: { @@ -509,6 +514,12 @@ let array=[]; array.push(printData) printInspectStockLabel(array) + }else if(this.inspectData.toTypeFlagDb=='B'){ + printData.qtyRequired=this.inspectData.transQty + console.log(printData) + let array=[]; + array.push(printData) + printInspectLabelForB(array) }else { if(this.inspectData.toTypeFlagDb!='I'){ printData.seqNo=printData.orderNo @@ -604,7 +615,22 @@ }) } }) - }else { + }else if(row.toTypeFlagDb=='B') { + inspectPrint(row).then(({data}) => { + if (data && data.code === 0) { + let printData=data.row + printData.qtyRequired=row.transQty + printData.userId=this.$store.state.user.name + let array=[]; + array.push(printData) + printInspectLabelForB(array) + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }else{ inspectPrint(row).then(({data}) => { if (data && data.code === 0) { let printData=data.row diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue index a5599e8..965f25e 100644 --- a/src/views/modules/production/scheduleForSOTask.vue +++ b/src/views/modules/production/scheduleForSOTask.vue @@ -284,6 +284,13 @@ min-width="90" label="打料完成数量"> + + - - - - - - -