提交

api/business/dayWorkItem.js

@@ -172,4 +172,12 @@ export function turnoverOutsource(data) {
 		method: 'POST',
 		data: data
 	})
+}
+
+export function getHandlingByCarrierCode(data) {
+	return req.request({
+		url: '/business/handling/getHandlingByCarrierCode',
+		method: 'POST',
+		data: data
+	})
 }

components/dialog-turnoverTask/dialog-turnoverTask.vue

@@ -46,10 +46,15 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
+	import {
+		isTakeStock
+	} from '@/api/business/taksStackLot.js'
 	import {
 		onLoad
 	} from '@dcloudio/uni-app'
-	import { updateDayWorkItemBatch } from '@/api/business/dayWorkItem.js'
+	import {
+		updateDayWorkItemBatch
+	} from '@/api/business/dayWorkItem.js'
 
 	const baseDialog = ref(null)
 	const confirmTurnoverList = ref([])
@@ -58,7 +63,7 @@
 		confirmTurnoverList.value = data
 		baseDialog.value.open()
 	}
-	
+
 	function close(data) {
 		baseDialog.value.close()
 	}
@@ -77,31 +82,33 @@
 					duration: 2000
 				})
 			} else {
-		close();
-		// 设置周转状态
-		for (let i = 0; i < confirmTurnoverList.value.length; i++) {
-			confirmTurnoverList.value[i].status = confirmTurnoverList.value[i].status ='5';
-		}
-		console.log(confirmTurnoverList.value)
-		updateDayWorkItemBatch(confirmTurnoverList.value).then(res => {
-			if (res.code === 200) {
-				uni.showToast({
-					icon: 'success',
-					title: '操作成功',
-					duration: 2000
-				});
-				uni.navigateBack({delta: 1});
-			} else {
-				uni.showToast({
-					icon: 'none',
-					title: '操作失败',
-					duration: 2000
-				});
+				close();
+				// 设置周转状态
+				for (let i = 0; i < confirmTurnoverList.value.length; i++) {
+					confirmTurnoverList.value[i].status = confirmTurnoverList.value[i].status = '5';
+				}
+				console.log(confirmTurnoverList.value)
+				updateDayWorkItemBatch(confirmTurnoverList.value).then(res => {
+					if (res.code === 200) {
+						uni.showToast({
+							icon: 'success',
+							title: '操作成功',
+							duration: 2000
+						});
+						uni.navigateBack({
+							delta: 1
+						});
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: '操作失败',
+							duration: 2000
+						});
+					}
+				})
+				uni.$emit('clearListData')
 			}
 		})
-		uni.$emit('clearListData')
-		}
-		})
 	}
 </script>
 

pages/addNewBatch/index.vue

@@ -130,6 +130,10 @@
 			<button class='add' type=primary @click='handleAdd'>添加</button>
 		</view>
 	</view>
+	<view
+		style="background-color: #99999999; z-index: 5; position: absolute; left: 0px; right: 0px; top: 0px; bottom: 0px;"
+		v-if="loading">
+	</view>
 </template>
 <script setup>
 	import {
@@ -154,7 +158,9 @@
 		getCarrierById,
 		checkCarrier
 	} from '@/api/business/carrier.js'
-	import{isTakeStock} from '@/api/business/taksStackLot.js'
+	import {
+		isTakeStock
+	} from '@/api/business/taksStackLot.js'
 	import {
 		getFurnaceNoInfo
 	} from '@/api/p2/furnaceNoInfo.js'
@@ -178,6 +184,7 @@
 	const isWasteRecyclingFlag = ref(true)
 	const emit = defineEmits(['batchReporting-addBatch']);
 	const inpValue = ref('')
+	const loading = ref(false)
 
 	const curDept = ref(false) //判断当前工段是否是该批次的领料部门
 	const lotList = ref([])
@@ -210,8 +217,8 @@
 					batchNoList.value = [res.rows[0]];
 					dayWork.value.lotId = batchNoList.value[0].id;
 					dayWork.value.lotCode = batchNoList.value[0].lotCode;
-						dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
-						store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+					dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+					store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
 					getProcessInfo(batchNoList.value[0])
 					getFurnaceInfo(batchNoList.value[0])
 				} else {
@@ -231,13 +238,13 @@
 					lotList.value = res.rows
 					batchNoList.value = [res.rows[0]];
 					isWasteRecyclingFlag.value = true
-					if(batchNoList.value[0].isWasteRecycling == 0) {
+					if (batchNoList.value[0].isWasteRecycling == 0) {
 						isWasteRecyclingFlag.value = false
 					}
 					dayWork.value.lotId = batchNoList.value[0].id;
 					dayWork.value.lotCode = batchNoList.value[0].lotCode;
-						dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
-						store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+					dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
+					store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
 					getProcessInfo(batchNoList.value[0])
 					//提示当前批次是废品回用
 					if (batchNoList.value[0].isAmend == 1) {
@@ -283,7 +290,7 @@
 	// }
 	function getFurnaceInfo(data) {
 		if (data.isWasteRecycling == 0) {
-			 isWasteRecyclingFlag.value = true
+			isWasteRecyclingFlag.value = true
 			let token = 'Bearer ' + getToken();
 			let header = {
 				Authorization: token
@@ -390,7 +397,7 @@
 							duration: 2000
 						})
 						return false;
-					}else{
+					} else {
 						uni.showToast({
 							icon: "none",
 							title: "该批次号已被使用或不属于该产品",
@@ -408,7 +415,9 @@
 				}
 			})
 		} else {
-			getLotList({productionPlanDetailId: store.planDetails.id}).then(res => {
+			getLotList({
+				productionPlanDetailId: store.planDetails.id
+			}).then(res => {
 				if (res.rows.length > 0) {
 					console.log(res.rows)
 					var normaLotCode = res.rows.map(obj => obj.lotCode)
@@ -419,7 +428,7 @@
 							duration: 2000
 						})
 						return false;
-					}else{
+					} else {
 						uni.showToast({
 							icon: "none",
 							title: "该批次号已被使用或不属于该产品",
@@ -461,7 +470,7 @@
 						processId: v.processId,
 						processStepNumber: v.processStepNumber,
 						index: index,
-						technologicalProcessId:v.technologicalProcessId ? v
+						technologicalProcessId: v.technologicalProcessId ? v
 							.technologicalProcessId : v.lotTechnologicalProcessId
 
 					}))
@@ -551,47 +560,47 @@
 		dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
 	}
 
-/*
-	// function handleScanCode() {
-	// 	uni.scanCode({
-	// 		scanType: ['qrCode'],
-	// 		onlyFromCamera: true, // 只允许相机扫码
-	// 		autoZoom: false,
-	// 		success: function(res) {
-	// 			let vehicleObj = JSON.parse(res.result);
-	// 			if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
-	// 				uni.showToast({
-	// 					icon: "error",
-	// 					title: "请扫载具码",
-	// 					duration: 1000
-	// 				})
-	// 				return;
-	// 			}
-	// 			for (let i = 0; i < vehicleList.value.length; i++) {
-	// 				if (vehicleList.value[i].carrierId == vehicleObj.carrierId) {
-	// 					uni.showToast({
-	// 						icon: "error",
-	// 						title: "载具已存在",
-	// 						duration: 1000
-	// 					})
-	// 					return;
-	// 				}
-	// 			}
-	// 			checkCarrier(vehicleObj.carrierId).then(response => {
-	// 				if (response.code == 200) {
-	// 					vehicleList.value.push(vehicleObj);
-	// 				} else {
-	// 					uni.showToast({
-	// 						icon: 'none',
-	// 						title: response.msg
-	// 					})
-	// 					return;
-	// 				}
-	// 			})
-	// 		}
-	// 	});
-	// }
-*/
+	/*
+		// function handleScanCode() {
+		// 	uni.scanCode({
+		// 		scanType: ['qrCode'],
+		// 		onlyFromCamera: true, // 只允许相机扫码
+		// 		autoZoom: false,
+		// 		success: function(res) {
+		// 			let vehicleObj = JSON.parse(res.result);
+		// 			if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
+		// 				uni.showToast({
+		// 					icon: "error",
+		// 					title: "请扫载具码",
+		// 					duration: 1000
+		// 				})
+		// 				return;
+		// 			}
+		// 			for (let i = 0; i < vehicleList.value.length; i++) {
+		// 				if (vehicleList.value[i].carrierId == vehicleObj.carrierId) {
+		// 					uni.showToast({
+		// 						icon: "error",
+		// 						title: "载具已存在",
+		// 						duration: 1000
+		// 					})
+		// 					return;
+		// 				}
+		// 			}
+		// 			checkCarrier(vehicleObj.carrierId).then(response => {
+		// 				if (response.code == 200) {
+		// 					vehicleList.value.push(vehicleObj);
+		// 				} else {
+		// 					uni.showToast({
+		// 						icon: 'none',
+		// 						title: response.msg
+		// 					})
+		// 					return;
+		// 				}
+		// 			})
+		// 		}
+		// 	});
+		// }
+	*/
 
 	function handleAdd() {
 		if (selectedProcess.value == null) {
@@ -611,40 +620,46 @@
 		dayWork.value.isWasteRecycling = batchNoList.value[0].isWasteRecycling
 		dayWork.value.isAmend = batchNoList.value[0].isAmend
 		dayWork.value.fromId = batchNoList.value[0].fromId
-		dayWork.value.isSuperaddition =  batchNoList.value[0].isSuperaddition
+		dayWork.value.isSuperaddition = batchNoList.value[0].isSuperaddition
 		store.furnaceNumberInfo = basicInfo.value;
 		if (checkLotCode(dayWork.value.lotCode)) {
-			isTakeStock().then(response =>{
-				if(response.data) {
+			isTakeStock().then(response => {
+				if (response.data) {
 					uni.showToast({
 						icon: 'none',
 						title: '正在盘点，不能开始新批次',
 						duration: 2000
 					})
-				}else{
-			saveDayWork(dayWork.value).then(res => {
-				console.log(res)
-				if (res.code === 200) {
-					uni.showToast({
-						icon: 'success',
-						title: '添加成功',
-						duration: 2000
-					});
-					// uni.$emit('batchReporting-addBatch');
-					// uni.$emit('dayworkItemUpdate');
-					uni.navigateBack({
-						url: '/pages/batchReporting/index'
-					})
 				} else {
-					uni.showToast({
-						icon: 'none',
-						title: res.msg,
-						duration: 2000
+					loading.value = true
+					uni.showLoading({
+						title: '加载中'
 					});
+					saveDayWork(dayWork.value).then(res => {
+						console.log(res)
+						if (res.code === 200) {
+							uni.showToast({
+								icon: 'success',
+								title: '添加成功',
+								duration: 2000
+							});
+							// uni.$emit('batchReporting-addBatch');
+							// uni.$emit('dayworkItemUpdate');
+							uni.navigateBack({
+								url: '/pages/batchReporting/index'
+							})
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: res.msg,
+								duration: 2000
+							});
+						}
+						loading.value = false
+						uni.hideLoading()
+					})
 				}
 			})
-			}
-			})
 		} else {
 			uni.showToast({
 				icon: "none",

pages/fastProductionPlan/index.vue

@@ -65,6 +65,11 @@
 		</view>
 		<dialog-lotReporting ref="lotReporting" :getList="init" @scan="handleAdd"></dialog-lotReporting>
 		<dialog-Search ref="searchRef" @search="refreshSearch"></dialog-Search>
+
+	</view>
+	<view
+		style="background-color: #99999999; z-index: 5; position: absolute; left: 0px; right: 0px; top: 0px; bottom: 0px;"
+		v-if="loading">
 	</view>
 </template>
 
@@ -91,7 +96,9 @@
 		getDayworkByCarrierCode,
 		reportDaywork
 	} from '@/api/business/quickDaywork'
-	import{isTakeStock} from '@/api/business/taksStackLot.js'
+	import {
+		isTakeStock
+	} from '@/api/business/taksStackLot.js'
 	import {
 		ref
 	} from 'vue'
@@ -102,10 +109,11 @@
 	const workshopId = ref(null);
 	const searchRef = ref(null);
 	const keyword = ref('')
+	const loading = ref(false)
 
 	const form = ref([]); //表单数据true
 	const checkAll = ref(false); //是否全选
-	
+
 	// 创建一个引用来存储最后一次请求的时间戳
 	const lastRequestTimestamp = ref(0);
 	const listData = ref([]);
@@ -150,6 +158,7 @@
 				workshopList.value = []
 			}
 			uni.hideLoading();
+			loading.value = false
 		})
 
 	}
@@ -436,23 +445,33 @@
 			return;
 		}
 		// 更新请求时间戳
-		isTakeStock().then(response =>{
-			if(response.data) {
+		isTakeStock().then(response => {
+			if (response.data) {
 				uni.showToast({
 					icon: 'none',
 					title: '正在盘点，不能结束报工',
 					duration: 2000
 				})
-			}else{
-		lastRequestTimestamp.value = currentTime;
-		finishQuick(selection.value).then(res => {
-			// console.log(res)
-			if (res.code === 200) {
-				init()
+			} else {
+				loading.value = true
+				uni.showLoading({
+					title: '加载中'
+				});
+				lastRequestTimestamp.value = currentTime;
+				finishQuick(selection.value).then(res => {
+					// console.log(res)
+					if (res.code === 200) {
+						init()
+					} else {
+						loading.value = false
+						uni.hideLoading()
+					}
+				}).catch(error => {
+					loading.value = false
+					uni.hideLoading()
+				})
 			}
 		})
-		}
-		})
 	}
 
 	// init();

pages/handlingList/index.vue

@@ -138,11 +138,19 @@
 					</view>
 				</view>
 			</view>
-			<view class='bottom-btn-container uni-row'>
-				<button type='primary' class='bottom-btn'
-					@click="handleConfirm('确认送达',store.itemStatus.received)">确认送达</button>
-				<button class='bottom-btn' @click="handleConfirm('取消周转',store.itemStatus.pendingTurnover,true)"
-					style="margin-left: 24rpx;background-color: coral;">取消周转</button>
+			<!-- <view class='bottom-btn-container uni-row'>
+				<button type='success' class='bottom-btn' @click="handleScan">扫码确认送达</button>
+			</view> -->
+			<view class='bottom-btn-container-2 uni-column'>
+				<view class="bottom-btn-line uni-row">
+					<button class='bottom-btn' @click="handleScan" style="background-color: #03d111;">扫码确认送达</button>
+				</view>
+				<view class="bottom-btn-line uni-row">
+					<button type='primary' class='bottom-btn'
+						@click="handleConfirm('确认送达',store.itemStatus.received)">确认送达</button>
+					<button class='bottom-btn' @click="handleConfirm('取消周转',store.itemStatus.pendingTurnover,true)"
+						style="margin-left: 24rpx;background-color: coral;">取消周转</button>
+				</view>
 			</view>
 		</view>
 		<!-- 已送达页面 -->
@@ -200,11 +208,16 @@
 	// import turnover from './turnover';
 	import {
 		getDayWorkItemList,
-		getItemList
+		getItemList,
+		getHandlingByCarrierCode
 	} from '@/api/business/dayWorkItem.js'
 	import {
 		isTakeStock
 	} from '@/api/business/taksStackLot.js'
+
+	import {
+		debounce
+	} from '@/utils/common.js'
 	import {
 		updateDayWorkItem,
 		updateDayWorkItemBatch,
@@ -282,6 +295,10 @@
 		})
 	}
 
+	// function handleScan() {
+	// 	console.log('scan')
+	// }
+
 	function init() {
 		uni.showLoading({
 			title: '加载中'
@@ -490,6 +507,75 @@
 		// return selection.value.includes(item);
 	}
 
+	async function handleScan() {
+		// 先判断是否在盘点中假设不在盘点中则可以继续
+		const res = await isTakeStock()
+		if (res.data) {
+			uni.showToast({
+				icon: 'none',
+				title: '正在盘点，不能操作周转',
+				duration: 2000
+			})
+			return
+		}
+
+		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+		if (mpaasScanModule) {
+			// 调用插件的 mpaasScan 方法
+			mpaasScanModule.mpaasScan({
+					// 扫码识别类型，参数可多选，qrCode、barCode，
+					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+					scanType: ["qrCode", "barCode"],
+					// 是否隐藏相册，默认false不隐藏
+					hideAlbum: false,
+				},
+				(ret) => {
+					let vehicleObj = {
+						carrierCode: ret.resp_result
+					};
+					if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
+						uni.showToast({
+							icon: "none",
+							title: "请扫载具码",
+							duration: 1000
+						})
+						return;
+					}
+					getHandlingByCarrierCode({
+						carrierCode: vehicleObj.carrierCode
+					}).then(response => {
+						if (response.code == 200) {
+							reflush()
+							debounce(handleScan, 700)
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: response.msg,
+								duration: 2000
+							})
+						}
+					})
+				}
+			);
+		} else {
+			// 测试时用
+			getHandlingByCarrierCode({
+				carrierCode: '900005'
+			}).then(response => {
+				if (response.code == 200) {
+					reflush()
+					debounce(handleScan, 700)
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: response.msg,
+						duration: 2000
+					})
+				}
+			})
+		}
+	}
+
 	function handleSelection(item) {
 		// 单选
 		if (selection.value == item) {
@@ -666,6 +752,40 @@
 				background-color: #1684fc;
 			}
 		}
+
+		.bottom-btn-container-2 {
+			// height: 50px;
+			position: fixed;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			height: 140rpx;
+			border-top: 1px solid #999999;
+			padding: 16rpx 32rpx;
+			align-items: center;
+			background-color: #fff;
+
+			.bottom-btn-line {
+				display: flex;
+				width: 100%;
+
+
+				.bottom-btn {
+					// padding-left: 0;
+					// padding-top: 4rpx;
+					flex: 1;
+					width: 100%;
+					font-size: 28rpx;
+					color: #FFFFFF;
+					background-color: #1684fc;
+					margin-bottom: 4rpx;
+				}
+
+				.bottom-btn .success {
+					background-color: #03d111;
+				}
+			}
+		}
 	}
 
 	.padding-container {

pages/startTurnover/index.vue

@@ -75,83 +75,83 @@
 	function init() {
 		flag.value = listData.value.length > 0 ? false : true;
 	}
-/*
-	function HandleScanCode() {
-		// 引入原生插件
-		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
-		if (mpaasScanModule) {
-			// 调用插件的 mpaasScan 方法
-			mpaasScanModule.mpaasScan({
-					// 扫码识别类型，参数可多选，qrCode、barCode，
-					// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
-					scanType: ["qrCode", "barCode"],
-					// 是否隐藏相册，默认false不隐藏
-					hideAlbum: false,
-				},
-				(ret) => {
-					let vehicleObj = JSON.parse(ret.resp_result);
-					if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
-						uni.showToast({
-							icon: "none",
-							title: "请扫载具码",
-							duration: 1000
+	/*
+		function HandleScanCode() {
+			// 引入原生插件
+			const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
+			if (mpaasScanModule) {
+				// 调用插件的 mpaasScan 方法
+				mpaasScanModule.mpaasScan({
+						// 扫码识别类型，参数可多选，qrCode、barCode，
+						// 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+						scanType: ["qrCode", "barCode"],
+						// 是否隐藏相册，默认false不隐藏
+						hideAlbum: false,
+					},
+					(ret) => {
+						let vehicleObj = JSON.parse(ret.resp_result);
+						if (!vehicleObj.carrierId || vehicleObj.carrierId == "") {
+							uni.showToast({
+								icon: "none",
+								title: "请扫载具码",
+								duration: 1000
+							})
+							return;
+						}
+						getDayworkItemByCarrierId({
+							carrierId: vehicleObj.carrierId,
+							status: 4
+						}).then(response => {
+							console.log(response)
+							for (let i = 0; i < listData.value.length; i++) {
+								if (listData.value[i].lotCode === response.data[0].lotCode) {
+									uni.showToast({
+										icon: "none",
+										title: "该批次已存在"
+									})
+									console.log("该批次已存在")
+									return;
+								}
+							}
+							for (let i = 0; i < response.data.length; i++) {
+								listData.value.push(response.data[i]);
+							}
+							for (let i = 0; i < listData.value.length; i++) {
+								listData.value[i].carriers = listData.value[i].carrierName.split('、').length;
+							}
+							console.log(listData.value);
+							init();
 						})
-						return;
 					}
-					getDayworkItemByCarrierId({
-						carrierId: vehicleObj.carrierId,
-						status: 4
-					}).then(response => {
-						console.log(response)
-						for (let i = 0; i < listData.value.length; i++) {
-							if (listData.value[i].lotCode === response.data[0].lotCode) {
-								uni.showToast({
-									icon: "none",
-									title: "该批次已存在"
-								})
-								console.log("该批次已存在")
-								return;
-							}
-						}
-						for (let i = 0; i < response.data.length; i++) {
-							listData.value.push(response.data[i]);
-						}
-						for (let i = 0; i < listData.value.length; i++) {
-							listData.value[i].carriers = listData.value[i].carrierName.split('、').length;
+				);
+			} else {
+				getDayworkItemByCarrierId({
+					carrierId: '1747500989324668942',
+					status: 4
+				}).then(response => {
+					console.log(response)
+					for (let i = 0; i < listData.value.length; i++) {
+						if (listData.value[i].lotCode === response.data[0].lotCode) {
+							uni.showToast({
+								icon: "none",
+								title: "该批次已存在"
+							})
+							console.log("该批次已存在")
+							return;
 						}
-						console.log(listData.value);
-						init();
-					})
-				}
-			);
-		} else {
-			getDayworkItemByCarrierId({
-				carrierId: '1747500989324668942',
-				status: 4
-			}).then(response => {
-				console.log(response)
-				for (let i = 0; i < listData.value.length; i++) {
-					if (listData.value[i].lotCode === response.data[0].lotCode) {
-						uni.showToast({
-							icon: "none",
-							title: "该批次已存在"
-						})
-						console.log("该批次已存在")
-						return;
 					}
-				}
-				for (let i = 0; i < response.data.length; i++) {
-					listData.value.push(response.data[i]);
-				}
-				for (let i = 0; i < listData.value.length; i++) {
-					listData.value[i].carriers = listData.value[i].carrierName.split('、').length;
-				}
-				console.log(listData.value);
-				init();
-			})
+					for (let i = 0; i < response.data.length; i++) {
+						listData.value.push(response.data[i]);
+					}
+					for (let i = 0; i < listData.value.length; i++) {
+						listData.value[i].carriers = listData.value[i].carrierName.split('、').length;
+					}
+					console.log(listData.value);
+					init();
+				})
+			}
 		}
-	}
-*/
+	*/
 
 	function HandleScanCode() {
 		// 引入原生插件
@@ -166,7 +166,9 @@
 					hideAlbum: false,
 				},
 				(ret) => {
-					let vehicleObj = {carrierCode: ret.resp_result};
+					let vehicleObj = {
+						carrierCode: ret.resp_result
+					};
 					if (!vehicleObj.carrierCode || vehicleObj.carrierCode == "") {
 						uni.showToast({
 							icon: "none",
@@ -202,8 +204,8 @@
 				}
 			);
 		} else {
-			getDayworkItemByCarrierId({
-				carrierId: '1747500989324668942',
+			getDayworkItemByCarrierCode({
+				carrierCode: '000852',
 				status: 4
 			}).then(response => {
 				console.log(response)
@@ -228,7 +230,7 @@
 			})
 		}
 	}
-	
+
 	function handleStartTurnover() {
 		isTakeStock().then(response => {
 			if (response.data) {
@@ -238,9 +240,9 @@
 					duration: 2000
 				})
 			} else {
-		// 调用子组件中的方法
-		turnoverTask.value.open(listData.value);
-		}
+				// 调用子组件中的方法
+				turnoverTask.value.open(listData.value);
+			}
 		})
 	}