|
|
|
@ -31,26 +31,31 @@ |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button type="primary" @click="materialSettlementModal">保存</el-button> |
|
|
|
<el-button type="primary" @click="startProduceFun">保存</el-button> |
|
|
|
<el-button type="primary" @click="closeDialog">关闭</el-button> |
|
|
|
</span> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 卷调机-卷材料耗用 --> |
|
|
|
<comMaterialSettlement ref="comMaterialSettlement" :close-on-click-modal="false" |
|
|
|
:visible.sync="materialSettlementFlag"> |
|
|
|
</comMaterialSettlement> |
|
|
|
<comEndTuning ref="comEndTuning" :close-on-click-modal="false" |
|
|
|
:visible.sync="endTuningFlag"> |
|
|
|
</comEndTuning> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
|
|
|
|
<script> |
|
|
|
import { |
|
|
|
checkStartProduce, |
|
|
|
} |
|
|
|
from '@/api/yieldReport//com_start_produce.js'; |
|
|
|
/*引入组件*/ |
|
|
|
import comMaterialSettlement from './com_material_settlement';/*开始生产时候报告调机的材料的使用数量*/ |
|
|
|
import comEndTuning from './com_end_tuning'; |
|
|
|
/*开始生产时候报告调机的材料的使用数量*/ |
|
|
|
export default { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
titleCon: '开始生产', |
|
|
|
materialSettlementFlag: false, |
|
|
|
endTuningFlag: false, |
|
|
|
sfdcTimeList: [], |
|
|
|
scheduleData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -59,6 +64,7 @@ export default { |
|
|
|
orderNo: '', |
|
|
|
itemNo: 0, |
|
|
|
partNo: '', |
|
|
|
workCenterNo: '', |
|
|
|
workCenterDesc: '', |
|
|
|
resourceDesc: '', |
|
|
|
rollNo: '', |
|
|
|
@ -71,18 +77,14 @@ export default { |
|
|
|
preItemDesc: '', |
|
|
|
nextItemDesc: '', |
|
|
|
nextItemNo: 0, |
|
|
|
operatorId: '', |
|
|
|
functionName: '', |
|
|
|
currentRollFlag: false |
|
|
|
}, |
|
|
|
pageData: { |
|
|
|
reportDate: this.dayjs().format('YYYY-MM-DD'), |
|
|
|
reportTime: this.dayjs().format('HH:mm:ss'), |
|
|
|
}, |
|
|
|
currentRollOps: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
seqNo: '', |
|
|
|
rollNo: '', |
|
|
|
finishedFlag: '', |
|
|
|
}, |
|
|
|
operatorData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
username: this.$store.state.user.name, |
|
|
|
@ -92,24 +94,11 @@ export default { |
|
|
|
seqNo: '', |
|
|
|
showFlag: false |
|
|
|
}, |
|
|
|
buttonTags:{ |
|
|
|
createRollFlag: true, |
|
|
|
switchRollFlag: true, |
|
|
|
separatorRollFlag: true, |
|
|
|
finishRollFlag: true, |
|
|
|
mergeRollFlag: true, |
|
|
|
tuningFlag: true, |
|
|
|
produceFlag: true, |
|
|
|
defectFlag: true, |
|
|
|
toolFlag: true, |
|
|
|
materialFlag: true, |
|
|
|
downTimeFlag: true |
|
|
|
}, |
|
|
|
dataListLoading: false, |
|
|
|
} |
|
|
|
}, |
|
|
|
components: { |
|
|
|
comMaterialSettlement,/*开始生产时候报告调机的材料的使用数量*/ |
|
|
|
comEndTuning,/*开始生产时 调用结束调机的功能*/ |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
|
|
|
|
@ -133,16 +122,37 @@ export default { |
|
|
|
this.$emit('update:visible', false); |
|
|
|
}, |
|
|
|
|
|
|
|
/*打开调机时候卷材料的耗用界面*/ |
|
|
|
materialSettlementModal(){ |
|
|
|
/*开始生产的方法*/ |
|
|
|
startProduceFun(){ |
|
|
|
//首先要检查是否可以开始生产 |
|
|
|
checkStartProduce(this.scheduleData).then(({data}) => { |
|
|
|
//判断返回的结果 ---》异常 |
|
|
|
if(data.code == 500){ |
|
|
|
this.$message.error(data.msg); |
|
|
|
//需要跳转到结束调机的功能 |
|
|
|
}else if (data.resultMap.resultCode == 201){ |
|
|
|
//需要跳到结束停机的页面 |
|
|
|
debugger; |
|
|
|
this.comEndTuningModal(); |
|
|
|
}else{ |
|
|
|
//需要报告开始生产 |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
/*打开结束调机的modal*/ |
|
|
|
comEndTuningModal(){ |
|
|
|
//打开当前的页面 |
|
|
|
this.$nextTick(() => { |
|
|
|
//打开modal |
|
|
|
this.materialSettlementFlag = true; |
|
|
|
this.$refs.comMaterialSettlement.init(this.scheduleData, this.operatorData); |
|
|
|
this.endTuningFlag = true; |
|
|
|
this.$refs.comEndTuning.init(this.scheduleData, this.operatorData); |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
created() { |
|
|
|
// this.factoryList() |
|
|
|
|
