|
|
@@ -24,6 +24,11 @@
|
|
|
<instanceBom v-if='it.instanceList.length != 0' :list='it.instanceList'></instanceBom>
|
|
|
|
|
|
<packingBom v-if='it.packingList.length != 0' :list='it.packingList'>></packingBom>
|
|
|
+
|
|
|
+ <palletBom v-if="Object.prototype.hasOwnProperty.call(it, 'palletList')" :palletList='it.palletList'></palletBom>
|
|
|
+
|
|
|
+ <revolvingDiskBom v-if="Object.prototype.hasOwnProperty.call(it, 'revolvingDiskList')" :revolvingDiskList="it.revolvingDiskList"></revolvingDiskBom>
|
|
|
+
|
|
|
|
|
|
</view>
|
|
|
|
|
|
@@ -44,6 +49,8 @@
|
|
|
import modelBom from '../components/modelBom.vue'
|
|
|
import instanceBom from '../components/instanceBom.vue'
|
|
|
import packingBom from '../components/packingBom.vue'
|
|
|
+ import palletBom from '../components/palletBom'
|
|
|
+ import revolvingDiskBom from '../components/revolvingDiskBom'
|
|
|
import {
|
|
|
feedByOrderIds
|
|
|
} from '@/api/pda/feeding.js'
|
|
|
@@ -53,7 +60,9 @@
|
|
|
deviceBom,
|
|
|
modelBom,
|
|
|
instanceBom,
|
|
|
- packingBom
|
|
|
+ packingBom,
|
|
|
+ palletBom,
|
|
|
+ revolvingDiskBom
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -73,6 +82,8 @@
|
|
|
async getList() {
|
|
|
const res = await feedByOrderIds(this.ids)
|
|
|
this.dataList = res
|
|
|
+
|
|
|
+ console.log(22, saaathis.dataList)
|
|
|
|
|
|
},
|
|
|
|
ysy