From 0c81149466019bb99c334d27ae25e2bda2f9548f Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 8 Dec 2022 11:51:32 +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 --- .../board/SORoutingBoardForBaoZhuang.vue | 22 ++++++++-- .../board/SORoutingBoardForShuiZhu.vue | 25 +++++++----- src/views/modules/board/SeqNoForLiuHua.vue | 40 +++++++++++++------ .../modules/production/dailyPlanReport.vue | 1 + .../modules/production/generateReport.vue | 36 ++++++++++++++--- src/views/modules/production/inspect.vue | 19 +++++++-- .../modules/production/print_inspect_label.js | 19 +++++---- .../modules/production/soscheduleRouting.vue | 5 +++ 8 files changed, 124 insertions(+), 43 deletions(-) diff --git a/src/views/modules/board/SORoutingBoardForBaoZhuang.vue b/src/views/modules/board/SORoutingBoardForBaoZhuang.vue index 2fbdd03..7fdb1cf 100644 --- a/src/views/modules/board/SORoutingBoardForBaoZhuang.vue +++ b/src/views/modules/board/SORoutingBoardForBaoZhuang.vue @@ -42,7 +42,7 @@ prop="operationDesc" header-align="center" align="left" - min-width="80" + min-width="25" label="工序名称"> + + + label="箱装数量"> + + + label="工序号"> + align="left" + min-width="50" + label="工艺备注-水煮"> + + @@ -34,7 +34,7 @@ prop="orderNo" header-align="center" align="left" - min-width="50" + min-width="40" style="font-size: 20px" label="生产订单号"> @@ -42,14 +42,14 @@ prop="partNo" header-align="center" align="left" - min-width="35" + min-width="30" label="产品编号"> + align="left" + min-width="35" + label="材料规格"> + align="left" + min-width="25" + label="硬度"> + + + + { + this.tableData = data.rows; }) }, diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index 33467dc..15453f4 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -295,7 +295,7 @@ 关闭 - + @@ -392,6 +392,14 @@ + + + + + + + +
不良品分析 @@ -422,11 +430,6 @@ - - - - - @@ -438,6 +441,7 @@ 确定 + @@ -522,6 +526,7 @@ KGApprove:'', KGRework:'', saveHeaderData: { + boxWeight:0, qtyRequire:'', qtyUnApprove:'', site: '', @@ -682,6 +687,12 @@ }) return } + if (this.saveHeaderData.boxWeight == null || this.saveHeaderData.boxWeight === '') { + this.$alert('请输入框重！', '错误信息', { + confirmButtonText: '确定' + }) + return + } saveGenerateReportForSchedule(this.saveHeaderData).then(({data}) => { if (data.code == 0) { this.$message.success(data.msg) @@ -922,6 +933,7 @@ this.saveHeaderData.operatorName=currentData.operatorName; this.saveHeaderData.qtyRequire=currentData.qtyRequired; this.saveHeaderData.userId=this.$store.state.user.name; + this.saveHeaderData.boxWeight=0; this.qty1=''; this.qty2 =''; this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00') @@ -1108,5 +1120,17 @@ input[type='number'] { -moz-appearance: textfield !important; } + .big /deep/ .el-form-item__label { + font-size: 17px; + } + + .big /deep/ .el-input__inner { + height: 22px !important; + font-size: 17px; + } + .big /deep/ .el-dialog__title { + font-size: 17px; + font-weight: bold; + } diff --git a/src/views/modules/production/inspect.vue b/src/views/modules/production/inspect.vue index 89b331c..1b20859 100644 --- a/src/views/modules/production/inspect.vue +++ b/src/views/modules/production/inspect.vue @@ -95,7 +95,7 @@ 补打结果 取消检验结果 混炼明细 - 删除检验单 + 删除检验单 + + { if (data && data.code === 0) { let printData=data.row + printData.userId=this.$store.state.user.name if(printData.toTypeFlag=='混炼胶入库'){ printData.seqNo=printData.orderNo } diff --git a/src/views/modules/production/print_inspect_label.js b/src/views/modules/production/print_inspect_label.js index 4ef1257..dda3375 100644 --- a/src/views/modules/production/print_inspect_label.js +++ b/src/views/modules/production/print_inspect_label.js @@ -15,7 +15,7 @@ export function printInspectLabel(printList) { 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,200,50,printData.partNo+'|'+printData.partDesc); + LODOP.ADD_PRINT_TEXT(88,50,190,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:"); @@ -70,18 +70,23 @@ export function printInspectLabel(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(63,259,100,25,"检验结果："); + 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(85,249,123,69,printData.remark); - LODOP.SET_PRINT_STYLEA(0,"FontSize",27); + LODOP.ADD_PRINT_TEXT(95,233,148,66,printData.remark); + LODOP.SET_PRINT_STYLEA(0,"FontSize",33); 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.PRINT_DESIGN(); - // LODOP.PREVIEW(); - LODOP.PRINT(); + LODOP.PREVIEW(); + // LODOP.PRINT(); console.log("操作成功！") } } diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue index 166f90e..417267f 100644 --- a/src/views/modules/production/soscheduleRouting.vue +++ b/src/views/modules/production/soscheduleRouting.vue @@ -425,6 +425,11 @@ search () { getSOScheduleRoutingData(this.searchData).then(({data}) => { + if( data.rows){ + for (let i = 0; i