Browse Source

分切 创建分卷

master
Rui_Li 4 years ago
parent
commit
139bce07e7
  1. 2
      src/views/modules/yieldReport/com_split_order_finish_roll.vue
  2. 15
      src/views/modules/yieldReport/com_split_order_report.vue
  3. 2
      src/views/modules/yieldReport/produce_order.vue

2
src/views/modules/yieldReport/com_split_order_finish_roll.vue

@ -554,7 +554,7 @@ export default {
// //
this.operatorData = JSON.parse(JSON.stringify(operatorData)); this.operatorData = JSON.parse(JSON.stringify(operatorData));
// //
this.titleCon = '结束卷-分切操作 \
this.titleCon = '结束卷-操作 \
派工单号:'+scheduleData.seqNo; 派工单号:'+scheduleData.seqNo;
// //
this.pageData.exceptionFlag = 'N'; this.pageData.exceptionFlag = 'N';

15
src/views/modules/yieldReport/com_split_order_report.vue

@ -440,7 +440,7 @@
<!--其他操作--> <!--其他操作-->
<fieldset class="customer-fieldset" <fieldset class="customer-fieldset"
style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;"> style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;">
<legend class="customer-legend">操作</legend>
<legend class="customer-legend">操作</legend>
<el-form style="text-align: center;"> <el-form style="text-align: center;">
<el-form-item style="margin-top: 20px ; margin-left: 10px"> <el-form-item style="margin-top: 20px ; margin-left: 10px">
@ -449,8 +449,8 @@
width="150" width="150"
content content
v-model="popoverFlag" v-model="popoverFlag"
trigger="click">
<div style="text-align: right; margin: 0;width: 120px;">
trigger="click" :disabled="true">
<div style="text-align: right; margin: 0;width: 120px;" v-show="false">
<el-button type="primary" @click="finishPartRollModal" <el-button type="primary" @click="finishPartRollModal"
style=" width: 120px; margin-bottom: 5px; margin-left: 3PX"> style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">
产量报告 产量报告
@ -465,9 +465,9 @@
未生产下机拆卷 未生产下机拆卷
</el-button> </el-button>
</div> </div>
<el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"
style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
slot="reference">操作
<el-button type="primary" class="controller-bun" :disabled="buttonTags.otherFlag"
style="width: 80px; margin-bottom: 5px; " @click="popoverFlag=false"
slot="reference">操作
</el-button> </el-button>
</el-popover> </el-popover>
</el-form-item> </el-form-item>
@ -2784,6 +2784,7 @@ export default {
downTimeFlag: false, downTimeFlag: false,
finishScheduleFlag: false, finishScheduleFlag: false,
otherBunFlag: false, otherBunFlag: false,
otherFlag: true,
}, },
dataListLoading: false, dataListLoading: false,
} }
@ -3180,7 +3181,7 @@ export default {
this.operatorData = JSON.parse(JSON.stringify(operatorData)); this.operatorData = JSON.parse(JSON.stringify(operatorData));
// //
// //
this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' '
this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ''
+ this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName + ')'; + this.scheduleData.resourceDesc + ' (' + this.operatorData.operatorName + ')';
// //
}, },

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

@ -1691,7 +1691,7 @@ export default {
} }
// //
if (val == 5) {
if (val == 8) {
// //
this.showSplitOrderReportModal(); this.showSplitOrderReportModal();
} }

Loading…
Cancel
Save