44

pages/pda/jobBooking/components/semiProductJobBomPL.vue

@@ -117,7 +117,7 @@
 
 					<view class="item ww40 rx-bc">
 						<text>处置</text>
-						<image class="icon" @click="handAddListPL(it, idx)" src="~@/static/pda/add.svg"
+						<image v-if='!isDetails' class="icon" @click="handAddListPL(it, idx)" src="~@/static/pda/add.svg"
 							style="width: 46rpx;height: 46rpx;margin-right: 12rpx;"></image>
 
 					</view>
@@ -151,7 +151,7 @@
 						</view>
 
 						<view class="item ww10">
-							<uni-icons custom-prefix="iconfont" type="icon-shanchu" size="16"
+							<uni-icons v-if='!isDetails' custom-prefix="iconfont" type="icon-shanchu" size="16"
 								@click="handDel3(idx, yyIdx)" color="#fa3534"></uni-icons>
 						</view>
 

pages/pda/workOrder/index/details.vue

@@ -41,8 +41,12 @@
 						:list='objData.instanceList' :item='objData' :isDetails='true'> </oneJobBom>
 
 					<semiProductJobBom
-						v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType != 6'
+						v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType != 6  && objData.singleReport == 1' 
 						:list='objData.semiProductList' :item='objData' :isDetails='true'> </semiProductJobBom>
+						
+						<semiProductJobBomPL
+							v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType != 6  && objData.singleReport == 0'
+							:list='objData.semiProductList' :item='objData' :isDetails='true'> </semiProductJobBomPL>
 
 
 
@@ -117,7 +121,8 @@
 	import modelBom from '../../feeding/components/modelBom.vue'
 	import jobBom from '../../jobBooking/components/jobBom.vue'
 	import oneJobBom from '../../jobBooking/components/oneJobBom.vue'
-	import semiProductJobBom from '../../jobBooking/components/oneJobBom.vue'
+	import semiProductJobBom from '../../jobBooking/components/semiProductJobBom.vue'
+	import semiProductJobBomPL from '../../jobBooking/components/semiProductJobBomPL.vue'
 	import oneJobQualityBom from '../../jobBooking/components/oneJobQualityBom.vue'
 
 	import byProductBom from '../../jobBooking/components/byProductBom'
@@ -148,6 +153,7 @@
 			jobBom,
 			oneJobBom,
 			semiProductJobBom,
+			semiProductJobBomPL,
 			oneJobQualityBom,
 			byProductBom,
 			turnoverBom,