33

pages/pda/jobBooking/components/semiProductJobBomPL.vue

@@ -113,7 +113,7 @@
 					<view class="item ww25" style="font-size: 20rpx;">
 						合格品数量
 					</view>
-					<view class="item ww25">报工总重量{{it.extInfo.weightUnit}}</view>
+					<view class="item ww25">报工总重量/{{it.extInfo.weightUnit}} </view>
 
 					<view class="item ww40 rx-bc">
 						<text>处置</text>
@@ -140,7 +140,6 @@
 
 
 
-
 						<view class="item ww40" v-if='isDetails'>
 							{{it.extInfo.taskName}}
 						</view>
@@ -214,7 +213,6 @@
 				handler(newVal) {
 					this.deviceList = newVal
 					this.changeHeatNumber()
-
 				}
 			},
 		},
@@ -318,7 +316,6 @@
 
 
 			changeHeatNumber() {
-				console.log(this.deviceList)
 				this.deviceList.forEach(f => {
 					this.list.forEach(o => {
 						if (o.deviceId && f.instanceId == o.deviceId && this.deviceList.length > 1) {

pages/pda/jobBooking/index/index.vue

@@ -43,8 +43,8 @@
 
 
 					<semiProductJobBomPL
-						v-if='objData.semiProductListPL && objData.semiProductListPL.length != 0 && taskType != 4 && taskType != 6 && objData.singleReport == 0'
-						:item='objData' :list='objData.semiProductListPL' :equipmentList="objData.equipmentList">
+						v-if='objData.semiProductList && objData.semiProductList.length != 0 && taskType != 4 && taskType != 6 && objData.singleReport == 0'
+						:item='objData' :list='objData.semiProductList' :equipmentList="objData.equipmentList">
 					</semiProductJobBomPL>
 
 
@@ -473,7 +473,6 @@
 						this.objData['palletList'] = []
 					}
 
-
 					if (!this.objData.hasOwnProperty('revolvingDiskList')) {
 						this.objData['revolvingDiskList'] = []
 					}
@@ -522,7 +521,7 @@
 								a 
 							 }
 						 })
-						this.objData.semiProductListPL = this.objData.semiProductList
+						this.objData.semiProductList = this.objData.semiProductList
 					}
 
 
@@ -690,7 +689,6 @@
 
 
 				if (this.objData.productRecycleList.length > 0 && this.clientEnvironmentId != 2) {
-
 					const isRecycle = await this.checkRecycle()
 					if (!isRecycle) {
 						return false
@@ -702,7 +700,6 @@
 
 
 
-
 				if (this.taskType == 4 && this.clientEnvironmentId != 3) {
 					const isPack = await this.checkPack()
 
@@ -715,7 +712,7 @@
 
 
 
-				if (this.objData.currentTaskDiagram.isFirstTask == 0) { // isFirstTask  1是  判断是否首工序
+				if (this.objData.currentTaskDiagram.isFirstTask == 0 ) { // isFirstTask  1是  判断是否首工序
 
 					const isFirstTask = await this.checkFirstTask()
 					if (!isFirstTask) {
@@ -737,7 +734,6 @@
 
 
 
-
 				jobSave(this.objData).then(res => {
 
 
@@ -928,6 +924,7 @@
 					this.objData['turnover'] = res.extInfo.turnover
 					this.objData['productRecycleList'] = res.extInfo.productRecycleList
 					this.objData['semiProductList'] = res.extInfo.semiProductList
+				
 					this.objData['modelList'] = res.extInfo.modelList