|
|
|
|
@ -19,19 +19,19 @@ |
|
|
|
|
> |
|
|
|
|
<template #menu-left> |
|
|
|
|
<el-button type="primary" @click="handlePrintTags">过程记录打印</el-button> |
|
|
|
|
<el-button type="primary" @click="priorityFn">优先级调整</el-button> |
|
|
|
|
<!-- <el-button type="primary" @click="priorityFn">优先级调整</el-button> --> |
|
|
|
|
</template> |
|
|
|
|
<template #menu-right> |
|
|
|
|
<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> |
|
|
|
|
<!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> --> |
|
|
|
|
</template> |
|
|
|
|
<template #menu="scope"> |
|
|
|
|
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> |
|
|
|
|
<el-button type="text" @click="handleClose(scope.row)" v-show="scope.row.runStatus < 15" |
|
|
|
|
>关闭</el-button |
|
|
|
|
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" |
|
|
|
|
>优先级调整</el-button |
|
|
|
|
> |
|
|
|
|
<el-button |
|
|
|
|
type="text" |
|
|
|
|
@ -39,46 +39,16 @@ |
|
|
|
|
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)" |
|
|
|
|
>分批</el-button |
|
|
|
|
> |
|
|
|
|
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" |
|
|
|
|
>优先级调整</el-button |
|
|
|
|
> |
|
|
|
|
<el-button |
|
|
|
|
type="text" |
|
|
|
|
@click="handleAbnormal(scope.row)" |
|
|
|
|
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4" |
|
|
|
|
>异常申报</el-button |
|
|
|
|
> |
|
|
|
|
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15" |
|
|
|
|
>关闭</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"> |
|
|
|
|
@ -104,16 +74,29 @@ |
|
|
|
|
@closeDialog="closeDialog" |
|
|
|
|
></production-dialog> |
|
|
|
|
<!-- 分批弹窗 --> |
|
|
|
|
<batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog> |
|
|
|
|
<batches-dialog |
|
|
|
|
v-if="showBatches" |
|
|
|
|
:show-batches="showBatches" |
|
|
|
|
:itemData="itemData" |
|
|
|
|
@closeDialog="closeDialog" |
|
|
|
|
></batches-dialog> |
|
|
|
|
<!-- 关闭弹窗 --> |
|
|
|
|
<closed-dialog :show-close="showClose" @closeDialog="closeDialog"></closed-dialog> |
|
|
|
|
<!-- 异常处理 --> |
|
|
|
|
<abnormalDialog :show-abnormal="showAbnormal" @closeDialog="closeDialog"></abnormalDialog> |
|
|
|
|
<closed-dialog |
|
|
|
|
v-if="showClose" |
|
|
|
|
:show-close="showClose" |
|
|
|
|
@closeDialog="closeDialog" |
|
|
|
|
:itemData="itemData" |
|
|
|
|
></closed-dialog> |
|
|
|
|
<!-- 异常申报 --> |
|
|
|
|
<abnormalDialog |
|
|
|
|
v-if="showAbnormal" |
|
|
|
|
:show-abnormal="showAbnormal" |
|
|
|
|
@closeDialog="closeDialog" |
|
|
|
|
></abnormalDialog> |
|
|
|
|
<productionMonitoringDialog |
|
|
|
|
:showDialog="isPriorityOpen" |
|
|
|
|
v-if="isPriorityOpen" |
|
|
|
|
@closeDialog="closeDialog" |
|
|
|
|
@submitPriority="handlePrioritySubmit" |
|
|
|
|
></productionMonitoringDialog> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
@ -122,10 +105,11 @@ |
|
|
|
|
import productionDialog from '../../components/productionDialog.vue'; |
|
|
|
|
import batchesDialog from '../../components/batchesDialog.vue'; |
|
|
|
|
import closedDialog from '../../components/closedDialog.vue'; |
|
|
|
|
import abnormalDialog from '../../components/abnormalDialog.vue'; |
|
|
|
|
import abnormalDialog from './abnormalDialog.vue'; |
|
|
|
|
import productionMonitoringDialog from '../../components/productionMonitoringDialog.vue'; |
|
|
|
|
|
|
|
|
|
import { getList } from '@/api/productionManagement/sinTerWorkOrder'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
components: { |
|
|
|
|
productionDialog, |
|
|
|
|
@ -136,9 +120,9 @@ export default { |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
itemData: [], //存数据 |
|
|
|
|
isPriorityOpen: false, |
|
|
|
|
showAbnormal: false, |
|
|
|
|
showRadio: true, |
|
|
|
|
monitorDialog: false, |
|
|
|
|
showBatches: false, |
|
|
|
|
showClose: false, |
|
|
|
|
@ -499,25 +483,20 @@ export default { |
|
|
|
|
}, |
|
|
|
|
// 优先级调整 |
|
|
|
|
priorityFn(row) { |
|
|
|
|
this.rowItem = row; |
|
|
|
|
console.log(row.runStatus, 123); |
|
|
|
|
this.itemData = [row]; |
|
|
|
|
this.isPriorityOpen = true; |
|
|
|
|
// console.log(runStatus,123) |
|
|
|
|
}, |
|
|
|
|
handlePrioritySubmit(data) { |
|
|
|
|
this.$message.success( |
|
|
|
|
`优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}` |
|
|
|
|
); |
|
|
|
|
}, |
|
|
|
|
selectionChange(val) { |
|
|
|
|
this.selectionList = val; |
|
|
|
|
}, |
|
|
|
|
// 分批 |
|
|
|
|
handleBatches() { |
|
|
|
|
handleBatches(row) { |
|
|
|
|
this.itemData = [row]; |
|
|
|
|
this.showBatches = true; |
|
|
|
|
}, |
|
|
|
|
// 关闭 |
|
|
|
|
handleClose() { |
|
|
|
|
handleClose(row) { |
|
|
|
|
this.itemData = [row]; |
|
|
|
|
this.showClose = true; |
|
|
|
|
}, |
|
|
|
|
// 生产监控 |
|
|
|
|
@ -544,17 +523,9 @@ export default { |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// 配套单打印 |
|
|
|
|
handlePrint() {}, |
|
|
|
|
processingHandle() { |
|
|
|
|
const targetStatuses = [3, 5, 4, 6]; |
|
|
|
|
const filteredData = this.data.filter(item => targetStatuses.includes(item.runStatus)); |
|
|
|
|
const originalData = [...this.data]; |
|
|
|
|
this.data = filteredData; |
|
|
|
|
this.$message.success(`已筛选出${filteredData.length}条符合条件的订单`); |
|
|
|
|
}, |
|
|
|
|
// 异常申报 |
|
|
|
|
handleAbnormal() { |
|
|
|
|
handleAbnormal(row) { |
|
|
|
|
this.itemData = [row]; |
|
|
|
|
this.showAbnormal = true; |
|
|
|
|
}, |
|
|
|
|
// 关闭弹窗 |
|
|
|
|
@ -564,12 +535,15 @@ export default { |
|
|
|
|
this.showClose = false; |
|
|
|
|
this.showAbnormal = false; |
|
|
|
|
this.isPriorityOpen = false; |
|
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
|
}, |
|
|
|
|
currentChange(currentPage) { |
|
|
|
|
this.page.currentPage = currentPage; |
|
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
|
}, |
|
|
|
|
sizeChange(pageSize) { |
|
|
|
|
this.page.pageSize = pageSize; |
|
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
|
}, |
|
|
|
|
refreshChange() { |
|
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
|
@ -577,7 +551,7 @@ export default { |
|
|
|
|
searchReset() { |
|
|
|
|
this.query = {}; |
|
|
|
|
this.treeDeptId = ''; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
this.onLoad(this.page, this.query); |
|
|
|
|
}, |
|
|
|
|
searchChange(params, done) { |
|
|
|
|
this.query = params; |
|
|
|
|
|
