|
|
|
@ -60,19 +60,22 @@ |
|
|
|
<span>{{ this.currentRollOps.rollNo }}</span> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm" :disabled="buttonTags.createNewRollFlag" |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm" |
|
|
|
:disabled="buttonTags.createNewRollFlag" |
|
|
|
style="margin-left: 5px; margin-bottom: 5px;"> |
|
|
|
创建新卷 |
|
|
|
</el-button> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag" |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="switchRollModal" |
|
|
|
:disabled="buttonTags.switchRollFlag" |
|
|
|
style="margin-left: 10px; margin-bottom: 5px;"> |
|
|
|
切换卷 |
|
|
|
</el-button> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="separateRollModal" :disabled="buttonTags.separateRollFlag" |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="separateRollModal" |
|
|
|
:disabled="buttonTags.separateRollFlag" |
|
|
|
style="margin-left: 10px; margin-bottom: 5px;"> |
|
|
|
创建分卷 |
|
|
|
</el-button> |
|
|
|
@ -165,9 +168,12 @@ |
|
|
|
width="75" |
|
|
|
:label="'操作'"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N'" @click="replaceToolModal(scope.row)" |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N'" |
|
|
|
@click="replaceToolModal(scope.row)" |
|
|
|
>刀模替换</a> |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'Y' && scope.row.rollNo == '*'" @click="warnFinishToolConfirm(scope.row)" |
|
|
|
<a class="customer-a" |
|
|
|
v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'Y' && scope.row.rollNo == '*'" |
|
|
|
@click="warnFinishToolConfirm(scope.row)" |
|
|
|
>结束使用</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -246,10 +252,12 @@ |
|
|
|
&& scope.row.finishedFlag == 'N' && scope.row.histType == '发料'" |
|
|
|
@click="replaceMaterialModal(scope.row)">换料</a> |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.rollNo == '*' && scope.row.sAPBOMItemNo >= 0 |
|
|
|
&& scope.row.finishedFlag == 'N' && scope.row.histType == '发料'" @click="cuttingMaterialModal(scope.row)" |
|
|
|
&& scope.row.finishedFlag == 'N' && scope.row.histType == '发料'" |
|
|
|
@click="cuttingMaterialModal(scope.row)" |
|
|
|
>下料</a> |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N' && scope.row.sAPBOMItemNo >= 0 |
|
|
|
&& scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'" @click="warnFinishMaterialWithNoRemainderConfirm(scope.row)" |
|
|
|
&& scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'" |
|
|
|
@click="warnFinishMaterialWithNoRemainderConfirm(scope.row)" |
|
|
|
>生产结束</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -336,9 +344,11 @@ |
|
|
|
width="115" |
|
|
|
:label="'操作'"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'" @click="warnReopenSfdcRollsConfirm(scope.row)" |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'" |
|
|
|
@click="warnReopenSfdcRollsConfirm(scope.row)" |
|
|
|
>重打开</a> |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != ''" @click="warnDeleteSfdcRollsConfirm(scope.row)" |
|
|
|
<a class="customer-a" v-if="operatorData.operatorName != ''" |
|
|
|
@click="warnDeleteSfdcRollsConfirm(scope.row)" |
|
|
|
>删除卷</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -358,18 +368,21 @@ |
|
|
|
</el-button> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="switchOperatorModal" style="margin-left: 20px; margin-top: 20px;"> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="switchOperatorModal" |
|
|
|
style="margin-left: 20px; margin-top: 20px;"> |
|
|
|
切换用户 |
|
|
|
</el-button> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item style="margin-top: 35px;"> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="startTuningModal" :disabled="buttonTags.tuningFlag" |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="startTuningModal" |
|
|
|
:disabled="buttonTags.tuningFlag" |
|
|
|
style="margin-left: 15px; margin-bottom: 5px;"> |
|
|
|
开始调机 |
|
|
|
</el-button> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item style="margin-top: 35px;"> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="startProduceModal" :disabled="buttonTags.produceFlag" |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="startProduceModal" |
|
|
|
:disabled="buttonTags.produceFlag" |
|
|
|
style="margin-left: 20px; margin-bottom: 5px;"> |
|
|
|
开始生产 |
|
|
|
</el-button> |
|
|
|
@ -381,7 +394,8 @@ |
|
|
|
<legend class="customer-legend">不良</legend> |
|
|
|
<el-form style="text-align: center;"> |
|
|
|
<el-form-item style="margin-top: 5px;"> |
|
|
|
<el-button class="customer-bun-mid" @click="defectRollModal" type="primary" :disabled="buttonTags.defectFlag" |
|
|
|
<el-button class="customer-bun-mid" @click="defectRollModal" type="primary" |
|
|
|
:disabled="buttonTags.defectFlag" |
|
|
|
style="margin-left: 0px; margin-top: 10px;"> |
|
|
|
报告不良 |
|
|
|
</el-button> |
|
|
|
@ -426,30 +440,31 @@ |
|
|
|
style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;"> |
|
|
|
<legend class="customer-legend">其他操作</legend> |
|
|
|
<el-form style="text-align: center;"> |
|
|
|
<el-form-item> |
|
|
|
<el-button class="customer-bun-mid" type="primary" @click="finishPartRollModal" |
|
|
|
style="margin-left: 0px; margin-top: 20px;"> |
|
|
|
产量报告 |
|
|
|
</el-button> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item style="margin-top: 20px ; margin-left: 10px"> |
|
|
|
<el-popover |
|
|
|
placement="right" |
|
|
|
width="80" |
|
|
|
width="150" |
|
|
|
content |
|
|
|
v-model="popoverFlag" |
|
|
|
trigger="click"> |
|
|
|
<el-button type="primary" @click="bulkInspection" |
|
|
|
style=" width: 80px; margin-bottom: 5px; margin-left: 10px; "> |
|
|
|
其它操作 |
|
|
|
<div style="text-align: right; margin: 0;width: 120px;"> |
|
|
|
<el-button type="primary" @click="finishPartRollModal" |
|
|
|
style=" width: 120px; margin-bottom: 5px; margin-left: 3PX"> |
|
|
|
产量报告 |
|
|
|
</el-button> |
|
|
|
<el-button type="primary" @click="bulkInspection" |
|
|
|
style=" width: 80px; margin-bottom: 5px; "> |
|
|
|
其它操作 |
|
|
|
<el-button type="primary" @click="switchRollReverse" |
|
|
|
style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; "> |
|
|
|
删除卷 |
|
|
|
</el-button> |
|
|
|
<el-button type="primary" @click="bulkInspection" |
|
|
|
style=" width: 80px; margin-bottom: 5px; "> |
|
|
|
其它操作 |
|
|
|
<el-button type="primary" @click="notOverFinishRollModal" |
|
|
|
style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; "> |
|
|
|
未生产下机拆卷 |
|
|
|
</el-button> |
|
|
|
</div> |
|
|
|
<el-button type="primary" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true" |
|
|
|
slot="reference">其它操作 |
|
|
|
</el-button> |
|
|
|
<el-button type="primary" style=" width: 80px; margin-bottom: 5px; " slot="reference">其它操作</el-button> |
|
|
|
</el-popover> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
@ -555,7 +570,9 @@ |
|
|
|
|
|
|
|
</comFinishSchedule> |
|
|
|
|
|
|
|
<notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag" @refreshPageData="refreshPageData"> </notOverFinishRoll> |
|
|
|
<!-- 为生产下机拆卷 --> |
|
|
|
<notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag" |
|
|
|
@refreshPageData="refreshPageData"></notOverFinishRoll> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
@ -581,6 +598,7 @@ import { |
|
|
|
deleteSfdcRolls,/*删除sfdcRolls的操作*/ |
|
|
|
processFinishTool,/*执行工具的结束使用的方法*/ |
|
|
|
finishMaterialWithNoRemainder,/*执行材料结束使用 且无剩余 */ |
|
|
|
switchrollReverse, |
|
|
|
} from "@/api/yieldReport/produce_report_normal.js"; |
|
|
|
/*引入组件*/ |
|
|
|
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ |
|
|
|
@ -599,13 +617,13 @@ import comReplaceMaterial from "./com_replace_material"/*换料组件*/ |
|
|
|
import comCuttingMaterial from "./com_cutting_material"/*材料下料*/ |
|
|
|
import comProduceDown from "./com_produce_down";/*停机组件*/ |
|
|
|
import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/ |
|
|
|
import notOverFinishRoll from "./not_over_finish_roll";/*结束派工单组件*/ |
|
|
|
/*生产过程的停机组件*/ |
|
|
|
import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机组件*/ |
|
|
|
export default { |
|
|
|
name: "com_produce_report_normal", |
|
|
|
data() { |
|
|
|
return { |
|
|
|
titleCon: '', |
|
|
|
popoverFlag: false, |
|
|
|
showNotOverFlag: false, |
|
|
|
showOperatorFlag: false, |
|
|
|
showSwitchFlag: false, |
|
|
|
@ -2819,7 +2837,9 @@ export default { |
|
|
|
nextItemNo: 0, |
|
|
|
operatorId: '', |
|
|
|
functionName: '', |
|
|
|
currentRollFlag: false |
|
|
|
currentRollFlag: false, |
|
|
|
repairOrderFlag:'', |
|
|
|
checkMultipleRoll: '' |
|
|
|
}, |
|
|
|
currentRollOps: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -2871,8 +2891,40 @@ export default { |
|
|
|
notOverFinishRoll,/*异常下级报工*/ |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
|
|
|
|
// 删除卷 |
|
|
|
switchRollReverse() { |
|
|
|
if (this.currentRollOps.rollNo === '暂无卷号') { |
|
|
|
this.$message.warning('暂无卷号!'); |
|
|
|
this.popoverFlag = false |
|
|
|
return; |
|
|
|
} |
|
|
|
this.$confirm(`确定要删除${this.currentRollOps.rollNo}当前卷？`, '提示', { |
|
|
|
confirmButtonText: '确认', |
|
|
|
celButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
//执行删除卷 |
|
|
|
this.scheduleData.repairOrderFlag = 'Y' |
|
|
|
this.scheduleData.checkMultipleRoll = 'Y' |
|
|
|
switchrollReverse(this.scheduleData).then(({data}) => { |
|
|
|
if (data.code == 0) { |
|
|
|
this.$message.success(data.msg) |
|
|
|
} |
|
|
|
if (data.code == 400) { |
|
|
|
this.$message.warning(data.msg) |
|
|
|
} |
|
|
|
if (data.code == 500) { |
|
|
|
this.$message.error(data.msg) |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
}); |
|
|
|
this.popoverFlag = false |
|
|
|
}, |
|
|
|
// 异常下机报工 |
|
|
|
notOverFinishRollModal() { |
|
|
|
this.popoverFlag = false |
|
|
|
this.$nextTick(() => { |
|
|
|
this.showNotOverFlag = true; |
|
|
|
this.$refs.notOverFinishRoll.init(this.scheduleData, this.operatorData) |
|
|
|
@ -3222,6 +3274,7 @@ export default { |
|
|
|
|
|
|
|
/*产量报告的卷操作*/ |
|
|
|
finishPartRollModal() { |
|
|
|
this.popoverFlag = false |
|
|
|
//1.首先调用菜单判断方式 看看是否可以结束卷 |
|
|
|
//checkProduceButton('finishRollFlag'); |
|
|
|
//打开结束卷的页面 |
|
|
|
@ -3391,9 +3444,11 @@ export default { |
|
|
|
|
|
|
|
/*执行重新sfdcRolls表的记录*/ |
|
|
|
reopenSfdcRollsOperation(sfdcRollRow) { |
|
|
|
let sfdcRoll = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
let sfdcRoll = { |
|
|
|
'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo, |
|
|
|
'rollNo': sfdcRollRow.rollNo, 'operatorId': this.scheduleData.operatorId}; |
|
|
|
'rollNo': sfdcRollRow.rollNo, 'operatorId': this.scheduleData.operatorId |
|
|
|
}; |
|
|
|
reopenSfdcRolls(sfdcRoll).then(({data}) => { |
|
|
|
//判断是否成功 |
|
|
|
if (data.code == 500) { |
|
|
|
@ -3420,9 +3475,11 @@ export default { |
|
|
|
|
|
|
|
/*执行删除sfdcRolls的数据功能*/ |
|
|
|
deleteSfdcRollsOperation(sfdcRollRow) { |
|
|
|
let sfdcRoll = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
let sfdcRoll = { |
|
|
|
'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo, |
|
|
|
'rollNo': sfdcRollRow.rollNo, 'oriRollNo': sfdcRollRow.oriRollNo, 'operatorId': this.scheduleData.operatorId}; |
|
|
|
'rollNo': sfdcRollRow.rollNo, 'oriRollNo': sfdcRollRow.oriRollNo, 'operatorId': this.scheduleData.operatorId |
|
|
|
}; |
|
|
|
//执行删除卷的操作 |
|
|
|
deleteSfdcRolls(sfdcRoll).then(({data}) => { |
|
|
|
//判断是否成功 |
|
|
|
@ -3450,9 +3507,11 @@ export default { |
|
|
|
|
|
|
|
/*执行删除sfdcRolls的数据功能*/ |
|
|
|
finishToolOperation(toolRow) { |
|
|
|
let toolData = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
let toolData = { |
|
|
|
'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo, |
|
|
|
'histSeqNo': toolRow.histSeqNo, 'toolInstanceId': toolRow.toolInstanceId}; |
|
|
|
'histSeqNo': toolRow.histSeqNo, 'toolInstanceId': toolRow.toolInstanceId |
|
|
|
}; |
|
|
|
//执行删除卷的操作 |
|
|
|
processFinishTool(toolData).then(({data}) => { |
|
|
|
//判断是否成功 |
|
|
|
@ -3480,9 +3539,11 @@ export default { |
|
|
|
|
|
|
|
/*执行结束使用 材料的数据功能*/ |
|
|
|
finishMaterialWithNoRemainderOperation(materialRow) { |
|
|
|
let materialData = {'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
let materialData = { |
|
|
|
'site': this.scheduleData.site, 'orderNo': this.scheduleData.orderNo, |
|
|
|
'itemNo': this.scheduleData.itemNo, 'seqNo': this.scheduleData.seqNo, |
|
|
|
'histSeqNo': materialRow.histSeqNo, 'rollNo': materialRow.rollNo}; |
|
|
|
'histSeqNo': materialRow.histSeqNo, 'rollNo': materialRow.rollNo |
|
|
|
}; |
|
|
|
//执行结束使用材料卷且无剩余的操作 |
|
|
|
finishMaterialWithNoRemainder(materialData).then(({data}) => { |
|
|
|
//判断是否成功 |
|
|
|
@ -3525,6 +3586,7 @@ export default { |
|
|
|
width: 80px; |
|
|
|
text-align: center; |
|
|
|
} |
|
|
|
|
|
|
|
/*当前按钮的通用样式*/ |
|
|
|
.customer-css .el-button--medium { |
|
|
|
padding: 5px 5px; |
|
|
|
@ -3547,4 +3609,6 @@ export default { |
|
|
|
.customer-item .el-input { |
|
|
|
margin-right: 25px; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
</style> |
