优化

api/pda/workOrder.js

@@ -438,7 +438,17 @@ export async function applyoutsourceSave(params) {
 }
 
 
+//报工-跳过工序
+export async function skipTask(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/workreport/skipTask`, params, true,
+	);
 
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
 
 
 

pages/pda/jobBooking/index/index.vue

@@ -37,7 +37,7 @@
 
 					<oneJobQualityBom
 						v-if='objData.instanceList &&  objData.instanceList.length != 0 && taskType ==6 && clientEnvironmentId == 3'
-						:item='objData' :list='objData.pickOutInList'></oneJobQualityBom>
+						:item='objData' :list='objData.instanceList'></oneJobQualityBom>
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
 						@penalize='penalize'>
@@ -583,7 +583,13 @@
 					bol = this.objData.instanceList.every((e, i) => {
 						_i = i + 1
 
-						return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId && e.extInfo.reportWeight
+						if (this.taskType == 6) {
+							return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId
+						} else {
+							return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId && e.extInfo.reportWeight
+								
+						}
+
 					})
 
 					if (!bol) {

pages/pda/warehousing/components/packingBom.vue

@@ -124,7 +124,6 @@
 
 				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,  // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
 				
-
 				
 			}
 		},

pages/pda/warehousing/components/workOrderBom.vue

@@ -54,9 +54,6 @@
 
 
 
-
-
-
 			</view>
 		</view>
 

pages/pda/workOrder/extrusionMolding/index.vue

@@ -379,6 +379,19 @@
 					uni.navigateTo({
 						url
 					})
+				} else if(type == 'skip') {
+					uni.showModal({
+						title: '提示',
+						content:`是否跳过${taskName}工序！`,
+						confirmText: '确认', //这块是确定按钮的文字
+						success: rr => {
+							if (rr.confirm) {
+						    
+							} else {
+								
+							}
+						}
+					})
 				}
 
 

pages/pda/workOrder/index/details.vue

@@ -31,11 +31,14 @@
 					<palletBom v-if="objData.palletList.length != 0" :palletList='objData.palletList' :isDetails='true'>
 					</palletBom>
 
-					<!-- <revolvingDiskBom v-if="objData.revolvingDiskList.length > 0"
-						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom> -->
+					<revolvingDiskBom v-if="objData.revolvingDiskList.length > 0"
+						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom>
 
-					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0'
+					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0 & taskType != 6'
 						:list='objData.instanceList' :item='objData' :isDetails='true'> </oneJobBom>
+						
+						<oneJobQualityBom v-if='objData.instanceList &&  objData.instanceList.length != 0 & taskType == 6'
+						:list='objData.instanceList' :item='objData' :isDetails='true'></oneJobQualityBom>
 
 
 					<byProductBom v-if='objData.productRecycleList.length != 0 ' :list='objData.productRecycleList'
@@ -76,13 +79,13 @@
 						<view>{{index + 1}}</view>
 						<view>报工时间: {{objData.createTime}}</view>
 					</view>
-					
-					
+
+
 					<workOrderBom2 :item='objData' v-if='objData' :isDetails='true'></workOrderBom2>
-					
-					<detailsBom v-if='objData.detailList.length != 0' :detailList='objData.detailList'  ></detailsBom>
-					
-				
+
+					<detailsBom v-if='objData.detailList.length != 0' :detailList='objData.detailList'></detailsBom>
+
+
 				</view>
 			</u-list>
 
@@ -109,6 +112,8 @@
 	import modelBom from '../../feeding/components/modelBom.vue'
 	import jobBom from '../../jobBooking/components/jobBom.vue'
 	import oneJobBom from '../../jobBooking/components/oneJobBom.vue'
+	import oneJobQualityBom from '../../jobBooking/components/oneJobQualityBom.vue'
+	
 	import byProductBom from '../../jobBooking/components/byProductBom'
 	import turnoverBom from '../../jobBooking/components/turnoverBom.vue'
 	import aridRegion from '../../feeding/components/aridRegion.vue'
@@ -120,11 +125,11 @@
 	import revolvingDiskBom from '../../feeding/components/revolvingDiskBom.vue'
 	import packingTgBom from '../../jobBooking/components/packingTgBom.vue'
 	import packingBom from '../../jobBooking/components/packingBomDetails.vue'
-	
-	
-	
+
+
+
 	// 
-	
+
 	import detailsBom from '../../warehousing/components/detailsBom.vue'
 	import workOrderBom2 from '../../warehousing/components/workOrderBom.vue'
 
@@ -135,6 +140,7 @@
 			modelBom,
 			jobBom,
 			oneJobBom,
+			oneJobQualityBom,
 			byProductBom,
 			turnoverBom,
 			aridRegion,
@@ -146,8 +152,8 @@
 			revolvingDiskBom,
 			packingTgBom,
 			packingBom,
-			
-			
+
+
 			detailsBom,
 			workOrderBom2
 		},