Browse Source

组件开发

master
rui_li 4 years ago
parent
commit
3b5737e594
  1. 9
      src/views/modules/yieldReport/com_produce_report_normal.vue
  2. 8
      src/views/modules/yieldReport/com_switch_operator.vue
  3. 9
      src/views/modules/yieldReport/produce_order.vue

9
src/views/modules/yieldReport/com_produce_report_normal.vue

@ -352,7 +352,7 @@
<!-- 切换操作员 --> <!-- 切换操作员 -->
<comSwitchOperator ref="comSwitchOperator" :close-on-click-modal="false" <comSwitchOperator ref="comSwitchOperator" :close-on-click-modal="false"
:visible.sync="showOperatorFlag" :visible.sync="showOperatorFlag"
@initOperatorData="initOperatorData">
@initOperatorData="initOperatorData" @notInitOperatorData="notInitOperatorData">
</comSwitchOperator> </comSwitchOperator>
@ -2839,6 +2839,13 @@ export default {
// //
this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' ' this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' '
+ this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName+ ')'; + this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName+ ')';
//
},
/*不初始化操作员的方法*/
notInitOperatorData(){
//
this.showOperatorFlag = false;
}, },
//modal //modal

8
src/views/modules/yieldReport/com_switch_operator.vue

@ -36,7 +36,6 @@ export default {
data() { data() {
return { return {
titleCon:'操作员切换', titleCon:'操作员切换',
visibleFlag: false,
operatorFlag: false, operatorFlag: false,
operatorData: { operatorData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -51,12 +50,17 @@ export default {
/*关闭modal*/ /*关闭modal*/
closeDialog(){ closeDialog(){
//
this.$emit('notInitOperatorData');
//
this.$emit('update:visible', false); this.$emit('update:visible', false);
}, },
// //
init() { init() {
this.visibleFlag = true;
//
this.operatorData.operatorName = '';
this.operatorData.operatorId = '';
// //
//this.refreshPageData(); //this.refreshPageData();
}, },

9
src/views/modules/yieldReport/produce_order.vue

@ -109,7 +109,7 @@
<!-- 切换操作员 --> <!-- 切换操作员 -->
<comSwitchOperator ref="comSwitchOperator" :close-on-click-modal="false" <comSwitchOperator ref="comSwitchOperator" :close-on-click-modal="false"
:visible.sync="showOperatorFlag" :visible.sync="showOperatorFlag"
@initOperatorData="initOperatorData">
@initOperatorData="initOperatorData" @notInitOperatorData="notInitOperatorData">
</comSwitchOperator> </comSwitchOperator>
@ -979,6 +979,13 @@ export default {
this.switchProduceReportModal(); this.switchProduceReportModal();
}, },
notInitOperatorData(){
//
this.showOperatorFlag = false;
//
this.switchProduceReportModal();
},
//modal //modal
switchOperatorModal() { switchOperatorModal() {
// //

Loading…
Cancel
Save