|
@@ -53,6 +53,9 @@
|
|
|
<el-tag v-else-if="row.changeType == 3" type="success"
|
|
<el-tag v-else-if="row.changeType == 3" type="success"
|
|
|
>已转生产计划</el-tag
|
|
>已转生产计划</el-tag
|
|
|
>
|
|
>
|
|
|
|
|
+ <el-tag v-else-if="row.changeType == 4" type="success"
|
|
|
|
|
+ >部分转生产计划</el-tag
|
|
|
|
|
+ >
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<template v-slot:status="{ row }">
|
|
<template v-slot:status="{ row }">
|
|
@@ -581,7 +584,7 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const unreceived = this.selection.find(
|
|
const unreceived = this.selection.find(
|
|
|
- (item) => item.approvalStatus == 2 && item.sendStatus != 2
|
|
|
|
|
|
|
+ (item) => item.approvalStatus == 2 && (item.sendStatus != 2 && item.sendStatus != 8)
|
|
|
);
|
|
);
|
|
|
if (unreceived) {
|
|
if (unreceived) {
|
|
|
return this.$message.warning(`请先收货再${actionText}`);
|
|
return this.$message.warning(`请先收货再${actionText}`);
|
|
@@ -589,7 +592,7 @@
|
|
|
|
|
|
|
|
const converted = this.selection.find(
|
|
const converted = this.selection.find(
|
|
|
(item) =>
|
|
(item) =>
|
|
|
- item.changeType == 1 || item.changeType == 2 || item.changeType == 3
|
|
|
|
|
|
|
+ item.changeType == 1 || item.changeType == 2 || item.changeType == 3 || item.changeType != 4
|
|
|
);
|
|
);
|
|
|
if (converted) {
|
|
if (converted) {
|
|
|
return this.$message.warning('该委托工单已转换,不能重复转换');
|
|
return this.$message.warning('该委托工单已转换,不能重复转换');
|