diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue index 4d1bbc3..383d885 100644 --- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue +++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue @@ -301,6 +301,7 @@ 开始生产 + + + + + 结单 + + diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 47683bc..83c975b 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -1176,7 +1176,7 @@ export default { if (currentRow == null) { return; } - this.menuButton.canceledAllPrdButton = false + //this.menuButton.canceledAllPrdButton = false this.menuButton.createRecheckButton = false this.menuButton.partStockFlag = false; // 判断是否具有该页面权限 @@ -1184,6 +1184,17 @@ export default { if (menList.length > 0) { this.menuButton.prdButton = false } + let canceledAllPrd = { + userSpecialSecurityNo: 232, + username: this.$store.state.user.name, + } + getUserSpecialSecurity(canceledAllPrd).then(({data}) => { + if (data.userSpecialSecurity == 'Y') { + this.menuButton.canceledAllPrdButton = false + } else { + this.menuButton.canceledAllPrdButton = true + } + }) // 关闭按钮 if (currentRow.closedFlag == 'N') { let data = {