|
@@ -108,9 +108,7 @@
|
|
|
type="primary"
|
|
type="primary"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
v-if="
|
|
v-if="
|
|
|
- isshow &&
|
|
|
|
|
- $hasPermission('aps:productionplan:plandecomposition') &&
|
|
|
|
|
- row.approvalStatus != 1
|
|
|
|
|
|
|
+ isshow && $hasPermission('aps:productionplan:plandecomposition')
|
|
|
"
|
|
"
|
|
|
@click="disassemblePlan"
|
|
@click="disassemblePlan"
|
|
|
>计划分解</el-button
|
|
>计划分解</el-button
|
|
@@ -136,30 +134,20 @@
|
|
|
<el-button
|
|
<el-button
|
|
|
type="primary"
|
|
type="primary"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
- v-if="
|
|
|
|
|
- isshow &&
|
|
|
|
|
- $hasPermission('aps:productionplan:batchmerging') &&
|
|
|
|
|
- row.approvalStatus != 1
|
|
|
|
|
- "
|
|
|
|
|
|
|
+ v-if="isshow && $hasPermission('aps:productionplan:batchmerging')"
|
|
|
@click="handleMerge"
|
|
@click="handleMerge"
|
|
|
>合批</el-button
|
|
>合批</el-button
|
|
|
>
|
|
>
|
|
|
<el-button
|
|
<el-button
|
|
|
type="danger"
|
|
type="danger"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
- v-if="
|
|
|
|
|
- $hasPermission('aps:productionplan:extensionapplication') &&
|
|
|
|
|
- row.approvalStatus != 1
|
|
|
|
|
- "
|
|
|
|
|
|
|
+ v-if="$hasPermission('aps:productionplan:extensionapplication')"
|
|
|
>延期申请</el-button
|
|
>延期申请</el-button
|
|
|
>
|
|
>
|
|
|
<el-button
|
|
<el-button
|
|
|
type="danger"
|
|
type="danger"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
- v-if="
|
|
|
|
|
- $hasPermission('aps:productionplan:changerequest') &&
|
|
|
|
|
- row.approvalStatus != 1
|
|
|
|
|
- "
|
|
|
|
|
|
|
+ v-if="$hasPermission('aps:productionplan:changerequest')"
|
|
|
>变更申请</el-button
|
|
>变更申请</el-button
|
|
|
>
|
|
>
|
|
|
<el-button
|
|
<el-button
|
|
@@ -1308,6 +1296,10 @@
|
|
|
return this.$message.warning('计划分解只能选择一个计划!');
|
|
return this.$message.warning('计划分解只能选择一个计划!');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (this.selection[0].approvalStatus == 1) {
|
|
|
|
|
+ return this.$message.warning('该计划正在审核中!');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
this.$refs.disassemblePlanRef.open(this.selection[0]);
|
|
this.$refs.disassemblePlanRef.open(this.selection[0]);
|
|
|
},
|
|
},
|
|
|
|
|
|
|
@@ -1336,6 +1328,10 @@
|
|
|
if (produceRoutingId != this.selection[i].produceRoutingId) {
|
|
if (produceRoutingId != this.selection[i].produceRoutingId) {
|
|
|
return this.$message.warning('工艺路线不一致!');
|
|
return this.$message.warning('工艺路线不一致!');
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if (this.selection[i].approvalStatus == 1) {
|
|
|
|
|
+ return this.$message.warning('该计划正在审核中!');
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
this.$refs.mergeRef.open(this.selection);
|
|
this.$refs.mergeRef.open(this.selection);
|