55

pages/pda/jobBooking/components/oneJobQualityBomPL.vue

@@ -326,7 +326,7 @@
 				</view>
 
 
-				<view class="item rx-sc" v-if="it.extInfo.batchReportInfo.length == 0 && it.extInfo.appearance == 1 ">
+				<view class="item rx-sc" v-if="it.extInfo.batchReportInfo.length == 0 ">
 					<view class="rx ">
 						<view class="lable lable150 rx-cc ">处置</view>
 						<view class="content content_num ">
@@ -434,7 +434,9 @@
 							</view>
 
 							<view class="item ww30 content_num">
-								<input class="uni-input" v-model="quaItem.remark"></input>
+									<view v-if="isDetails" >{{ quaItem.remark }}</view>
+								<input v-else class="uni-input" v-model="quaItem.remark"></input>
+							
 							</view>
 
 

pages/pda/workOrder/index/details.vue

@@ -44,14 +44,17 @@
 						v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType != 6  && objData.singleReport == 1' 
 						:list='objData.semiProductList' :item='objData' :isDetails='true'> </semiProductJobBom>
 						
-						<semiProductJobBomPL
+					<semiProductJobBomPL
 							v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType != 6  && objData.singleReport == 0'
 							:list='objData.semiProductList' :item='objData' :isDetails='true'> </semiProductJobBomPL>
 
 
 
-					<oneJobQualityBom v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType == 6'
+					<oneJobQualityBom v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType == 6 && clientEnvironmentId == 3 && objData.singleReport == 1'
 						:list='objData.semiProductList' :item='objData' :isDetails='true'></oneJobQualityBom>
+						
+					<oneJobQualityBomPL v-if='objData.semiProductList &&  objData.semiProductList.length != 0 & taskType == 6  && clientEnvironmentId == 3 && objData.singleReport == 0'
+							:list='objData.semiProductList' :item='objData' :isDetails='true'></oneJobQualityBomPL>
 
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
@@ -124,6 +127,7 @@
 	import semiProductJobBom from '../../jobBooking/components/semiProductJobBom.vue'
 	import semiProductJobBomPL from '../../jobBooking/components/semiProductJobBomPL.vue'
 	import oneJobQualityBom from '../../jobBooking/components/oneJobQualityBom.vue'
+	import oneJobQualityBomPL from '../../jobBooking/components/oneJobQualityBomPL.vue'
 
 	import byProductBom from '../../jobBooking/components/byProductBom'
 	import turnoverBom from '../../jobBooking/components/turnoverBom.vue'
@@ -155,6 +159,8 @@
 			semiProductJobBom,
 			semiProductJobBomPL,
 			oneJobQualityBom,
+			oneJobQualityBomPL,
+			
 			byProductBom,
 			turnoverBom,
 			aridRegion,