diff --git a/src/views/modules/yieldReport/com_split_order_finish_roll.vue b/src/views/modules/yieldReport/com_split_order_finish_roll.vue index 92cf8e7..7c020c4 100644 --- a/src/views/modules/yieldReport/com_split_order_finish_roll.vue +++ b/src/views/modules/yieldReport/com_split_order_finish_roll.vue @@ -554,7 +554,7 @@ export default { //初始化操作员对象 this.operatorData = JSON.parse(JSON.stringify(operatorData)); //初始化标题 - this.titleCon = '结束卷-分切操作 \ + this.titleCon = '结束卷-操作 \ 派工单号:'+scheduleData.seqNo; //处理异常的原因 this.pageData.exceptionFlag = 'N'; diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue index e4117fc..fe7d9c8 100644 --- a/src/views/modules/yieldReport/com_split_order_report.vue +++ b/src/views/modules/yieldReport/com_split_order_report.vue @@ -440,7 +440,7 @@
- 其他操作 + 其它操作 @@ -449,8 +449,8 @@ width="150" content v-model="popoverFlag" - trigger="click"> -
+ trigger="click" :disabled="true"> +
产量报告 @@ -465,9 +465,9 @@ 未生产下机拆卷
- 其它操作 + 其她操作 @@ -2784,6 +2784,7 @@ export default { downTimeFlag: false, finishScheduleFlag: false, otherBunFlag: false, + otherFlag: true, }, dataListLoading: false, } @@ -3180,7 +3181,7 @@ export default { this.operatorData = JSON.parse(JSON.stringify(operatorData)); //切换当前账户的信息 //设置弹窗的标题 - this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' ' + this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + '' + this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName + ')'; //刷新菜单 }, diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index eab2cea..0f5aa64 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -1691,7 +1691,7 @@ export default { } //分切报工 - if (val == 5) { + if (val == 8) { //分切报工 this.showSplitOrderReportModal(); }