diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 71aad2b..25ff3fc 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -352,7 +352,7 @@ + @initOperatorData="initOperatorData" @notInitOperatorData="notInitOperatorData"> @@ -2839,6 +2839,13 @@ export default { //设置弹窗的标题 this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' ' + this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName+ ')'; + //刷新菜单 + }, + + /*不初始化操作员的方法*/ + notInitOperatorData(){ + //关闭切换用户的组件 + this.showOperatorFlag = false; }, //切换员工modal diff --git a/src/views/modules/yieldReport/com_switch_operator.vue b/src/views/modules/yieldReport/com_switch_operator.vue index fd9a36c..c1e0bc1 100644 --- a/src/views/modules/yieldReport/com_switch_operator.vue +++ b/src/views/modules/yieldReport/com_switch_operator.vue @@ -36,7 +36,6 @@ export default { data() { return { titleCon:'操作员切换', - visibleFlag: false, operatorFlag: false, operatorData: { site: this.$store.state.user.site, @@ -51,12 +50,17 @@ export default { /*关闭modal*/ closeDialog(){ + //调用不初始化用户的方法 + this.$emit('notInitOperatorData'); + //关闭组件 this.$emit('update:visible', false); }, //初始化的 init() { - this.visibleFlag = true; + //删除操作的信息 + this.operatorData.operatorName = ''; + this.operatorData.operatorId = ''; //刷新当前派工单的信息 //this.refreshPageData(); }, diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index b2e4d4e..c0e45af 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -109,7 +109,7 @@ + @initOperatorData="initOperatorData" @notInitOperatorData="notInitOperatorData"> @@ -979,6 +979,13 @@ export default { this.switchProduceReportModal(); }, + notInitOperatorData(){ + //关闭切换用户模态框 + this.showOperatorFlag = false; + //切换到报工组件 + this.switchProduceReportModal(); + }, + //切换员工modal switchOperatorModal() { //首先判断是否选择好派工单