|
|
|
|
@ -21,13 +21,14 @@ |
|
|
|
|
<el-button type="primary" @click="handlePrintTags">过程记录打印</el-button> |
|
|
|
|
<el-button type="primary" @click="handlePrintTags">打印标签</el-button> |
|
|
|
|
<el-button type="primary" @click="handlePrint">配套单打印</el-button> |
|
|
|
|
<el-button type="primary" @click="priorityFn">优先级调整</el-button> |
|
|
|
|
<el-button type="primary" @click="priorityFnBatch">优先级调整</el-button> |
|
|
|
|
</template> |
|
|
|
|
<template #menu-right> |
|
|
|
|
<el-button type="success" plain @click="processingHandle">在制品</el-button> |
|
|
|
|
<el-button type="warning" plain>加工中</el-button> |
|
|
|
|
<el-button type="danger" plain>检验中</el-button> |
|
|
|
|
<el-button type="success" plain>已完工</el-button> |
|
|
|
|
<el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button> |
|
|
|
|
<el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button> |
|
|
|
|
<el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button> |
|
|
|
|
<el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button> |
|
|
|
|
<el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> |
|
|
|
|
</template> |
|
|
|
|
<template #menu="scope"> |
|
|
|
|
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> |
|
|
|
|
@ -50,36 +51,6 @@ |
|
|
|
|
>异常申报</el-button |
|
|
|
|
> |
|
|
|
|
</template> |
|
|
|
|
<template #tsName="{ row }">{{ row.makeTeam && row.makeTeam.tsName }}</template> |
|
|
|
|
<template #ppsName="{ row }">{{ row.procedureSet && row.procedureSet.ppsName }}</template> |
|
|
|
|
<template #planTime1="{ row }"> |
|
|
|
|
{{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : row.planTime1 || '-' }} |
|
|
|
|
</template> |
|
|
|
|
<template #planTime="{ row }"> |
|
|
|
|
{{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : row.planTime || '-' }} |
|
|
|
|
</template> |
|
|
|
|
<template #putStoreTime="{ row }"> |
|
|
|
|
{{ |
|
|
|
|
Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : row.putStoreTime || '-' |
|
|
|
|
}} |
|
|
|
|
</template> |
|
|
|
|
<template #partCode="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partCode }}</template> |
|
|
|
|
<template #prodIdent="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.prodIdent }}</template> |
|
|
|
|
<template #partName="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partName }}</template> |
|
|
|
|
<template #plate="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.plate }}</template> |
|
|
|
|
<template #productType="{ row }">{{ |
|
|
|
|
row.pjYieldOrder && row.pjYieldOrder.productType |
|
|
|
|
}}</template> |
|
|
|
|
<template #useDept="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.useDept }}</template> |
|
|
|
|
<template #poArea="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.poArea }}</template> |
|
|
|
|
<template #userName="{ row }">{{ row.dispatcher && row.dispatcher.userName }}</template> |
|
|
|
|
<template #nextPpsName="{ row }">{{ |
|
|
|
|
row.nextProcedureSet && row.nextProcedureSet.ppsName |
|
|
|
|
}}</template> |
|
|
|
|
<template #nextTeamName="{ row }">{{ row.nextMakeTeam && row.nextMakeTeam.tsName }}</template> |
|
|
|
|
<template #failureMan="{ row }">{{ |
|
|
|
|
row.pjYieldOrder && row.pjYieldOrder.failureMan && row.pjYieldOrder.failureMan.userName |
|
|
|
|
}}</template> |
|
|
|
|
</avue-crud> |
|
|
|
|
<el-dialog append-to-body v-model="printDialog" title="打印标签"> |
|
|
|
|
<el-form ref="printForm" :model="printForm" :rules="printRules"> |
|
|
|
|
@ -107,9 +78,15 @@ |
|
|
|
|
<!-- 分批弹窗 --> |
|
|
|
|
<batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog> |
|
|
|
|
<!-- 关闭弹窗 --> |
|
|
|
|
<closed-dialog :show-close="showClose" @closeDialog="closeDialog"></closed-dialog> |
|
|
|
|
<closed-dialog |
|
|
|
|
v-if="showClose" |
|
|
|
|
:show-close="showClose" |
|
|
|
|
@closeDialog="closeDialog" |
|
|
|
|
:itemData="itemData" |
|
|
|
|
></closed-dialog> |
|
|
|
|
<!-- 异常处理 --> |
|
|
|
|
<abnormalDialog :show-abnormal="showAbnormal" @closeDialog="closeDialog"></abnormalDialog> |
|
|
|
|
<!-- 优先级调整 --> |
|
|
|
|
<productionMonitoringDialog |
|
|
|
|
:showDialog="isPriorityOpen" |
|
|
|
|
v-if="isPriorityOpen" |
|
|
|
|
@ -137,6 +114,8 @@ export default { |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
itemData: [], |
|
|
|
|
|
|
|
|
|
isPriorityOpen: false, |
|
|
|
|
showAbnormal: false, |
|
|
|
|
showRadio: true, |
|
|
|
|
@ -206,7 +185,7 @@ export default { |
|
|
|
|
column: [ |
|
|
|
|
{ |
|
|
|
|
label: '当前工序', |
|
|
|
|
prop: 'ppsName', |
|
|
|
|
prop: 'wpId', |
|
|
|
|
fixed: 'left', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -215,7 +194,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '下一工序', |
|
|
|
|
prop: 'nextPpsName', |
|
|
|
|
prop: 'ppsNameNext', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
@ -229,41 +208,11 @@ export default { |
|
|
|
|
sortable: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
width: 200, |
|
|
|
|
|
|
|
|
|
dicData: [ |
|
|
|
|
{ |
|
|
|
|
value: 2, |
|
|
|
|
label: '待生产', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 3, |
|
|
|
|
label: '生产中', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 4, |
|
|
|
|
label: '检验中', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 6, |
|
|
|
|
label: '审理中', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 5, |
|
|
|
|
label: '工艺变更', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 19, |
|
|
|
|
label: '已返工', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 15, |
|
|
|
|
label: '已完成', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 21, |
|
|
|
|
label: '已作废', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=order_status', |
|
|
|
|
props: { |
|
|
|
|
label: 'dictValue', |
|
|
|
|
value: 'dictKey', |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '车间订单号', |
|
|
|
|
@ -359,7 +308,7 @@ export default { |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
label: 'MES流程卡号', |
|
|
|
|
prop: 'false', |
|
|
|
|
prop: 'mesCardNo', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
@ -367,7 +316,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '生产标识', |
|
|
|
|
prop: 'prodIdent', |
|
|
|
|
prop: 'productIdent', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
@ -383,35 +332,17 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '订单优先级', |
|
|
|
|
prop: 'priorityTitle', |
|
|
|
|
prop: 'priority', |
|
|
|
|
type: 'select', |
|
|
|
|
search: true, |
|
|
|
|
sortable: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
width: 200, |
|
|
|
|
|
|
|
|
|
dicData: [ |
|
|
|
|
{ |
|
|
|
|
value: 1, |
|
|
|
|
label: '正常-白色', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 2, |
|
|
|
|
label: '项目要求日期急件-橙色', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 3, |
|
|
|
|
label: '合同急件-黄色', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 4, |
|
|
|
|
label: '绩效零件-青色', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: 5, |
|
|
|
|
label: '调度标注急件-蓝色', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', |
|
|
|
|
props: { |
|
|
|
|
label: 'dictValue', |
|
|
|
|
value: 'dictKey', |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '需求部门', |
|
|
|
|
@ -512,7 +443,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验数量', |
|
|
|
|
prop: 'testQuantity', |
|
|
|
|
prop: 'testQty', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
@ -520,7 +451,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '报废数量', |
|
|
|
|
prop: 'scrapQuantity', |
|
|
|
|
prop: 'scrapQty', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
overHidden: true, |
|
|
|
|
@ -540,12 +471,24 @@ export default { |
|
|
|
|
}, |
|
|
|
|
mounted() {}, |
|
|
|
|
methods: { |
|
|
|
|
//查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单 |
|
|
|
|
queryOrdersHandle(status) { |
|
|
|
|
this.query = { |
|
|
|
|
runStatus: status, |
|
|
|
|
}; |
|
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
|
}, |
|
|
|
|
// 优先级调整 |
|
|
|
|
priorityFn(row) { |
|
|
|
|
this.rowItem = row; |
|
|
|
|
console.log(row.runStatus, 123); |
|
|
|
|
this.itemData = [row]; |
|
|
|
|
this.isPriorityOpen = true; |
|
|
|
|
}, |
|
|
|
|
priorityFnBatch() { |
|
|
|
|
if (this.selectionList.length == 0) { |
|
|
|
|
return this.$message.error('请先选择数据'); |
|
|
|
|
} |
|
|
|
|
this.itemData = this.selectionList; |
|
|
|
|
this.isPriorityOpen = true; |
|
|
|
|
// console.log(runStatus,123) |
|
|
|
|
}, |
|
|
|
|
handlePrioritySubmit(data) { |
|
|
|
|
this.$message.success( |
|
|
|
|
@ -610,12 +553,15 @@ export default { |
|
|
|
|
this.showAbnormal = true; |
|
|
|
|
}, |
|
|
|
|
// 关闭弹窗 |
|
|
|
|
closeDialog() { |
|
|
|
|
closeDialog(type) { |
|
|
|
|
this.monitorDialog = false; |
|
|
|
|
this.showBatches = false; |
|
|
|
|
this.showClose = false; |
|
|
|
|
this.showAbnormal = false; |
|
|
|
|
this.isPriorityOpen = false; |
|
|
|
|
if (type) { |
|
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
currentChange(currentPage) { |
|
|
|
|
this.page.currentPage = currentPage; |
|
|
|
|
@ -645,10 +591,14 @@ export default { |
|
|
|
|
this.$refs.crud.toggleSelection(); |
|
|
|
|
}, |
|
|
|
|
onLoad(page, params = {}) { |
|
|
|
|
// this.loading = true; |
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
this.loading = true; |
|
|
|
|
getList( |
|
|
|
|
page.currentPage, |
|
|
|
|
page.pageSize, |
|
|
|
|
Object.assign(params, this.query, { yieldType: '2' }) |
|
|
|
|
).then(res => { |
|
|
|
|
this.data = res.data.data.records; |
|
|
|
|
// this.loading = false; |
|
|
|
|
this.loading = false; |
|
|
|
|
this.page.total = res.data.data.total; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
|
