|
@@ -23,7 +23,7 @@
|
|
|
<jobBom v-if='isLoad' :item='objData' :palletList='objData.palletList'
|
|
<jobBom v-if='isLoad' :item='objData' :palletList='objData.palletList'
|
|
|
:notFormed='objData.notFormedList' @penalize='penalize' @modeNum='modeNum'></jobBom>
|
|
:notFormed='objData.notFormedList' @penalize='penalize' @modeNum='modeNum'></jobBom>
|
|
|
|
|
|
|
|
- <oneJobBom v-if='objData.instanceList && objData.instanceList.length != 0' :item='objData'
|
|
|
|
|
|
|
+ <oneJobBom v-if='objData.instanceList && objData.instanceList.length != 0 && taskType != 4' :item='objData'
|
|
|
:list='objData.instanceList'>
|
|
:list='objData.instanceList'>
|
|
|
</oneJobBom>
|
|
</oneJobBom>
|
|
|
|
|
|
|
@@ -520,11 +520,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
// 预制体
|
|
// 预制体
|
|
|
- if (this.objData.instanceList.length > 0) {
|
|
|
|
|
|
|
+ if (this.objData.instanceList.length > 0 && this.taskType != 4) {
|
|
|
let bol
|
|
let bol
|
|
|
let _i
|
|
let _i
|
|
|
bol = this.objData.instanceList.every((e, i) => {
|
|
bol = this.objData.instanceList.every((e, i) => {
|
|
|
_i = i + 1
|
|
_i = i + 1
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId
|
|
return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId
|
|
|
})
|
|
})
|
|
|
|
|
|