|
@@ -27,7 +27,7 @@
|
|
|
:page-size="20"
|
|
:page-size="20"
|
|
|
>
|
|
>
|
|
|
<template v-slot:toolbar>
|
|
<template v-slot:toolbar>
|
|
|
- <el-button type="primary" size="mini" @click="batchKittingComplete"
|
|
|
|
|
|
|
+ <el-button v-if="type != 'order' && type != 'plan'" type="primary" size="mini" @click="batchKittingComplete"
|
|
|
>批量齐套检查</el-button
|
|
>批量齐套检查</el-button
|
|
|
>
|
|
>
|
|
|
</template>
|
|
</template>
|
|
@@ -48,8 +48,8 @@
|
|
|
type="primary"
|
|
type="primary"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
|
@click="kittingComplete(row)"
|
|
@click="kittingComplete(row)"
|
|
|
- v-if="type == 'plan' || row.preType == '6'"
|
|
|
|
|
>
|
|
>
|
|
|
|
|
+ <!-- v-if="type == 'plan' || row.preType == '6'" -->
|
|
|
齐套检查
|
|
齐套检查
|
|
|
</el-link>
|
|
</el-link>
|
|
|
|
|
|
|
@@ -57,7 +57,7 @@
|
|
|
type="primary"
|
|
type="primary"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
|
@click="taskAssignment"
|
|
@click="taskAssignment"
|
|
|
- v-if="row.statusStr == '缺料' && row.preType == '6'"
|
|
|
|
|
|
|
+ v-if="row.statusStr == '缺料' && type == 'plan' && row.preType == '5'"
|
|
|
>
|
|
>
|
|
|
任务派单
|
|
任务派单
|
|
|
</el-link>
|
|
</el-link>
|
|
@@ -128,7 +128,8 @@
|
|
|
import {
|
|
import {
|
|
|
completenessCheck,
|
|
completenessCheck,
|
|
|
taskReleaseWork,
|
|
taskReleaseWork,
|
|
|
- updatePreRelease
|
|
|
|
|
|
|
+ updatePreRelease,
|
|
|
|
|
+ updatePreReleaseOrder
|
|
|
} from '@/api/productionPlan';
|
|
} from '@/api/productionPlan';
|
|
|
import { listOrganizations, getUserPage } from '@/api/system/organization';
|
|
import { listOrganizations, getUserPage } from '@/api/system/organization';
|
|
|
import kittingComplete from './kittingComplete.vue';
|
|
import kittingComplete from './kittingComplete.vue';
|
|
@@ -253,8 +254,14 @@
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
|
- async completenessCheck(planId) {
|
|
|
|
|
- this.preReleaseList = await completenessCheck({ planId });
|
|
|
|
|
|
|
+ async completenessCheck(planId, apsWorkOrderId) {
|
|
|
|
|
+ const params = {
|
|
|
|
|
+ planId,
|
|
|
|
|
+ }
|
|
|
|
|
+ if(apsWorkOrderId) {
|
|
|
|
|
+ params.apsWorkOrderId = apsWorkOrderId;
|
|
|
|
|
+ }
|
|
|
|
|
+ this.preReleaseList = await completenessCheck(params);
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
// reload(where) {
|
|
// reload(where) {
|
|
@@ -288,6 +295,8 @@
|
|
|
} else {
|
|
} else {
|
|
|
if (item.id && this.type == 'plan') {
|
|
if (item.id && this.type == 'plan') {
|
|
|
this.completenessCheck(item.id);
|
|
this.completenessCheck(item.id);
|
|
|
|
|
+ } else if (this.type == 'order') {
|
|
|
|
|
+ this.completenessCheck(item.productionPlanId, item.id);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -302,7 +311,13 @@
|
|
|
this.dialogVisible = false;
|
|
this.dialogVisible = false;
|
|
|
},
|
|
},
|
|
|
updatePreRelease(item) {
|
|
updatePreRelease(item) {
|
|
|
- updatePreRelease(item);
|
|
|
|
|
|
|
+ if (this.type == 'plan') {
|
|
|
|
|
+ updatePreRelease(item);
|
|
|
|
|
+ } else if (this.type == 'order') {
|
|
|
|
|
+ item.apsWorkOrderId = this.itemData.id;
|
|
|
|
|
+ updatePreReleaseOrder(item);
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$emit('update');
|
|
|
},
|
|
},
|
|
|
kittingComplete(item) {
|
|
kittingComplete(item) {
|
|
|
if (item.preType == '5' || item.preType == '6') {
|
|
if (item.preType == '5' || item.preType == '6') {
|