55

pages/pda/feeding/components/instanceBom.vue

@@ -47,7 +47,7 @@
 					</view>
 
 
-					<view class="item rx-sc" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
+					<view class="item rx-sc" v-if='mate.isConsumable == 0 && workInfo.singleReport != 0'>
 						<view class="rx ww50">
 							<view class="lable  rx-cc">{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</view>
 							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1">
@@ -59,7 +59,7 @@
 						</view>
 
 
-						<view class="rx ww50" v-if="workInfo.reportStatus != 0">
+						<view class="rx ww50" v-if="workInfo.singleReport != 0">
 							<view class="lable ww80 rx-cc">刻码</view>
 							<view class="content">{{mate.extInfo.engrave}}</view>
 						</view>
@@ -70,19 +70,19 @@
 
 
 
-					<view class="item"  v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
+					<view class="item"  v-if='mate.isConsumable == 0 && workInfo.singleReport != 0'>
 						<view class="lable rx-cc">物料代号</view>
 						<view class="content">{{mate.extInfo.materielCode}}</view>
 					</view>
 
 
-					<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
+					<view class="item" v-if='mate.isConsumable == 0 && workInfo.singleReport != 0'>
 						<view class="lable rx-cc">客户代号</view>
 						<view class="content">{{mate.extInfo.clientCode}}</view>
 					</view>
 
 
-					<view class="item" v-if='mate.isConsumable == 0 && deviceList.length > 0'>
+					<view class="item" v-if='deviceList.length > 0'>
 						<view class="rx ww70">
 							<view class="lable rx-cc">设备</view>
 							<view class="content content_num">
@@ -101,9 +101,9 @@
 					</view>
 
 					
-						<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus == 0'>
+						<view class="item" v-if='mate.isConsumable == 0 && workInfo.singleReport == 0'>
 							<view class="lable rx-cc">投料类型</view>
-							<view class="content" style="color:#157A2C;">{{ workInfo.reportStatus == 0 ? '批量投料' : ''}}</view>
+							<view class="content" style="color:#157A2C;">{{ workInfo.singleReport == 0 ? '批量投料' : ''}}</view>
 						</view>
 
 

pages/pda/feeding/components/semiProductBom.vue

@@ -73,7 +73,7 @@
 					</view>
 
 
-					<view class="item rx-sc" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
+					<view class="item rx-sc" v-if='mate.isConsumable == 0 && workInfo.singleReport != 0'>
 						<view class="rx ww50">
 							<view class="lable  rx-cc">{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</view>
 							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1">
@@ -85,7 +85,7 @@
 						</view>
 
 
-						<view class="rx ww50" v-if="workInfo.reportStatus != 0">
+						<view class="rx ww50" v-if="workInfo.singleReport != 0">
 							<view class="lable ww80 rx-cc">刻码</view>
 							<view class="content">{{mate.extInfo.engrave}}</view>
 						</view>
@@ -96,13 +96,13 @@
 
 
 
-					<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
+					<view class="item" v-if='mate.isConsumable == 0 && workInfo.singleReport != 0'>
 						<view class="lable rx-cc">物料代号</view>
 						<view class="content">{{mate.extInfo.materielCode}}</view>
 					</view>
 
 
-					<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
+					<view class="item" v-if='mate.isConsumable == 0 && workInfo.singleReport != 0'>
 						<view class="lable rx-cc">客户代号</view>
 						<view class="content">{{mate.extInfo.clientCode}}</view>
 					</view>
@@ -129,9 +129,9 @@
 					
 	
 					
-						<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus == 0'>
+						<view class="item" v-if='mate.isConsumable == 0 && workInfo.singleReport == 0'>
 							<view class="lable rx-cc">投料类型</view>
-							<view class="content" style="color:#157A2C;">{{ workInfo.reportStatus == 0 ? '批量投料' : ''}}</view>
+							<view class="content" style="color:#157A2C;">{{ workInfo.singleReport == 0 ? '批量投料' : ''}}</view>
 						</view>
 
 

pages/pda/jobBooking/index/index.vue

@@ -454,7 +454,7 @@
 				getByIdReport(this.id, this.taskId).then(res => {
 
 					this.objData = res
-					console.log(res)
+					console.log(22,res)
 
 
 					if (!this.objData.hasOwnProperty('turnover')) {