优化

api/pda/workOrder.js

@@ -103,6 +103,17 @@ export async function listWorkOrderByTaskId(params) {
 	return Promise.reject(data.message);
 }
 
+// 批量处理回收料
+export async function disposeorder(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/disposeorder/batchSave`, params, true,
+	);
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
+
 
 
 

pages/pda/by_product_recovery/index/index.vue

@@ -199,7 +199,8 @@
 	import {
 		treeByPid,
 		listWorkOrderByTaskId,
-		getWarehouseList
+		getWarehouseList,
+		disposeorder
 	} from '@/api/pda/workOrder.js'
 
 	import {
@@ -393,7 +394,11 @@
 					recyclell: this.recyclell,
 					memoList: this.memoList
 				}
-				console.log(param)
+				disposeorder(param).then(res => {
+					 console.log(res)
+					 	this.searchShow = false
+				})
+			
 			},
 
 

pages/pda/feeding/details.vue

@@ -34,7 +34,7 @@
 					<packingBom v-if='item.packingList.length != 0' :list='item.packingList'></packingBom>
 
 
-                 	<view class='flex_btn'  @click="openDetails(item.workOrderId)">投料单</view>
+                 	<view class='flex_btn'  @click="openDetails(item.workOrderId)">出库单</view>
 
 
 

pages/pda/workOrder/extrusionMolding/index.vue

@@ -387,7 +387,7 @@
 				let taskId = this.currentTaskId || this.taskId
 				let taskName = this.currentTaskName || this.info.taskName
 				let url = '/pages/pda/workOrder/index/details'
-				url += `?id=${this.info.id}&taskId=${taskId }&taskName=${taskName}`
+				url += `?id=${this.info.id}&taskId=${taskId }&taskName=${taskName}&taskType=${this.currentType}`
 				uni.navigateTo({
 					url
 				})

pages/pda/workOrder/index/details.vue

@@ -20,7 +20,11 @@
 					<modelBom v-if='objData.modelList.length != 0' :list='objData.modelList'>
 					</modelBom>
 
-           
+	             <qualityStat :normalQuality='objData.normalQuality' v-if='objData  && taskType == 3'></qualityStat>
+	
+					<sampleBom :item='objData.quality' v-if='objData.quality && taskType == 2' :workReportInfo='objData.workReportInfo'
+						:isDetails='true'></sampleBom>
+						   
 					<jobBom :item='objData' v-if="objData.notFormedList" :palletList='objData.palletList' :notFormed='objData.notFormedList'
 						:isDetails='true'></jobBom>
 					
@@ -41,6 +45,7 @@
 						:remainingTime='0'  :isType='true'></aridRegion>
 						
 						
+					
 						
 
 
@@ -70,6 +75,9 @@
 	import turnoverBom from '../../jobBooking/components/turnoverBom.vue'
 	import aridRegion from '../../feeding/components/aridRegion.vue'
 	import paramBom from '../../feeding/components/paramBom.vue'
+	
+	import qualityStat from '../../sample/components/qualityStat.vue'
+	import sampleBom from '../../sample/components/sampleBom.vue'
 	export default {
 		components: {
 			workOrderBom,
@@ -81,18 +89,23 @@
 			turnoverBom,
 			aridRegion,
 			paramBom,
+			
+			qualityStat,
+			sampleBom
 		},
 		data() {
 			return {
 				workOrderId: null,
 				taskId: null,
-				list: []
+				list: [],
+				taskType: 1
 			}
 		},
 		onLoad(options) {
 			this.title = options.taskName ? options.taskName + '-报工详情' : '报工详情'
 			this.workOrderId = options.id
 			this.taskId = options.taskId
+			this.taskType = options.taskType
 			this.getList()
 		},