提交

api/business/carrier.js

@@ -32,4 +32,12 @@ export function carrierFinishedCheck(data) {
 		method: 'POST',
 		data: data
 	})
+}
+
+export function checkCarrierNew(data) {
+	return req.request({
+		url:'/business/carrier/checkCarrier',
+		method: 'POST',
+		data: data
+	})
 }

api/business/dayWorkItem.js

@@ -110,4 +110,12 @@ export function getDayWorkItemHistory(startTime,endTime) {
 		url: '/business/dayworkItem/getDayWorkItemHistory?startTime=' + startTime + '&endTime=' + endTime,
 		method: 'GET',
 	})
+}
+
+export function turnover(data) {
+	return req.request({
+		url: '/business/dayworkItem/turnover',
+		method: 'POST',
+		data:data
+	})
 }

components/dialog-end-work/dialog-end-work.vue

@@ -142,6 +142,8 @@
 				}
 
 
+			}).catch(err => {
+				console.log('146 err')
 			});
 		init();
 		baseDialog.value.open()
@@ -183,6 +185,8 @@
 					text: res.data[i].dictLabel
 				}
 			}
+		}).catch(err => {
+			console.log('189 err')
 		})
 		getDayworkCarrierList({
 			dayworkId: store.dayworkInfo.id,
@@ -195,6 +199,8 @@
 					bindList.value[i].flag = false;
 				}
 			}
+		}).catch(err => {
+			console.log('203 err')
 		})
 	}
 

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -54,7 +54,8 @@
 	} from '@/api/dict/dict.js'
 	import {
 		getDayWorkItemList,
-		saveDayWorkItem
+		saveDayWorkItem,
+		turnover
 	} from '@/api/business/dayWorkItem.js'
 	import {
 		getDeptList
@@ -242,7 +243,7 @@
 			});
 		} else {
 			close();
-			saveDayWorkItem(curDayworkItem.value).then(res => {
+			turnover(curDayworkItem.value).then(res => {
 				if (res.code === 200) {
 					uni.showToast({
 						icon: 'success',

pages/changeBox/index.vue

@@ -26,9 +26,10 @@
 					</view>
 					<view class="uni-row" v-if="item.checked">
 						<uni-easyinput v-if="item.inpShow" v-model="item.abandonmentReason" focus placeholder="请输入废箱原因"
-						style="width: 240rpx;"></uni-easyinput>
+							style="width: 240rpx;"></uni-easyinput>
 						<uni-data-select v-else v-model="item.abandonmentReason" :localdata="abanonmentList"
-							style="width: 240rpx;" :clear="false" @change="abandonmentReasonChange(item)"></uni-data-select>
+							style="width: 240rpx;" :clear="false"
+							@change="abandonmentReasonChange(item)"></uni-data-select>
 					</view>
 					<!-- 占空位用 -->
 					<view class="uni-row" v-if="!item.checked">
@@ -68,7 +69,8 @@
 	} from '@/utils/common.js'
 	import {
 		addCarrierReject,
-		checkCarrier
+		checkCarrier,
+		checkCarrierNew
 	} from '@/api/business/carrier.js'
 
 	const bindList = ref([])
@@ -108,11 +110,11 @@
 	function handleSwitchChange(item) {
 		item.checked = !item.checked
 	}
-	
-	function abandonmentReasonChange(item){
-		if(item.abandonmentReason == '其他原因'){
+
+	function abandonmentReasonChange(item) {
+		if (item.abandonmentReason == '其他原因') {
 			item.inpShow = true;
-		}else{
+		} else {
 			item.inpShow = false;
 		}
 	}
@@ -177,8 +179,17 @@
 						return;
 					}
 				}
-				checkCarrier(vehicleObj.carrierId).then(response => {
+				const checkData = {
+					...dayWorkInfo,
+					dayworkCarriers: newBindList.value,
+					newCarrierId: vehicleObj.carrierId
+				}
+				checkCarrierNew(checkData).then(response => {
 					console.log(response)
+					// uni.showToast({
+					// 	icon: 'none',
+					// 	title: response.msg
+					// })
 					if (response.code == 200) {
 						newBindList.value.push(JSON.parse(ret.resp_result));
 					} else {
@@ -188,7 +199,24 @@
 						})
 						return;
 					}
+				}).catch(err => {
+					uni.showToast({
+						icon: 'none',
+						title: '箱码检测检测错误' + err.message
+					})
 				})
+				// checkCarrier(vehicleObj.carrierId).then(response => {
+				// 	console.log(response)
+				// 	if (response.code == 200) {
+				// 		newBindList.value.push(JSON.parse(ret.resp_result));
+				// 	} else {
+				// 		uni.showToast({
+				// 			icon: 'none',
+				// 			title: response.msg
+				// 		})
+				// 		return;
+				// 	}
+				// })
 			}
 		);
 	}