diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 411b348..ff79066 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -450,7 +450,8 @@ + disabled="disabled" style="margin-left: 15px; margin-top: 20px;"> + {{ buttons.toolButton }} @@ -509,10 +510,10 @@ - {{ labels.otherButtons }} - + + + + @@ -533,10 +534,10 @@ {{ labels.scannerMaterial }} - {{ labels.materialMalformed }} - + + + + diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 838aaf6..bce831c 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -1,7 +1,7 @@ - + 菜单 @@ -15,12 +15,12 @@ style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.reportButton }} - - {{ buttons.fqcReportButton }} - - + + + + + + @@ -1971,11 +1971,11 @@ export default { if (val == 0) { let orderType = this.currentRow.orderType let workCenterNo = this.currentRow.workCenterNo - if (orderType != 'S' || workCenterNo === 'FQC' || nextItemNo == 0) { - // 验证通过 - this.$message.error(this.labels.thisScheduleCantReport) - return false - } + // if (orderType != 'S' || workCenterNo === 'FQC' || nextItemNo == 0) { + // // 验证通过 + // this.$message.error(this.labels.thisScheduleCantReport) + // return false + // } let data = { site: this.currentRow.site, resourceId: this.currentRow.resourceId,