33

pages/pda/feeding/details.vue

@@ -61,7 +61,7 @@
 
 
 						<u-button size="small" class="u-reset-button" type="success"
-							@click="scanIt(item.workOrderId)">扫一扫1</u-button>
+							@click="scanIt(item.workOrderId)">扫一扫</u-button>
 
 					</view>
 				</view>

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -320,7 +320,6 @@
 					this.deviceList = newVal
 					this.changeHeatNumber()
 
-
 				}
 			},
 		},
@@ -565,10 +564,12 @@
 
 
 			changeHeatNumber() {
+				console.log(this.deviceList)
 				this.deviceList.forEach(f => {
 					this.list.forEach(o => {
-						if (o.deviceId && f.id == o.deviceId && this.deviceList.length > 1) {
+						if (o.deviceId && f.instanceId == o.deviceId && this.deviceList.length > 1) {
 							o.extInfo.heatNumber = f.extInfo.heatNumber
+							this.$forceUpdate()
 						} else if (this.deviceList.length == 1) {
 							o.extInfo.heatNumber = this.deviceList[0].extInfo.heatNumber
 							this.$forceUpdate()

pages/pda/jobBooking/index/index.vue

@@ -38,7 +38,8 @@
 
 					<semiProductJobBom
 						v-if='objData.semiProductList && objData.semiProductList.length != 0 && taskType != 4 && taskType != 6'
-						:item='objData' :list='objData.semiProductList' :equipmentList="objData.equipmentList"></semiProductJobBom>
+						:item='objData' :list='objData.semiProductList' :equipmentList="objData.equipmentList">
+					</semiProductJobBom>
 
 
 					<oneJobQualityBom
@@ -396,8 +397,8 @@
 				getByIdReport(this.id, this.taskId).then(res => {
 
 					this.objData = res
-			
-			
+
+
 
 					if (!this.objData.hasOwnProperty('turnover')) {
 						this.objData['turnover'] = []
@@ -575,6 +576,7 @@
 				uni.showLoading({
 					title: '加载中'
 				});
+
 				if (!this.objData.workReportInfo['formedNum'] && this.objData.workReportInfo['formedNum'] != 0) {
 					uni.showToast({
 						title: '请输入合格品数量',
@@ -582,24 +584,10 @@
 					})
 					return false
 				}
-				// if (!this.objData.workReportInfo['formedWeight'] && this.objData.workReportInfo['formedWeight'] != 0) {
-				// 	uni.showToast({
-				// 		title: '请输入合格品重量',
-				// 		icon: 'none'
-				// 	})
-				// 	return false
-				// }
 
 
 
 
-				// if (this.objData.notFormedList[0].notFormedNum > 0 && !this.objData.notFormedList[0].warehouseId) {
-				// 	uni.showToast({
-				// 		title: '请点击不合格品处置，选择仓库',
-				// 		icon: 'none'
-				// 	})
-				// 	return false
-				// }
 
 
 
@@ -671,6 +659,7 @@
 
 
 				if (this.taskType == 1) {
+
 					const isCache = await this.checkCache(type)
 
 					if (!isCache) {
@@ -809,6 +798,7 @@
 				uni.hideLoading();
 				return new Promise((resolve) => {
 					if (type == 1) {
+
 						saveCache(this.objData).then(rr => {
 							uni.showToast({
 								title: `已经缓存`,
@@ -816,8 +806,7 @@
 							})
 						})
 						resolve(false)
-					}
-					else if(type ==2) {
+					} else if (type == 2) {
 						resolve(true)
 					}
 
@@ -832,17 +821,22 @@
 				}
 
 				getCache(parma).then(res => {
-					if(!res) {
+					if (!res) {
 						return false;
 					}
+
+
 					this.objData['product'] = res.extInfo.product
+
+
 					this.objData['workReportInfo'] = res.extInfo.workReportInfo
 					this.objData['notFormedList'] = res.extInfo.notFormedList
 					this.objData['turnover'] = res.extInfo.turnover
 					this.objData['productRecycleList'] = res.extInfo.productRecycleList
-                 	this.objData['semiProductList'] = res.extInfo.semiProductList
+					this.objData['semiProductList'] = res.extInfo.semiProductList
 					this.objData['modelList'] = res.extInfo.modelList
-					
+
+					console.log(999, this.objData)
 
 				})
 			},