优化

api/pda/workOrder.js

@@ -345,6 +345,18 @@ export async function transferVehicle(params) {
 	return Promise.reject(data.message);
 }
 
+//  pda 质检报工
+export async function qualityTransferVehicle(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/workreport/qualityTransferVehicle`, params, true,
+	);
+
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
+
 // 更换后的周转车记录
 export async function getNewVehicle(params) {
 	const data = await postJ(

pages/pda/components/bottomOperate.vue

@@ -348,7 +348,7 @@
 
 					this.outsourceForm = {
 						...res,
-						// requireDeliveryTime: '2024-06-30'
+						requireDeliveryTime: '2024-06-30'
 					}
 					this.outsourceForm.name = this.taskObj.currentTaskName + '委外'
 

pages/pda/feeding/bill/index.vue

@@ -17,6 +17,9 @@
 						<workOrderBom :item='it' :isDetails='true'></workOrderBom>
 
 						<deviceBom v-if='it.equipmentList.length != 0' :list='it.equipmentList'></deviceBom>
+						
+						
+						<productsBom  v-if="Object.prototype.hasOwnProperty.call(it, 'inProductList')" :productsObj="it.inProductList[0]"></productsBom>
 
 						<modelBom v-if='it.modelList.length != 0' :list='it.modelList'>
 						</modelBom>
@@ -54,6 +57,7 @@
 	import packingBom from '../components/packingBom.vue'
 	import palletBom from '../components/palletBom'
 	import revolvingDiskBom from '../components/revolvingDiskBom'
+	import productsBom from'../components/productsBom.vue'
 	import {
 		feedByOrderIds
 	} from '@/api/pda/feeding.js'
@@ -66,7 +70,8 @@
 			packingBom,
 			palletBom,
 			revolvingDiskBom,
-			semiProductBom
+			semiProductBom,
+			productsBom
 		},
 		data() {
 			return {

pages/pda/sample/components/turnoverBom.vue

@@ -53,12 +53,12 @@
 							</view>
 
 							<view class="item ww20  ">
-								<text>{{it.quantity}}</text>
+								<text>{{it.quantity }}</text>
 							</view>
 
 							<view class="item ww20">
 							<input class="uni-input content_num" 
-								v-model="it.sampleNum" type="digit"  @blur="Number(it.sampleNum) > Number(it.quantity) ? it.sampleNum = Number(it.quantity) : ''"></input>
+								v-model="it.sampleNum" type="digit"  @blur="Number(it.sampleNum) > Number(it.quantity) ? it.sampleNum = Number(it.quantity) : ''; it.quantity = it.quantity - Number(it.sampleNum) "></input>
 							</view>
 						</view>
 					</u-list>

pages/pda/turnover/components/qualityTurnoverBom.vue

@@ -11,7 +11,7 @@
 					<view class="btn_box rx-bc" @click="handleTrade(index)">
 						换周转车
 					</view>
-					<view>*需要同类型车，货位一一对应</view>
+					<view style="font-size: 28rpx;">*需要同类型车，货位一一对应</view>
 
 
 				</view>
@@ -90,7 +90,7 @@
 
 <script>
 	import {
-		transferVehicle,
+		qualityTransferVehicle,
 	} from '@/api/pda/workOrder.js'
 
 	import qualityTurnoverPopup from './qualityTurnoverPopup.vue'
@@ -175,7 +175,7 @@
 				this.wordInfo.categoryCode = arr[0].categoryCode
 
 
-				this.$refs.turnoverRef.open('w0300000002816002', this.wordInfo, this.newList, this.wordItem, index)
+				this.$refs.turnoverRef.open('w0300000003217001', this.wordInfo, this.newList, this.wordItem, index)
 				return false
 
 				let _this = this
@@ -210,8 +210,10 @@
 				newTurnover[0].id = null
 				this.newList[index].isOld = 1 // 老的
 				turnoverArr = [this.newList[index], ...newTurnover]
+				
+				
 
-				transferVehicle(turnoverArr).then(res => {
+				qualityTransferVehicle(turnoverArr).then(res => {
 					this.$emit('refreshList')
 				})