优化

pages/pda/feeding/components/instanceBom.vue

@@ -272,14 +272,14 @@
 					this.list.forEach(o => {
 						if (o.deviceId && f.id == o.deviceId && this.deviceList.length > 1) {
 							o.extInfo.heatNumber = f.extInfo.heatNumber
-								o['workstationName'] = f.workstationName
+							o['workstationName'] = f.workstationName
 						} else if (this.deviceList.length == 1) {
 							o['deviceName'] = this.deviceList[0].name
 							o['deviceId'] = this.deviceList[0].id
-							o['workstationName'] =  this.deviceList[0].workstationName
+							o['workstationName'] = this.deviceList[0].workstationName
 							o.extInfo.heatNumber = this.deviceList[0].extInfo.heatNumber
-							
-						     this.$forceUpdate()
+
+							this.$forceUpdate()
 						}
 					})
 				})

pages/pda/feeding/details.vue

@@ -47,6 +47,8 @@
 						:revolvingDiskList="item.revolvingDiskList"></revolvingDiskBom>
 
 					<packingBom v-if='item.packingList.length != 0' :list='item.packingList'></packingBom>
+					
+				
 
 
 

pages/pda/jobBooking/components/oneJobQualityBom.vue

@@ -87,7 +87,7 @@
 					<view class="rx ww50">
 						<view class="lable lable150 rx-cc ">设备</view>
 						<view class="content ">
-							<view>{{it.extInfo.deviceName }}</view>
+							<view>{{it.deviceName || it.extInfo.deviceName}}</view>
 						</view>
 					</view>
 				

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -96,7 +96,7 @@
 					<view class="rx ww50">
 						<view class="lable lable150 rx-cc ">设备</view>
 						<view class="content ">
-							<view>{{it.extInfo.deviceName }}</view>
+							<view>{{ it.deviceName || it.extInfo.deviceName }}</view>
 						</view>
 					</view>