From 3030acd36654d2cda15368150fa583f24896f3a0 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 2 Jul 2024 19:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                                   |   16 +
 config/host.js                                |    4 +-
 manifest.json                                 |    4 +-
 pagesHome/pages/ArrivalList/ArrivalList.vue   |   11 +-
 pagesHome/pages/LoadingScan/LoadingScan.vue   |    2 +-
 .../OrderSortingDetail/OrderSortingDetail.vue |   80 +-
 .../pages/PickUpLotList/PickUpLotList.vue     |   15 +-
 .../StowageListDetails/StowageListDetails.vue |    4 +-
 .../VehicleArrivalDetails.vue                 |  104 +-
 pagesHome/pages/onLoadByScan/onLoadByScan.vue |   36 +-
 .../onLoadOrderDetails/onLoadOrderDetails.vue |    6 +-
 unpackage/dist/dev/app-plus/app-service.js    | 1133 +++++++++--------
 unpackage/dist/dev/app-plus/manifest.json     |    4 +-
 .../OrderSortingDetail/OrderSortingDetail.css |  239 +++-
 unpackage/dist/dev/mp-weixin/app.js           |  159 ---
 unpackage/dist/dev/mp-weixin/app.json         |  182 ---
 unpackage/dist/dev/mp-weixin/app.wxss         |  562 --------
 17 files changed, 1034 insertions(+), 1527 deletions(-)
 delete mode 100644 unpackage/dist/dev/mp-weixin/app.js
 delete mode 100644 unpackage/dist/dev/mp-weixin/app.json
 delete mode 100644 unpackage/dist/dev/mp-weixin/app.wxss

diff --git a/api/user.js b/api/user.js
index f711d7c..5160982 100644
--- a/api/user.js
+++ b/api/user.js
@@ -1181,6 +1181,22 @@ export function warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data, load
 		canCancel
 	);
 }
+/**
+ * 根据物料名称搜索库存品
+ * @param {Object} data
+ */
+export function warehouseTrayTypeSelectStockByMaterialNameAndMarketId(data, loadingObj = {}, canCancel = false) {
+
+	return request({
+			url: `logpm-warehouse/api/warehouseTrayType/selectStockByMaterialNameAndMarketId`,
+			method: "post",
+			data
+		},
+		loadingObj,
+		canCancel
+	);
+}
+
 /**
  * 无数据库存品搜索当前仓库物料
  * @param {Object} data
diff --git a/config/host.js b/config/host.js
index 38fb570..05886d7 100644
--- a/config/host.js
+++ b/config/host.js
@@ -12,14 +12,14 @@
 // xiaohei
 // const devhost = 'http://192.168.3.18:13000/'
 // tjj
-const devhost = 'http://192.168.3.14:13000/'
+// const devhost = 'http://192.168.3.14:13000/'
 // cyz
 // const devhost = 'http://192.168.6.169:9777/'
 // const devhost = 'http://192.168.6.141:8777/'
 // cg
 // const devhost = 'http://192.168.3.2:13000/'
 // 正式
-// const devhost = 'https://h5uapi.huitongys.com/'
+const devhost = 'https://h5uapi.huitongys.com/'
 // cg
 // const devhost = 'http://192.168.10.200:13000/'
 
diff --git a/manifest.json b/manifest.json
index 3ddd93b..4325bda 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "货无忧",
     "appid" : "__UNI__EB22F37",
     "description" : "",
-    "versionName" : "1.1.35",
-    "versionCode" : 1135,
+    "versionName" : "1.1.36",
+    "versionCode" : 1136,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pagesHome/pages/ArrivalList/ArrivalList.vue b/pagesHome/pages/ArrivalList/ArrivalList.vue
index 7328c4e..e06da60 100644
--- a/pagesHome/pages/ArrivalList/ArrivalList.vue
+++ b/pagesHome/pages/ArrivalList/ArrivalList.vue
@@ -34,10 +34,19 @@
 									车次号：{{item.carsNo}}
 								</view>
 							</view>
+							<view class="items_row">
+								<view>
+									计划装车：{{item.planLoadingNumber}}
+								</view>
+
+								<view>
+									实际装车：{{item.totalLoadingNum}}
+								</view>
+							</view>
 
 							<view class="items_row">
 								<view>
-									实际装车/计划装车：{{item.realLoadingNumber + '/' +item.planLoadingNumber}}
+									在车件数：{{item.realLoadingNumber}}
 								</view>
 
 								<view>
diff --git a/pagesHome/pages/LoadingScan/LoadingScan.vue b/pagesHome/pages/LoadingScan/LoadingScan.vue
index 7168473..97ff247 100644
--- a/pagesHome/pages/LoadingScan/LoadingScan.vue
+++ b/pagesHome/pages/LoadingScan/LoadingScan.vue
@@ -514,7 +514,7 @@
 				tiplists.value.setdetails({ isshow: false })
 				uni.setStorageSync('checkvehicle', res.data[deta.checklist[0]])
 				uni.navigateTo({
-					url: '/pagesHome/pages/LoadingDetails/LoadingDetails?item=' + JSON.stringify(item) + '&loadingId=' + res.data[deta.checklist[0]].id
+					url: '/pagesHome/pages/loadingRetention/loadingRetention?item=' + JSON.stringify(item) + '&loadingId=' + res.data[deta.checklist[0]].id
 				})
 			},
 			cancel: (details) => {
diff --git a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
index 376aa83..79248b2 100644
--- a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
+++ b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
@@ -198,7 +198,7 @@
 	</template>
 
 	<template v-if="details.showstate !== 0">
-		<view class="tanchuangbg" @click="setshowstate(0)" v-if="showstate !== 0">
+		<view class="tanchuangbg" @click="setshowstate(0)" @touchmove.stop v-if="showstate !== 0">
 			<!-- 备注 -- 修改 -->
 			<view class="tanbx" @click.stop.prevent v-if="showstate == 1">
 				<view class="titlran">备注</view>
@@ -262,12 +262,35 @@
 
 			<!-- 库存品 -- 录入 -->
 			<template v-if="showstate === 3">
-				<view class="inputbox" @click.stop.prevent>
-					<view class="inputscan">
-						<input placeholder="输入物料编码" v-model="details.stock.materialCode" />
-						<view class="scanbt" @click="stockSearch">搜索</view>
+				<view class="inputbox" @touchmove.stop @click.stop.prevent>
+					<view class="flex-c-sb w100 rem-0-9">
+						<view class="">
+							搜索方式：
+						</view>
+
+						<view @click="details.stock.activeStatus = 'materialName'"
+							:class="{checkbtn:true, active: details.stock.activeStatus === 'materialName'}">
+							物料名称
+						</view>
+
+						<view @click="details.stock.activeStatus = 'materialCode'"
+							:class="{checkbtn:true, active: details.stock.activeStatus !== 'materialName'}">
+							物料编码
+						</view>
 					</view>
-					<scroll-view scroll-y="true" class="scvbw">
+
+
+					<view class="inputscan mt20">
+						<input class="flex1" :placeholder="details.stock.activeStatus === 'materialName'?'请输入物料名称':'输入物料编码'"
+							v-model="details.stock.materialCode" />
+						<view class="scanbt ml10" @click="stockSearch">搜索</view>
+					</view>
+
+					<!-- 					<view class="inputscan mt20">
+						<input class="flex1" placeholder="输入物料名称" v-model="details.stock.materialName" />
+					</view> -->
+
+					<scroll-view scroll-y="true" @touchmove.stop class="scvbw">
 						<view class="scboxitem">
 							<view class="items" v-for="(item, index) in details.stock.searchStockList">
 								<view class="type1s">
@@ -357,6 +380,7 @@
 		warehouseTrayTypeenterStockNoDataMaterialCode,
 		warehouseTrayTypefindAllMarket,
 		warehouseTrayTypedeleteZeroOrderByTrayCode,
+		warehouseTrayTypeSelectStockByMaterialNameAndMarketId
 	} from '@/api/user.js'
 	import { onLoad, onShow, onHide, onPullDownRefresh } from '@dcloudio/uni-app'
 	import utils from '@/utils/utils.js'
@@ -390,8 +414,12 @@
 			marketName: '',
 			// 物料编码
 			materialCode: '',
+			// 物料名称
+			materialName: '',
 			// 库存品列表
 			searchStockList: [],
+			/** 搜索状态 -- 编码 | 名称 */
+			activeStatus: 'materialName' as 'materialCode' | 'materialName'
 		},
 	})
 	let tip = ref(null)
@@ -871,11 +899,14 @@
 	 * 库存品 -- 搜索
 	 */
 	async function stockSearch() {
-		let data = {
+
+		let res = details.stock.activeStatus === 'materialCode' ? await warehouseTrayTypeselectStockByMaterialCodeAndMarketId({
 			marketId: details.stock.marketId,
 			materialCode: details.stock.materialCode,
-		}
-		let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data)
+		}) : await warehouseTrayTypeSelectStockByMaterialNameAndMarketId({
+			marketId: details.stock.marketId,
+			materialName: details.stock.materialCode
+		})
 		if (res.code !== 200) return
 		// 筛选剩余数大于0的物料
 		details.stock.searchStockList = res.data.filter(val => val.quantityStock !== 0)
@@ -1070,9 +1101,9 @@
 		toRefs(details)
 </script>
 
-<style lang="scss">
-	// 主题色
-	$subjectColor: #d3832a;
+<style lang="scss" scoped>
+	@import url(@/utils/style/common.scss);
+
 
 	.mabxtop {
 		position: relative;
@@ -1130,7 +1161,7 @@
 		}
 
 		.printBtn {
-			background: $subjectColor;
+			background: var(--subjectColor);
 			color: #fff !important;
 			width: 100upx;
 			padding: 10upx;
@@ -1263,7 +1294,7 @@
 					box-sizing: border-box;
 
 					.zhon {
-						color: $subjectColor;
+						color: var(--subjectColor);
 					}
 
 					.yish {
@@ -1349,8 +1380,6 @@
 </style>
 
 <style lang="scss" scoped>
-	$subjectColor: #d3832a;
-
 	// tabBar
 	.tabBar {
 		margin-top: 10upx;
@@ -1370,7 +1399,7 @@
 				display: block;
 				position: absolute;
 				height: 4upx;
-				background: $subjectColor;
+				background: var(--subjectColor);
 				width: 0;
 				left: 50%;
 				bottom: 0;
@@ -1398,10 +1427,10 @@
 		justify-content: center;
 		font-size: 32upx;
 		font-weight: bold;
-		color: $subjectColor;
+		color: var(--subjectColor);
 		margin: auto;
 		margin-top: 20upx;
-		border: 3upx solid $subjectColor;
+		border: 3upx solid var(--subjectColor);
 	}
 
 	// 零担弹窗
@@ -1652,4 +1681,17 @@
 			}
 		}
 	}
+
+	// 选择按钮
+	.checkbtn {
+		padding: 10upx 20upx;
+		background-color: #eee;
+		transition: all 0.3s;
+		border-radius: 5upx;
+
+		&.active {
+			background-color: var(--subjectColor);
+			color: #fff;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pagesHome/pages/PickUpLotList/PickUpLotList.vue b/pagesHome/pages/PickUpLotList/PickUpLotList.vue
index 30c1110..239995f 100644
--- a/pagesHome/pages/PickUpLotList/PickUpLotList.vue
+++ b/pagesHome/pages/PickUpLotList/PickUpLotList.vue
@@ -194,7 +194,9 @@
 		scancode: '',
 		detauser: {},
 		/** 输入框中的值 */
-		searchText: ''
+		searchText: '',
+		/** 是否是扫描请求后执行的刷新 */
+		isScan: false
 	})
 
 	// 组件实例
@@ -216,7 +218,7 @@
 
 		const { code } = res
 		if (code !== 200) return
-
+		details.isScan = true
 		basicContainer.value.startPullDownRefresh()
 
 		console.log('res :>> ', res);
@@ -275,13 +277,22 @@
 
 				console.log('details.pageInfo :>> ', details.pageInfo);
 
+				let _totalScanNum = 0
+
 				for (let item of details.detauser.packageList) {
 					item.scanNum = item.scanNum || 0
 					item.orderTotalNum = item.orderTotalNum || 0
 					item.residueNum = (item.orderTotalNum || 0) - (item.scanNum || 0)
+					_totalScanNum += item.scanNum
 				}
 
 				details.data = details.detauser.packageList
+
+				if (details.isScan) {
+					utils.handleToast(`${_totalScanNum}件`)
+					details.isScan = false
+				}
+
 			}
 			// 无数据
 			// else {
diff --git a/pagesHome/pages/StowageListDetails/StowageListDetails.vue b/pagesHome/pages/StowageListDetails/StowageListDetails.vue
index 9bb5ba7..d6ccb7c 100644
--- a/pagesHome/pages/StowageListDetails/StowageListDetails.vue
+++ b/pagesHome/pages/StowageListDetails/StowageListDetails.vue
@@ -43,12 +43,12 @@
 			<view class="tabtip">
 				<view @click="setorderStatus(1)">
 					<view :class="orderStatus==1?'xz':''">定制品
-						({{ details.packageNum || 0 }})
+						<!-- ({{ details.packageNum || 0 }}) -->
 					</view>
 				</view>
 				<view @click="setorderStatus(2)">
 					<view :class="orderStatus==2?'xz':''">零担
-						({{ details.zeroNum || 0 }})
+						<!-- ({{ details.zeroNum || 0 }}) -->
 					</view>
 				</view>
 				<view @click="setorderStatus(3)">
diff --git a/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue b/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
index 2a50004..68698c7 100644
--- a/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
+++ b/pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue
@@ -54,9 +54,9 @@
 							定制品
 						</text>
 
-						<text>
+						<!-- <text>
 							({{ details.packageNum }})
-						</text>
+						</text> -->
 					</view>
 				</view>
 				<view @click="setorderStatus(2)" :class="orderStatus==2?'active':''">
@@ -65,9 +65,9 @@
 							零担
 						</text>
 
-						<text>
+						<!-- <text>
 							({{ details.zeroNum }})
-						</text>
+						</text> -->
 					</view>
 				</view>
 				<view @click="setorderStatus(3)" :class="orderStatus==3?'active':''">
@@ -203,7 +203,7 @@
 									<view class="flex1">
 										包条码: {{item.scanCode}}
 									</view>
-									<view class="flex1" style="display: flex; align-items: center; margin-left:5px;">
+									<view class="flex1 flex ml10">
 										卸车状态:
 										<view :class="{
 												'tip': true,
@@ -215,6 +215,7 @@
 										</view>
 									</view>
 								</view>
+
 								<view class="scroll_row mt10" style="zoom: 0.9;">
 									<view class="flex1">
 										托盘名称: {{item.trayName || '暂无数据'}}
@@ -223,6 +224,10 @@
 										托盘码: {{item.trayCode || '暂无数据'}}
 									</view>
 								</view>
+
+								<view class="deleteBtn" @click="()=> handleDeleteAbnormal(item)" v-if="item.isData === 0">
+									删除
+								</view>
 							</view>
 						</template>
 					</view>
@@ -319,7 +324,8 @@
 		postUnloadTray,
 		postTransferUnloadPackage,
 		postTransferUnloadZero,
-		postTransferUnloadTray
+		postTransferUnloadTray,
+		postRemoveCarsLoadScan
 	} from '@/api/user.js'
 	import {
 		onLoad,
@@ -570,6 +576,8 @@
 			details.orderStatus === 2 ?
 				details.pageInfo.unloadZeroList :
 				details.pageInfo.exceptionList
+
+		console.log('details.datalist :>> ', details.datalist);
 		// for (let i = 0; i < 1000; i++) {
 		// 	details.datalist.push({ orderCode: i, unloadPackageList: [] })
 		// }
@@ -795,7 +803,7 @@
 	const handleZeroSoleStowage = (_item, _value) => {
 		details.zeroInfo = { waybillNo: _item.waybillNo, orderCode: _item.orderCode, ..._value }
 
-		details.zeroInfo.unloadNum = details.zeroInfo.num
+		details.zeroInfo.unloadNum = !details.zeroInfo.unloadNum ? details.zeroInfo.num : details.zeroInfo.unloadNum
 
 		ZeroStowage.value.setDetails({
 			title: '零担卸车',
@@ -827,24 +835,24 @@
 	/** 零担卸车 */
 	const handleZeroStowage = (_item, _value) => {
 		// 检测该零担是否符合卸车要求
-		let content = ''
-		if (Number(_value.scanStatus) === 2) {
-			content = '该零担已卸车'
-		}
-		else if (Number(_value.scanStatus) === 2) {
-			content = '该零担已签收'
-		}
+		// let content = ''
+		// if (Number(_value.scanStatus) === 2) {
+		// 	content = '该零担已卸车'
+		// }
+		// else if (Number(_value.scanStatus) === 3) {
+		// 	content = '该零担已签收'
+		// }
 
-		if (content) {
-			// #ifdef APP
-			utils.ttsspke(content)
-			// #endif
-			uni.showToast({
-				title: content,
-				icon: 'none'
-			})
-			return
-		}
+		// if (content) {
+		// 	// #ifdef APP
+		// 	utils.ttsspke(content)
+		// 	// #endif
+		// 	uni.showToast({
+		// 		title: content,
+		// 		icon: 'none'
+		// 	})
+		// 	return
+		// }
 
 		// 检测该零担是否有托盘信息; 有: 询问是否整托卸车, 当在整托卸车时, 不允许单独卸车
 		if (_value.trayCode) {
@@ -879,6 +887,37 @@
 		handleZeroSoleStowage(_item, _value)
 	}
 
+	/** 移除异常数据 */
+	const handleDeleteAbnormal = (item) => {
+		tiplists.value.setdetails({
+			isshow: true,
+			tipstate: 2,
+			list: [],
+			isonecheck: true,
+			title: '是否删除异常包件',
+			content: '12441',
+			success: async () => {
+				tiplists.value.setdetails({ isshow: false })
+
+				const submitData = {
+					orderCode: item.scanCode,
+					carsLoadScanIds: item.id,
+				}
+				const res = await postRemoveCarsLoadScan(submitData)
+				const { code } = res
+
+				if (code !== 200) return
+				basicContainer.value.startPullDownRefresh()
+			},
+			cancel: () => {
+				tiplists.value.setdetails({ isshow: false })
+			},
+			close: () => {
+				tiplists.value.setdetails({ isshow: false })
+			}
+		})
+	}
+
 	const { orderStatus, items, datalist } = toRefs(details)
 </script>
 
@@ -1078,8 +1117,20 @@
 	.abnormal {
 		padding: 10upx;
 		background: #fff;
-		margin: 10upx;
-		border-radius: 10upx;
+		margin: 20upx;
+		border-radius: 15upx;
+		position: relative;
+		overflow: hidden;
+
+		.deleteBtn {
+			position: absolute;
+			right: 0;
+			top: 0;
+			padding: 10upx 20upx;
+			background-color: var(--errColor);
+			color: #fff;
+			zoom: 0.8;
+		}
 	}
 
 	.w100 {
@@ -1143,6 +1194,7 @@
 		color: #fff;
 		border-radius: 5upx;
 		margin-left: 10upx;
+		height: fit-content;
 
 		&.red {
 			color: #f8625a;
diff --git a/pagesHome/pages/onLoadByScan/onLoadByScan.vue b/pagesHome/pages/onLoadByScan/onLoadByScan.vue
index 92e6526..4afb347 100644
--- a/pagesHome/pages/onLoadByScan/onLoadByScan.vue
+++ b/pagesHome/pages/onLoadByScan/onLoadByScan.vue
@@ -3,7 +3,7 @@
 		<!-- 头部 -->
 		<template #head>
 			<view class="header-container">
-				<view class="tabBar_container">
+				<!-- <view class="tabBar_container">
 					<view :class="{'tabBar_item': true, 'active': details.tabBarCode === 1}" @click="handletabBarState(1)">
 						入库扫描
 					</view>
@@ -11,7 +11,7 @@
 					<view :class="{'tabBar_item': true, 'active': details.tabBarCode === 2}" @click="handletabBarState(2)">
 						配送回库
 					</view>
-				</view>
+				</view> -->
 
 				<!-- 顶部背景 -->
 				<view class="header">
@@ -39,8 +39,8 @@
 					</view>
 				</view>
 
-				<view class="header_total_container">
-					<PullDownBox>
+				<view class="header_total_container" @click="handleClickInfo">
+					<PullDownBox ref="pullDownPageInfo">
 						<template #title>
 							<text class="fwb">
 								车次号:
@@ -97,7 +97,8 @@
 				@scrolltolower="utils.debounce(reachDown, 500)">
 				<block v-for="(item, index) in details.data" :key="item.id">
 					<view @click="handleChooseStatus(index)"
-						:class="{'list_container': true, 'active': details.chooseIndex === index}">
+						:class="{'list_container': true, 'active': details.chooseIndex === index}"
+						:style="index === 0 ? 'margin-top: 0px;': ''">
 						<view class="list_row" @click="handleGoDetails(item)">
 							订单号: {{item.orderCode || '暂无数据'}}
 						</view>
@@ -229,6 +230,7 @@
 
 	// 组件实例
 	const basicContainer = ref()
+	const pullDownPageInfo = ref()
 
 	/** 扫描后执行的回调函数 */
 	const scandata = async () => {
@@ -257,7 +259,7 @@
 		details.datatime = details.date[0] + ' 至 ' + details.date[1]
 	}
 
-	onLoad((op) => {
+	onLoad(async (op) => {
 		console.log('op :>> ', op);
 		details.pageInfo = JSON.parse(op.pageInfo)
 
@@ -266,6 +268,9 @@
 		// #ifdef APP
 		utils.ttsspke('请扫描或输入包条码')
 		// #endif
+
+		await nextTick()
+		pullDownPageInfo.value.handleShowPullDown(true)
 	})
 
 	onShow(async () => {
@@ -285,10 +290,15 @@
 		await nextTick()
 		basicContainer.value.startPullDownRefresh()
 
-		// 设置滚动区高度
-		details.height = await utils.getViewDistanceFormTop('.scollView')
+		const timer = setTimeout(async () => {
+			// 设置滚动区高度
+			details.height = await utils.getViewDistanceFormTop('.scollView')
+			clearTimeout(timer)
+		}, 10)
+
 	})
 
+	/** 数据请求 */
 	async function initpage() {
 		if (details.date.length === 0) return uni.showToast({
 			title: '请选择时间',
@@ -377,6 +387,12 @@
 		basicContainer.value.startPullDownRefresh()
 	}
 
+	const handleClickInfo = async () => {
+		await nextTick()
+		// 设置滚动区高度
+		details.height = await utils.getViewDistanceFormTop('.scollView')
+	}
+
 	/** 触底加载 */
 	const reachDown = () => {
 		console.log('111 :>> ', 111);
@@ -589,10 +605,10 @@
 	// 列表容器
 	.list_container {
 		// 边框圆角
-		$borderRadius: 5upx;
+		$borderRadius: 10upx;
 
 		position: relative;
-		margin: 10upx;
+		margin: 20upx;
 		font-size: 0.8rem;
 		background: #fff;
 		padding: 10upx;
diff --git a/pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue b/pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue
index 1d09845..b1a381c 100644
--- a/pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue
+++ b/pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue
@@ -135,7 +135,8 @@
 		height: '80vh',
 		/** 页面数据 */
 		pageInfo: {} as any,
-		activeIndex: 0
+		activeIndex: 0,
+		isScan: false
 	})
 
 	// 组件实例
@@ -215,8 +216,11 @@
 			details.data = _data
 			details.pageInfo.scanNum = _scanNum
 
+			// if (details.isScan) {
 			if (_scanNum === data.length) utils.handleToast('订单已齐套')
 			else utils.handleToast(_scanNum + '件')
+			details.isScan = false
+			// }
 
 			return null
 		} catch (err) {
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index 2f8f606..94bca35 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -1808,7 +1808,7 @@ if (uni.restoreGlobal) {
     };
   };
   const Base64$1 = new Base64();
-  const devhost = "http://192.168.3.14:13000/";
+  const devhost = "http://test.api.huo5you.com/";
   const imghost = "";
   const host = devhost;
   const APPKEY = "h5u:h5u_secret";
@@ -3177,6 +3177,17 @@ if (uni.restoreGlobal) {
       canCancel
     );
   }
+  function warehouseTrayTypeSelectStockByMaterialNameAndMarketId(data, loadingObj = {}, canCancel = false) {
+    return service(
+      {
+        url: `logpm-warehouse/api/warehouseTrayType/selectStockByMaterialNameAndMarketId`,
+        method: "post",
+        data
+      },
+      loadingObj,
+      canCancel
+    );
+  }
   function warehouseTrayTypeenterStockNoDataMaterialCode(data, loadingObj = {}, canCancel = false) {
     return service(
       {
@@ -15824,7 +15835,9 @@ This will fail in production if not fixed.`);
         scancode: "",
         detauser: {},
         /** 输入框中的值 */
-        searchText: ""
+        searchText: "",
+        /** 是否是扫描请求后执行的刷新 */
+        isScan: false
       });
       const basicContainer = vue.ref();
       const scandata = async () => {
@@ -15840,11 +15853,12 @@ This will fail in production if not fixed.`);
         const { code: code2 } = res;
         if (code2 !== 200)
           return;
+        details.isScan = true;
         basicContainer.value.startPullDownRefresh();
-        formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:222", "res :>> ", res);
+        formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:224", "res :>> ", res);
       };
       onLoad((op) => {
-        formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:226", "op :>> ", op);
+        formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:228", "op :>> ", op);
         details.pageInfo = JSON.parse(op.pageInfo);
         utils.ttsspke("请扫描或输入包条码");
       });
@@ -15867,31 +15881,37 @@ This will fail in production if not fixed.`);
           };
           const res = await warehouseTrayTypeorderScanTrayCode(_submitData);
           const { code: code2, data } = res;
-          formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:265", "data :>> ", data);
-          formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:267", "111 :>> ", 111);
+          formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:267", "data :>> ", data);
+          formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:269", "111 :>> ", 111);
           if (code2 !== 200)
             return;
           if (res.data.isHasData == 1) {
             details.detauser = data.data;
             details.pageInfo.trayName = data.data.trayName;
             details.pageInfo.pageName = data.data.trayTypeName;
-            formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:276", "details.pageInfo :>> ", details.pageInfo);
+            formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:278", "details.pageInfo :>> ", details.pageInfo);
+            let _totalScanNum = 0;
             for (let item2 of details.detauser.packageList) {
               item2.scanNum = item2.scanNum || 0;
               item2.orderTotalNum = item2.orderTotalNum || 0;
               item2.residueNum = (item2.orderTotalNum || 0) - (item2.scanNum || 0);
+              _totalScanNum += item2.scanNum;
             }
             details.data = details.detauser.packageList;
+            if (details.isScan) {
+              utils.handleToast(`${_totalScanNum}件`);
+              details.isScan = false;
+            }
           }
           return null;
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:301", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:312", "err :>> ", err);
         } finally {
           return null;
         }
       }
       const reachDown = () => {
-        formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:309", "111 :>> ", 111);
+        formatAppLog("log", "at pagesHome/pages/PickUpLotList/PickUpLotList.vue:320", "111 :>> ", 111);
         details.page.pageNum += 1;
         if (details.page.total <= details.data.length)
           return uni.showToast({
@@ -16507,6 +16527,7 @@ This will fail in production if not fixed.`);
         searchText: ""
       });
       const basicContainer = vue.ref();
+      const pullDownPageInfo = vue.ref();
       const scandata = async () => {
         const _code = details.scancode;
         const _submitData = {
@@ -16520,18 +16541,20 @@ This will fail in production if not fixed.`);
         if (res.code !== 200)
           return;
         basicContainer.value.startPullDownRefresh();
-        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:250", "res :>> ", res);
+        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:252", "res :>> ", res);
       };
       const initTime = () => {
         details.date[0] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf() - 1e3 * 60 * 60 * 24 * 3, "yyyy-mm-dd");
         details.date[1] = uni.$u.timeFormat((/* @__PURE__ */ new Date()).valueOf(), "yyyy-mm-dd");
         details.datatime = details.date[0] + " 至 " + details.date[1];
       };
-      onLoad((op) => {
-        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:261", "op :>> ", op);
+      onLoad(async (op) => {
+        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:263", "op :>> ", op);
         details.pageInfo = JSON.parse(op.pageInfo);
         initTime();
         utils.ttsspke("请扫描或输入包条码");
+        await vue.nextTick();
+        pullDownPageInfo.value.handleShowPullDown(true);
       });
       onShow(async () => {
         uni.$off("scancodedate");
@@ -16543,7 +16566,10 @@ This will fail in production if not fixed.`);
         });
         await vue.nextTick();
         basicContainer.value.startPullDownRefresh();
-        details.height = await utils.getViewDistanceFormTop(".scollView");
+        const timer = setTimeout(async () => {
+          details.height = await utils.getViewDistanceFormTop(".scollView");
+          clearTimeout(timer);
+        }, 10);
       });
       async function initpage() {
         if (details.date.length === 0)
@@ -16574,14 +16600,11 @@ This will fail in production if not fixed.`);
           details.info = data;
           return null;
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:326", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:336", "err :>> ", err);
         } finally {
           return null;
         }
       }
-      const handletabBarState = (code2) => {
-        details.tabBarCode = code2;
-      };
       const handleSearch = () => {
         details.scancode = details.searchText;
         scandata();
@@ -16600,7 +16623,7 @@ This will fail in production if not fixed.`);
             icon: "none"
           });
         }
-        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:364", e2);
+        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:374", e2);
         details.date[0] = e2.startDate;
         details.date[1] = e2.endDate;
         details.datatime = details.date[0] + " 至 " + details.date[1];
@@ -16610,8 +16633,12 @@ This will fail in production if not fixed.`);
         initTime();
         basicContainer.value.startPullDownRefresh();
       }
+      const handleClickInfo = async () => {
+        await vue.nextTick();
+        details.height = await utils.getViewDistanceFormTop(".scollView");
+      };
       const reachDown = () => {
-        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:382", "111 :>> ", 111);
+        formatAppLog("log", "at pagesHome/pages/onLoadByScan/onLoadByScan.vue:398", "111 :>> ", 111);
         details.page.pageNum += 1;
         if (details.page.total <= details.data.length)
           return uni.showToast({
@@ -16645,28 +16672,15 @@ This will fail in production if not fixed.`);
             }, {
               head: vue.withCtx(() => [
                 vue.createElementVNode("view", { class: "header-container" }, [
-                  vue.createElementVNode("view", { class: "tabBar_container" }, [
-                    vue.createElementVNode(
-                      "view",
-                      {
-                        class: vue.normalizeClass({ "tabBar_item": true, "active": vue.unref(details).tabBarCode === 1 }),
-                        onClick: _cache[0] || (_cache[0] = ($event) => handletabBarState(1))
-                      },
-                      " 入库扫描 ",
-                      2
-                      /* CLASS */
-                    ),
-                    vue.createElementVNode(
-                      "view",
-                      {
-                        class: vue.normalizeClass({ "tabBar_item": true, "active": vue.unref(details).tabBarCode === 2 }),
-                        onClick: _cache[1] || (_cache[1] = ($event) => handletabBarState(2))
-                      },
-                      " 配送回库 ",
-                      2
-                      /* CLASS */
-                    )
-                  ]),
+                  vue.createCommentVNode(` <view class="tabBar_container">\r
+					<view :class="{'tabBar_item': true, 'active': details.tabBarCode === 1}" @click="handletabBarState(1)">\r
+						入库扫描\r
+					</view>\r
+\r
+					<view :class="{'tabBar_item': true, 'active': details.tabBarCode === 2}" @click="handletabBarState(2)">\r
+						配送回库\r
+					</view>\r
+				</view> `),
                   vue.createCommentVNode(" 顶部背景 "),
                   vue.createElementVNode("view", { class: "header" }, [
                     vue.createElementVNode("view", { class: "search_row" }, [
@@ -16675,7 +16689,7 @@ This will fail in production if not fixed.`);
                           "input",
                           {
                             placeholder: "请输入包条码",
-                            "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.unref(details).searchText = $event),
+                            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.unref(details).searchText = $event),
                             type: "text",
                             name: "",
                             id: ""
@@ -16689,7 +16703,7 @@ This will fail in production if not fixed.`);
                         vue.withDirectives(vue.createVNode(
                           _component_u_icon,
                           {
-                            onClick: _cache[3] || (_cache[3] = ($event) => vue.unref(details).searchText = ""),
+                            onClick: _cache[1] || (_cache[1] = ($event) => vue.unref(details).searchText = ""),
                             class: "clearIcon",
                             name: "close-circle",
                             color: "#999999",
@@ -16720,7 +16734,7 @@ This will fail in production if not fixed.`);
                       /* TEXT */
                     ),
                     vue.createElementVNode("view", {
-                      onClick: _cache[4] || (_cache[4] = vue.withModifiers(() => {
+                      onClick: _cache[2] || (_cache[2] = vue.withModifiers(() => {
                       }, ["stop", "prevent"])),
                       class: "icon_container"
                     }, [
@@ -16741,55 +16755,67 @@ This will fail in production if not fixed.`);
                       }))
                     ])
                   ]),
-                  vue.createElementVNode("view", { class: "header_total_container" }, [
-                    vue.createVNode(_component_PullDownBox, null, {
-                      title: vue.withCtx(() => [
-                        vue.createElementVNode("text", { class: "fwb" }, " 车次号: "),
-                        vue.createElementVNode(
-                          "text",
-                          null,
-                          vue.toDisplayString(vue.unref(details).pageInfo.tranNumber || "暂无数据"),
-                          1
-                          /* TEXT */
-                        )
-                      ]),
-                      content: vue.withCtx(() => [
-                        vue.createElementVNode("view", { class: "header_total" }, [
-                          vue.createElementVNode("view", { class: "header_total_item" }, [
-                            vue.createElementVNode("view", { class: "" }, " 总件数 "),
-                            vue.createElementVNode(
-                              "view",
-                              { class: "total" },
-                              vue.toDisplayString(vue.unref(details).info.totalNum || 0),
-                              1
-                              /* TEXT */
-                            )
-                          ]),
-                          vue.createElementVNode("view", { class: "header_total_item" }, [
-                            vue.createElementVNode("view", { class: "" }, " 已扫件数 "),
-                            vue.createElementVNode(
-                              "view",
-                              { class: "scanNum" },
-                              vue.toDisplayString(vue.unref(details).info.scanNum || 0),
-                              1
-                              /* TEXT */
-                            )
-                          ]),
-                          vue.createElementVNode("view", { class: "header_total_item" }, [
-                            vue.createElementVNode("view", { class: "" }, " 未扫件数 "),
-                            vue.createElementVNode(
-                              "view",
-                              { class: "notScanNum" },
-                              vue.toDisplayString((vue.unref(details).info.totalNum || 0) - (vue.unref(details).info.scanNum || 0)),
-                              1
-                              /* TEXT */
-                            )
+                  vue.createElementVNode("view", {
+                    class: "header_total_container",
+                    onClick: handleClickInfo
+                  }, [
+                    vue.createVNode(
+                      _component_PullDownBox,
+                      {
+                        ref_key: "pullDownPageInfo",
+                        ref: pullDownPageInfo
+                      },
+                      {
+                        title: vue.withCtx(() => [
+                          vue.createElementVNode("text", { class: "fwb" }, " 车次号: "),
+                          vue.createElementVNode(
+                            "text",
+                            null,
+                            vue.toDisplayString(vue.unref(details).pageInfo.tranNumber || "暂无数据"),
+                            1
+                            /* TEXT */
+                          )
+                        ]),
+                        content: vue.withCtx(() => [
+                          vue.createElementVNode("view", { class: "header_total" }, [
+                            vue.createElementVNode("view", { class: "header_total_item" }, [
+                              vue.createElementVNode("view", { class: "" }, " 总件数 "),
+                              vue.createElementVNode(
+                                "view",
+                                { class: "total" },
+                                vue.toDisplayString(vue.unref(details).info.totalNum || 0),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", { class: "header_total_item" }, [
+                              vue.createElementVNode("view", { class: "" }, " 已扫件数 "),
+                              vue.createElementVNode(
+                                "view",
+                                { class: "scanNum" },
+                                vue.toDisplayString(vue.unref(details).info.scanNum || 0),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", { class: "header_total_item" }, [
+                              vue.createElementVNode("view", { class: "" }, " 未扫件数 "),
+                              vue.createElementVNode(
+                                "view",
+                                { class: "notScanNum" },
+                                vue.toDisplayString((vue.unref(details).info.totalNum || 0) - (vue.unref(details).info.scanNum || 0)),
+                                1
+                                /* TEXT */
+                              )
+                            ])
                           ])
-                        ])
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      },
+                      512
+                      /* NEED_PATCH */
+                    )
                   ])
                 ])
               ]),
@@ -16805,7 +16831,7 @@ This will fail in production if not fixed.`);
                     class: "scollView",
                     "scroll-y": "true",
                     style: vue.normalizeStyle({ height: vue.unref(details).height }),
-                    onScrolltolower: _cache[5] || (_cache[5] = ($event) => vue.unref(utils).debounce(reachDown, 500))
+                    onScrolltolower: _cache[3] || (_cache[3] = ($event) => vue.unref(utils).debounce(reachDown, 500))
                   },
                   [
                     (vue.openBlock(true), vue.createElementBlock(
@@ -16815,7 +16841,8 @@ This will fail in production if not fixed.`);
                         return vue.openBlock(), vue.createElementBlock("view", {
                           key: item2.id,
                           onClick: ($event) => handleChooseStatus(),
-                          class: vue.normalizeClass({ "list_container": true, "active": vue.unref(details).chooseIndex === index2 })
+                          class: vue.normalizeClass({ "list_container": true, "active": vue.unref(details).chooseIndex === index2 }),
+                          style: vue.normalizeStyle(index2 === 0 ? "margin-top: 0px;" : "")
                         }, [
                           vue.createElementVNode("view", {
                             class: "list_row",
@@ -16870,7 +16897,7 @@ This will fail in production if not fixed.`);
                             3
                             /* TEXT, CLASS */
                           )
-                        ], 10, ["onClick"]);
+                        ], 14, ["onClick"]);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -16889,7 +16916,7 @@ This will fail in production if not fixed.`);
             }, 8, ["option"]),
             vue.createVNode(_component_l_calendar, {
               value: vue.unref(details).show,
-              "onUpdate:value": _cache[6] || (_cache[6] = ($event) => vue.unref(details).show = $event),
+              "onUpdate:value": _cache[4] || (_cache[4] = ($event) => vue.unref(details).show = $event),
               initStartDate: vue.unref(details).date[0],
               initEndDate: vue.unref(details).date[1],
               onHide: showCalendar,
@@ -16942,11 +16969,12 @@ This will fail in production if not fixed.`);
         height: "80vh",
         /** 页面数据 */
         pageInfo: {},
-        activeIndex: 0
+        activeIndex: 0,
+        isScan: false
       });
       const basicContainer = vue.ref();
       onLoad((op) => {
-        formatAppLog("log", "at pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue:146", "op :>> ", op);
+        formatAppLog("log", "at pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue:147", "op :>> ", op);
         details.pageInfo = JSON.parse(op.pageInfo);
       });
       onShow(async () => {
@@ -16989,16 +17017,17 @@ This will fail in production if not fixed.`);
               _data.push({ title: value.thirdPackName, dataList: [value], scanNum: Number(value.packageStatus) === 1 ? 1 : 0 });
             }
           }
-          formatAppLog("log", "at pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue:213", "_data :>> ", _data);
+          formatAppLog("log", "at pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue:214", "_data :>> ", _data);
           details.data = _data;
           details.pageInfo.scanNum = _scanNum;
           if (_scanNum === data.length)
             utils.handleToast("订单已齐套");
           else
             utils.handleToast(_scanNum + "件");
+          details.isScan = false;
           return null;
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue:224", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.vue:228", "err :>> ", err);
         } finally {
           return null;
         }
@@ -17264,7 +17293,7 @@ This will fail in production if not fixed.`);
               title: "数据已加载完毕"
             });
           }
-          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:201", "antiShake :>> ", antiShake);
+          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:210", "antiShake :>> ", antiShake);
           if (antiShake) {
             uni.hideLoading();
             clearTimeout(antiShake);
@@ -17290,7 +17319,7 @@ This will fail in production if not fixed.`);
             clearTimeout(antiShake);
           }, 500);
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:234", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:243", "err :>> ", err);
         }
       }
       let details = vue.reactive({
@@ -17327,9 +17356,9 @@ This will fail in production if not fixed.`);
       onShow(async () => {
         uni.$off("scancodedate");
         uni.$on("scancodedate", function(code2) {
-          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:280", "code :>> ", code2);
+          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:289", "code :>> ", code2);
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:282", code2);
+            formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:291", code2);
             details.scancode = code2;
             scandata();
           }
@@ -17374,10 +17403,10 @@ This will fail in production if not fixed.`);
           }
           if (data && data.pages <= details.pageNum)
             option.isEnd = true;
-          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:343", "details.datalist :>> ", details.datalist);
+          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:352", "details.datalist :>> ", details.datalist);
           return res;
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:347", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:356", "err :>> ", err);
         }
       }
       const handleSearch = () => {
@@ -17387,7 +17416,7 @@ This will fail in production if not fixed.`);
         details.show = !details.show;
       }
       function onConfirm(e2) {
-        formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:359", e2);
+        formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:368", e2);
         date2.value[0] = e2.startDate;
         date2.value[1] = e2.endDate;
         details.datatime = date2.value[0] + " 至 " + date2.value[1];
@@ -17409,7 +17438,7 @@ This will fail in production if not fixed.`);
           utils.handleToast("到车成功");
           basicContainer.value.startPullDownRefresh();
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:387", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/ArrivalList/ArrivalList.vue:396", "err :>> ", err);
         } finally {
         }
       };
@@ -17523,7 +17552,23 @@ This will fail in production if not fixed.`);
                               vue.createElementVNode(
                                 "view",
                                 null,
-                                " 实际装车/计划装车：" + vue.toDisplayString(item2.realLoadingNumber + "/" + item2.planLoadingNumber),
+                                " 计划装车：" + vue.toDisplayString(item2.planLoadingNumber),
+                                1
+                                /* TEXT */
+                              ),
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                " 实际装车：" + vue.toDisplayString(item2.totalLoadingNum),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            vue.createElementVNode("view", { class: "items_row" }, [
+                              vue.createElementVNode(
+                                "view",
+                                null,
+                                " 在车件数：" + vue.toDisplayString(item2.realLoadingNumber),
                                 1
                                 /* TEXT */
                               ),
@@ -17742,7 +17787,7 @@ This will fail in production if not fixed.`);
         uni.$off("scancodedate");
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:438", "code", code2);
+            formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:444", "code", code2);
             details.scancode = code2;
             details.isscan = true;
             scandata();
@@ -17781,7 +17826,7 @@ This will fail in production if not fixed.`);
             loadId: details.loadId
           });
           const { code: code2, data } = response2;
-          formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:488", "response :>> ", response2);
+          formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:494", "response :>> ", response2);
           if (code2 === 200) {
             details.pageInfo = data;
             details.datalist = details.orderStatus === 1 ? details.pageInfo.unloadScanOrderList : details.orderStatus === 2 ? details.pageInfo.unloadZeroList : details.pageInfo.exceptionList;
@@ -17825,6 +17870,7 @@ This will fail in production if not fixed.`);
           return;
         details.orderStatus = state;
         details.datalist = details.orderStatus === 1 ? details.pageInfo.unloadScanOrderList : details.orderStatus === 2 ? details.pageInfo.unloadZeroList : details.pageInfo.exceptionList;
+        formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:580", "details.datalist :>> ", details.datalist);
       }
       const handleOrderStowage = async (_scanCode) => {
         try {
@@ -17843,7 +17889,7 @@ This will fail in production if not fixed.`);
           basicContainer.value.startPullDownRefresh();
           return res;
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:600", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:608", "err :>> ", err);
         }
       };
       const scanOrder = async () => {
@@ -17892,7 +17938,7 @@ This will fail in production if not fixed.`);
             details.isAbnormal = true;
             basicContainer.value.startPullDownRefresh();
           } catch (err) {
-            formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:697", "err :>> ", err);
+            formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:705", "err :>> ", err);
           }
           return;
         }
@@ -17966,7 +18012,7 @@ This will fail in production if not fixed.`);
         });
       };
       function scandata() {
-        formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:788", "deta :>> ", details.pageType);
+        formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:796", "deta :>> ", details.pageType);
         if (Number(details.pageType) === 1)
           scanOrder();
         else if (Number(details.pageType) === 2)
@@ -17974,12 +18020,12 @@ This will fail in production if not fixed.`);
       }
       const handleZeroSoleStowage = (_item, _value) => {
         details.zeroInfo = { waybillNo: _item.waybillNo, orderCode: _item.orderCode, ..._value };
-        details.zeroInfo.unloadNum = details.zeroInfo.num;
+        details.zeroInfo.unloadNum = !details.zeroInfo.unloadNum ? details.zeroInfo.num : details.zeroInfo.unloadNum;
         ZeroStowage.value.setDetails({
           title: "零担卸车",
           showPopUp: true,
           async success() {
-            formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:804", "details.zeroInfo :>> ", details.zeroInfo);
+            formatAppLog("log", "at pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue:812", "details.zeroInfo :>> ", details.zeroInfo);
             const submitData = {
               loadId: details.loadId,
               waybillNo: details.zeroInfo.waybillNo,
@@ -18001,20 +18047,6 @@ This will fail in production if not fixed.`);
         });
       };
       const handleZeroStowage = (_item, _value) => {
-        let content = "";
-        if (Number(_value.scanStatus) === 2) {
-          content = "该零担已卸车";
-        } else if (Number(_value.scanStatus) === 2) {
-          content = "该零担已签收";
-        }
-        if (content) {
-          utils.ttsspke(content);
-          uni.showToast({
-            title: content,
-            icon: "none"
-          });
-          return;
-        }
         if (_value.trayCode) {
           utils.handleToast("是否整托卸车");
           tiplists.value.setdetails({
@@ -18044,6 +18076,34 @@ This will fail in production if not fixed.`);
           return;
         handleZeroSoleStowage(_item, _value);
       };
+      const handleDeleteAbnormal = (item2) => {
+        tiplists.value.setdetails({
+          isshow: true,
+          tipstate: 2,
+          list: [],
+          isonecheck: true,
+          title: "是否删除异常包件",
+          content: "12441",
+          success: async () => {
+            tiplists.value.setdetails({ isshow: false });
+            const submitData = {
+              orderCode: item2.scanCode,
+              carsLoadScanIds: item2.id
+            };
+            const res = await postRemoveCarsLoadScan(submitData);
+            const { code: code2 } = res;
+            if (code2 !== 200)
+              return;
+            basicContainer.value.startPullDownRefresh();
+          },
+          cancel: () => {
+            tiplists.value.setdetails({ isshow: false });
+          },
+          close: () => {
+            tiplists.value.setdetails({ isshow: false });
+          }
+        });
+      };
       const { orderStatus, items, datalist } = vue.toRefs(details);
       return (_ctx, _cache) => {
         const _component_u_divider = resolveEasycom(vue.resolveDynamicComponent("u-divider"), __easycom_0$2);
@@ -18452,10 +18512,7 @@ This will fail in production if not fixed.`);
                                 1
                                 /* TEXT */
                               ),
-                              vue.createElementVNode("view", {
-                                class: "flex1",
-                                style: { "display": "flex", "align-items": "center", "margin-left": "5px" }
-                              }, [
+                              vue.createElementVNode("view", { class: "flex1 flex ml10" }, [
                                 vue.createTextVNode(" 卸车状态: "),
                                 vue.createElementVNode(
                                   "view",
@@ -18491,7 +18548,12 @@ This will fail in production if not fixed.`);
                                 1
                                 /* TEXT */
                               )
-                            ])
+                            ]),
+                            item2.isData === 0 ? (vue.openBlock(), vue.createElementBlock("view", {
+                              key: 0,
+                              class: "deleteBtn",
+                              onClick: () => handleDeleteAbnormal(item2)
+                            }, " 删除 ", 8, ["onClick"])) : vue.createCommentVNode("v-if", true)
                           ]))
                         ]);
                       }),
@@ -24036,7 +24098,7 @@ This will fail in production if not fixed.`);
             tiplists.value.setdetails({ isshow: false });
             uni.setStorageSync("checkvehicle", res.data[deta.checklist[0]]);
             uni.navigateTo({
-              url: "/pagesHome/pages/LoadingDetails/LoadingDetails?item=" + JSON.stringify(item2) + "&loadingId=" + res.data[deta.checklist[0]].id
+              url: "/pagesHome/pages/loadingRetention/loadingRetention?item=" + JSON.stringify(item2) + "&loadingId=" + res.data[deta.checklist[0]].id
             });
           },
           cancel: (details2) => {
@@ -38911,8 +38973,12 @@ This will fail in production if not fixed.`);
           marketName: "",
           // 物料编码
           materialCode: "",
+          // 物料名称
+          materialName: "",
           // 库存品列表
-          searchStockList: []
+          searchStockList: [],
+          /** 搜索状态 -- 编码 | 名称 */
+          activeStatus: "materialName"
         }
       });
       let tip = vue.ref(null);
@@ -38925,7 +38991,7 @@ This will fail in production if not fixed.`);
         details.trayType = op.trayType;
         if (op.pageName)
           utils.ttsspke("当前打托方式为" + op.pageName);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:407", "details.trayType :>> ", details.trayType);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:435", "details.trayType :>> ", details.trayType);
         if (!op.trayType) {
           uni.showToast({
             title: "获取打托方式出错",
@@ -38937,7 +39003,7 @@ This will fail in production if not fixed.`);
         uni.$off("scancodedate");
         uni.$on("scancodedate", function(code2) {
           if (code2) {
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:420", code2);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:448", code2);
             details.scancode = code2;
             if (details.showstate === 2) {
               details.waybillCode = code2;
@@ -38988,7 +39054,7 @@ This will fail in production if not fixed.`);
             let res = await warehouseTrayTypedeleteOrderCode(data);
             if (res.code !== 200)
               return;
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:490", "res :>> ", res);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:518", "res :>> ", res);
             initlist();
             tip.value.setisshow(false);
           },
@@ -39036,7 +39102,7 @@ This will fail in production if not fixed.`);
               trayGoodsId: item2.trayGoodsId
             };
             let res = await warehouseTrayTypedeleteStockByTrayGoodsId(data);
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:544", "res :>> ", res);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:572", "res :>> ", res);
             if (res.code == 200) {
               initlist();
             }
@@ -39055,7 +39121,7 @@ This will fail in production if not fixed.`);
           trayCode: details.trayCode
         };
         let res = await warehouseTrayTypeorderScanTrayCode(data);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:564", res.data, "resresresres");
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:592", res.data, "resresresres");
         if (res.code == 200) {
           details.detauser = {};
           details.datelist = [];
@@ -39064,7 +39130,7 @@ This will fail in production if not fixed.`);
             details.stock.marketId = res.data.data.marketId;
             details.stock.marketName = res.data.data.marketName;
             details.Remarktext = res.data.data.reamrk;
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:576", " details.detauser :>> ", details.detauser);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:604", " details.detauser :>> ", details.detauser);
             if (details.tabBarState === 1)
               details.datelist = details.detauser.packageList;
             else if (details.tabBarState === 2)
@@ -39098,7 +39164,7 @@ This will fail in production if not fixed.`);
         let res = await warehouseTrayTypeorderScanTrayCode(data);
         if (res.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:613", "res", res);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:641", "res", res);
         if (Number(res.data.isHasData) === 0) {
           uni.setStorageSync("trayCodeType", res.data.data);
           uni.redirectTo({
@@ -39118,11 +39184,11 @@ This will fail in production if not fixed.`);
           orderPackageCode: details.scancode
         };
         let response2 = await warehouseTrayTypeorderScanOrderPackageCode(submitData);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:640", "response", response2);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:668", "response", response2);
         const res = await initlist();
         const { code: code2 } = res;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:644", "res :>> ", res);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:646", "details.scancode :>> ", details.scancode);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:672", "res :>> ", res);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:674", "details.scancode :>> ", details.scancode);
         if (code2 !== 200)
           return;
         if (((_a = details == null ? void 0 : details.detauser) == null ? void 0 : _a.trayNum) && ((_b = details == null ? void 0 : details.detauser) == null ? void 0 : _b.trayNum) > 0) {
@@ -39132,7 +39198,7 @@ This will fail in production if not fixed.`);
             data: { orderCode }
           } = response2;
           const scanOrder2 = details.datelist.find((val) => val.dataCode === orderCode);
-          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:659", "scanOrder :>> ", scanOrder2);
+          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:687", "scanOrder :>> ", scanOrder2);
           if (scanOrder2 && scanOrder2.orderTotalNum === scanOrder2.scanNum) {
             utils.ttsspke(`订单${orderCode}已齐套`);
           }
@@ -39143,7 +39209,7 @@ This will fail in production if not fixed.`);
           orderPackageCode: details.scancode
         };
         const res = warehouseTrayTypeenterStockNoDataMaterialCode(data);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:677", "res :>> ", res);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:705", "res :>> ", res);
       }
       async function setTabBarState(state) {
         details.tabBarState = state;
@@ -39158,11 +39224,11 @@ This will fail in production if not fixed.`);
         }
       }
       async function chooseMarket() {
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:702", "111 :>> ", 111);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:704", "details.datelist :>> ", details.datelist.length);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:730", "111 :>> ", 111);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:732", "details.datelist :>> ", details.datelist.length);
         if (details.datelist.length === 0) {
           const res = await warehouseTrayTypefindAllMarket({});
-          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:708", "res :>> ", res);
+          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:736", "res :>> ", res);
           if (res.code !== 200)
             return;
           const _marketArr = res.data;
@@ -39180,9 +39246,9 @@ This will fail in production if not fixed.`);
                   icon: "none"
                 });
               }
-              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:727", "detail :>> ", detail);
+              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:755", "detail :>> ", detail);
               details.stock.marketId = _marketArr[detail.checklist[0]].marketId;
-              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:729", "_marketName :>> ", _marketArr);
+              formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:757", "_marketName :>> ", _marketArr);
               details.stock.marketName = _marketArr[detail.checklist[0]].marketName;
               tiplists.value.setdetails({ isshow: false });
             },
@@ -39246,7 +39312,7 @@ This will fail in production if not fixed.`);
         let response2 = await warehouseTrayTypegetZeroOrderByWaybillCode(data);
         if (response2.code !== 200)
           return;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:803", response2);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:831", response2);
         details.codelist = response2.data;
         details.codelist.map((item2) => {
           item2["number"] = 0;
@@ -39256,7 +39322,7 @@ This will fail in production if not fixed.`);
       async function confirmlist() {
         let zeroList = [];
         let isfl = false;
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:819", "details.codelist :>> ", details.codelist);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:847", "details.codelist :>> ", details.codelist);
         isfl = !details.codelist.some((item2) => {
           if (item2.number === 0) {
             return false;
@@ -39300,11 +39366,13 @@ This will fail in production if not fixed.`);
         }
       }
       async function stockSearch() {
-        let data = {
+        let res = details.stock.activeStatus === "materialCode" ? await warehouseTrayTypeselectStockByMaterialCodeAndMarketId({
           marketId: details.stock.marketId,
           materialCode: details.stock.materialCode
-        };
-        let res = await warehouseTrayTypeselectStockByMaterialCodeAndMarketId(data);
+        }) : await warehouseTrayTypeSelectStockByMaterialNameAndMarketId({
+          marketId: details.stock.marketId,
+          materialName: details.stock.materialCode
+        });
         if (res.code !== 200)
           return;
         details.stock.searchStockList = res.data.filter((val) => val.quantityStock !== 0);
@@ -39335,21 +39403,21 @@ This will fail in production if not fixed.`);
             }
           });
           Promise.all(PromiseArr).then((res) => {
-            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:914", "res :>> ", res);
+            formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:945", "res :>> ", res);
             setshowstate(0);
             initlist();
             details.stock.searchStockList = [];
             details.stock.materialCode = "";
           });
         } catch (err) {
-          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:921", "err :>> ", err);
+          formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:952", "err :>> ", err);
         } finally {
           uni.hideLoading();
         }
       }
       const print = () => {
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:933", "bluetoothList :>> ", bluetoothList);
-        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:934", "details.detauser :>> ", details.detauser);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:964", "bluetoothList :>> ", bluetoothList);
+        formatAppLog("log", "at pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue:965", "details.detauser :>> ", details.detauser);
         tiplists.value.setdetails({
           title: "是否打印",
           isshow: true,
@@ -39905,377 +39973,420 @@ This will fail in production if not fixed.`);
               vue.Fragment,
               { key: 1 },
               [
-                vue.unref(showstate) !== 0 ? (vue.openBlock(), vue.createElementBlock("view", {
-                  key: 0,
-                  class: "tanchuangbg",
-                  onClick: _cache[19] || (_cache[19] = ($event) => setshowstate(0))
-                }, [
-                  vue.createCommentVNode(" 备注 -- 修改 "),
-                  vue.unref(showstate) == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                vue.unref(showstate) !== 0 ? (vue.openBlock(), vue.createElementBlock(
+                  "view",
+                  {
                     key: 0,
-                    class: "tanbx",
-                    onClick: _cache[11] || (_cache[11] = vue.withModifiers(() => {
-                    }, ["stop", "prevent"]))
-                  }, [
-                    vue.createElementVNode("view", { class: "titlran" }, "备注"),
-                    vue.createElementVNode("view", { class: "textareabx" }, [
-                      vue.withDirectives(vue.createElementVNode(
-                        "textarea",
-                        {
-                          maxlength: "-1",
-                          placeholder: "请输入备注",
-                          "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => vue.unref(details).Remarktext = $event)
-                        },
-                        null,
-                        512
-                        /* NEED_PATCH */
-                      ), [
-                        [vue.vModelText, vue.unref(details).Remarktext]
-                      ])
-                    ]),
-                    vue.createElementVNode("view", { class: "btx" }, [
-                      vue.createElementVNode("view", {
-                        class: "cancel",
-                        onClick: _cache[10] || (_cache[10] = ($event) => setshowstate(0))
-                      }, "取消"),
-                      vue.createElementVNode("view", {
-                        class: "confirm",
-                        onClick: checkremaker
-                      }, "确认")
-                    ])
-                  ])) : vue.createCommentVNode("v-if", true),
-                  vue.createCommentVNode(" 零担 -- 录入 "),
-                  vue.unref(showstate) === 2 ? (vue.openBlock(), vue.createElementBlock("view", {
-                    key: 1,
-                    class: "inputbox",
-                    onClick: _cache[14] || (_cache[14] = vue.withModifiers(() => {
-                    }, ["stop", "prevent"]))
-                  }, [
-                    vue.createElementVNode("view", { class: "inputscan" }, [
-                      vue.withDirectives(vue.createElementVNode(
-                        "input",
-                        {
-                          placeholder: "输入运单号",
-                          "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => vue.isRef(waybillCode) ? waybillCode.value = $event : null)
-                        },
-                        null,
-                        512
-                        /* NEED_PATCH */
-                      ), [
-                        [vue.vModelText, vue.unref(waybillCode)]
-                      ]),
-                      vue.createElementVNode("view", {
-                        class: "scanbt",
-                        onClick: scanlist
-                      }, "搜索")
-                    ]),
-                    vue.createElementVNode("scroll-view", {
-                      "scroll-y": "true",
-                      class: "scvbw"
+                    class: "tanchuangbg",
+                    onClick: _cache[23] || (_cache[23] = ($event) => setshowstate(0)),
+                    onTouchmove: _cache[24] || (_cache[24] = vue.withModifiers(() => {
+                    }, ["stop"]))
+                  },
+                  [
+                    vue.createCommentVNode(" 备注 -- 修改 "),
+                    vue.unref(showstate) == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                      key: 0,
+                      class: "tanbx",
+                      onClick: _cache[11] || (_cache[11] = vue.withModifiers(() => {
+                      }, ["stop", "prevent"]))
                     }, [
-                      vue.createElementVNode("view", { class: "scboxitem" }, [
-                        (vue.openBlock(true), vue.createElementBlock(
-                          vue.Fragment,
+                      vue.createElementVNode("view", { class: "titlran" }, "备注"),
+                      vue.createElementVNode("view", { class: "textareabx" }, [
+                        vue.withDirectives(vue.createElementVNode(
+                          "textarea",
+                          {
+                            maxlength: "-1",
+                            placeholder: "请输入备注",
+                            "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => vue.unref(details).Remarktext = $event)
+                          },
                           null,
-                          vue.renderList(vue.unref(codelist), (item2, index2) => {
-                            return vue.openBlock(), vue.createElementBlock("view", { class: "items" }, [
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, "订单号："),
-                                vue.createElementVNode(
-                                  "view",
-                                  null,
-                                  vue.toDisplayString(item2.dataCode),
-                                  1
-                                  /* TEXT */
-                                )
-                              ]),
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "总件数："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.orderTotalNum) + "件",
-                                    1
-                                    /* TEXT */
-                                  )
-                                ])
-                              ]),
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "剩余件数："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.residueNum) + "件",
-                                    1
-                                    /* TEXT */
-                                  )
-                                ])
-                              ]),
-                              vue.createElementVNode("view", { class: "rksu" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "入库数："),
-                                  vue.withDirectives(vue.createElementVNode("input", {
-                                    placeholder: "请输入入库数",
-                                    "onUpdate:modelValue": ($event) => item2.number = $event,
-                                    type: "number",
-                                    onInput: ($event) => inputNum(item2)
-                                  }, null, 40, ["onUpdate:modelValue", "onInput"]), [
-                                    [vue.vModelText, item2.number]
-                                  ])
-                                ])
-                              ]),
-                              vue.unref(checkinarr).indexOf(index2) != -1 ? (vue.openBlock(), vue.createElementBlock("view", {
-                                key: 0,
-                                class: "lisbite"
-                              }, [
-                                (vue.openBlock(true), vue.createElementBlock(
-                                  vue.Fragment,
-                                  null,
-                                  vue.renderList(item2.positionList, (ite) => {
-                                    return vue.openBlock(), vue.createElementBlock("view", { class: "itembox" }, [
-                                      ite.allocationName ? (vue.openBlock(), vue.createElementBlock(
-                                        "view",
-                                        { key: 0 },
-                                        "库位码：" + vue.toDisplayString(ite.allocationName),
-                                        1
-                                        /* TEXT */
-                                      )) : vue.createCommentVNode("v-if", true),
-                                      vue.createElementVNode(
-                                        "view",
-                                        null,
-                                        "托盘码：" + vue.toDisplayString(ite.trayCode),
-                                        1
-                                        /* TEXT */
-                                      ),
-                                      vue.createElementVNode(
-                                        "view",
-                                        null,
-                                        "数量：" + vue.toDisplayString(ite.num),
-                                        1
-                                        /* TEXT */
-                                      )
-                                    ]);
-                                  }),
-                                  256
-                                  /* UNKEYED_FRAGMENT */
-                                ))
-                              ])) : vue.createCommentVNode("v-if", true)
-                            ]);
-                          }),
-                          256
-                          /* UNKEYED_FRAGMENT */
-                        ))
-                      ])
-                    ]),
-                    vue.createElementVNode("view", { class: "btx" }, [
-                      vue.createElementVNode("view", {
-                        class: "cancel",
-                        onClick: _cache[13] || (_cache[13] = ($event) => setshowstate(0))
-                      }, "取消"),
-                      vue.createElementVNode("view", {
-                        class: "confirm",
-                        onClick: confirmlist
-                      }, "确认")
-                    ])
-                  ])) : vue.createCommentVNode("v-if", true),
-                  vue.createCommentVNode(" 库存品 -- 录入 "),
-                  vue.unref(showstate) === 3 ? (vue.openBlock(), vue.createElementBlock("view", {
-                    key: 2,
-                    class: "inputbox",
-                    onClick: _cache[18] || (_cache[18] = vue.withModifiers(() => {
-                    }, ["stop", "prevent"]))
-                  }, [
-                    vue.createElementVNode("view", { class: "inputscan" }, [
-                      vue.withDirectives(vue.createElementVNode(
-                        "input",
-                        {
-                          placeholder: "输入物料编码",
-                          "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => vue.unref(details).stock.materialCode = $event)
-                        },
-                        null,
-                        512
-                        /* NEED_PATCH */
-                      ), [
-                        [vue.vModelText, vue.unref(details).stock.materialCode]
+                          512
+                          /* NEED_PATCH */
+                        ), [
+                          [vue.vModelText, vue.unref(details).Remarktext]
+                        ])
                       ]),
-                      vue.createElementVNode("view", {
-                        class: "scanbt",
-                        onClick: stockSearch
-                      }, "搜索")
-                    ]),
-                    vue.createElementVNode("scroll-view", {
-                      "scroll-y": "true",
-                      class: "scvbw"
+                      vue.createElementVNode("view", { class: "btx" }, [
+                        vue.createElementVNode("view", {
+                          class: "cancel",
+                          onClick: _cache[10] || (_cache[10] = ($event) => setshowstate(0))
+                        }, "取消"),
+                        vue.createElementVNode("view", {
+                          class: "confirm",
+                          onClick: checkremaker
+                        }, "确认")
+                      ])
+                    ])) : vue.createCommentVNode("v-if", true),
+                    vue.createCommentVNode(" 零担 -- 录入 "),
+                    vue.unref(showstate) === 2 ? (vue.openBlock(), vue.createElementBlock("view", {
+                      key: 1,
+                      class: "inputbox",
+                      onClick: _cache[14] || (_cache[14] = vue.withModifiers(() => {
+                      }, ["stop", "prevent"]))
                     }, [
-                      vue.createElementVNode("view", { class: "scboxitem" }, [
-                        (vue.openBlock(true), vue.createElementBlock(
-                          vue.Fragment,
+                      vue.createElementVNode("view", { class: "inputscan" }, [
+                        vue.withDirectives(vue.createElementVNode(
+                          "input",
+                          {
+                            placeholder: "输入运单号",
+                            "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => vue.isRef(waybillCode) ? waybillCode.value = $event : null)
+                          },
                           null,
-                          vue.renderList(vue.unref(details).stock.searchStockList, (item2, index2) => {
-                            return vue.openBlock(), vue.createElementBlock("view", { class: "items" }, [
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "物料编码："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.cargoNumber),
-                                    1
-                                    /* TEXT */
-                                  )
-                                ])
-                              ]),
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "物料名称："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.descriptionGoods),
-                                    1
-                                    /* TEXT */
-                                  )
-                                ])
-                              ]),
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "订单编号："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.orderCode),
-                                    1
-                                    /* TEXT */
-                                  )
-                                ])
-                              ]),
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "物料单位："),
+                          512
+                          /* NEED_PATCH */
+                        ), [
+                          [vue.vModelText, vue.unref(waybillCode)]
+                        ]),
+                        vue.createElementVNode("view", {
+                          class: "scanbt",
+                          onClick: scanlist
+                        }, "搜索")
+                      ]),
+                      vue.createElementVNode("scroll-view", {
+                        "scroll-y": "true",
+                        class: "scvbw"
+                      }, [
+                        vue.createElementVNode("view", { class: "scboxitem" }, [
+                          (vue.openBlock(true), vue.createElementBlock(
+                            vue.Fragment,
+                            null,
+                            vue.renderList(vue.unref(codelist), (item2, index2) => {
+                              return vue.openBlock(), vue.createElementBlock("view", { class: "items" }, [
+                                vue.createElementVNode("view", { class: "type1s" }, [
+                                  vue.createElementVNode("view", null, "订单号："),
                                   vue.createElementVNode(
                                     "view",
                                     null,
-                                    vue.toDisplayString(item2.cargoUnit),
+                                    vue.toDisplayString(item2.dataCode),
                                     1
                                     /* TEXT */
                                   )
                                 ]),
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "包装数量："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.cargoNorms),
-                                    1
-                                    /* TEXT */
-                                  )
-                                ])
-                              ]),
-                              vue.createElementVNode("view", { class: "type1s" }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "剩余数量："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.quantityStock) + vue.toDisplayString(item2.cargoUnit),
-                                    1
-                                    /* TEXT */
-                                  )
+                                vue.createElementVNode("view", { class: "type1s" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("view", null, "总件数："),
+                                    vue.createElementVNode(
+                                      "view",
+                                      null,
+                                      vue.toDisplayString(item2.orderTotalNum) + "件",
+                                      1
+                                      /* TEXT */
+                                    )
+                                  ])
                                 ]),
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "SKU："),
-                                  vue.createElementVNode(
-                                    "view",
-                                    null,
-                                    vue.toDisplayString(item2.sku),
-                                    1
-                                    /* TEXT */
-                                  )
-                                ])
-                              ]),
-                              vue.createElementVNode("view", {
-                                class: "rksu",
-                                onClick: _cache[16] || (_cache[16] = vue.withModifiers(() => {
-                                }, ["stop", "prevent"]))
-                              }, [
-                                vue.createElementVNode("view", null, [
-                                  vue.createElementVNode("view", null, "数量："),
-                                  vue.withDirectives(vue.createElementVNode("input", {
-                                    placeholder: "请输入数量",
-                                    "onUpdate:modelValue": ($event) => item2.maknumber = $event,
-                                    onInput: ($event) => stockInput(item2)
-                                  }, null, 40, ["onUpdate:modelValue", "onInput"]), [
-                                    [vue.vModelText, item2.maknumber]
+                                vue.createElementVNode("view", { class: "type1s" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("view", null, "剩余件数："),
+                                    vue.createElementVNode(
+                                      "view",
+                                      null,
+                                      vue.toDisplayString(item2.residueNum) + "件",
+                                      1
+                                      /* TEXT */
+                                    )
                                   ])
-                                ])
-                              ]),
-                              vue.unref(checkinarr).indexOf(index2) != -1 ? (vue.openBlock(), vue.createElementBlock("view", {
-                                key: 0,
-                                class: "lisbite"
-                              }, [
-                                (vue.openBlock(true), vue.createElementBlock(
-                                  vue.Fragment,
-                                  null,
-                                  vue.renderList(item2.positionList, (ite) => {
-                                    return vue.openBlock(), vue.createElementBlock("view", { class: "itembox" }, [
-                                      vue.createElementVNode("view", null, [
-                                        vue.createTextVNode(" 库位： "),
-                                        ite.areaName ? (vue.openBlock(), vue.createElementBlock(
-                                          "text",
+                                ]),
+                                vue.createElementVNode("view", { class: "rksu" }, [
+                                  vue.createElementVNode("view", null, [
+                                    vue.createElementVNode("view", null, "入库数："),
+                                    vue.withDirectives(vue.createElementVNode("input", {
+                                      placeholder: "请输入入库数",
+                                      "onUpdate:modelValue": ($event) => item2.number = $event,
+                                      type: "number",
+                                      onInput: ($event) => inputNum(item2)
+                                    }, null, 40, ["onUpdate:modelValue", "onInput"]), [
+                                      [vue.vModelText, item2.number]
+                                    ])
+                                  ])
+                                ]),
+                                vue.unref(checkinarr).indexOf(index2) != -1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                                  key: 0,
+                                  class: "lisbite"
+                                }, [
+                                  (vue.openBlock(true), vue.createElementBlock(
+                                    vue.Fragment,
+                                    null,
+                                    vue.renderList(item2.positionList, (ite) => {
+                                      return vue.openBlock(), vue.createElementBlock("view", { class: "itembox" }, [
+                                        ite.allocationName ? (vue.openBlock(), vue.createElementBlock(
+                                          "view",
                                           { key: 0 },
-                                          vue.toDisplayString(ite.areaName),
+                                          "库位码：" + vue.toDisplayString(ite.allocationName),
                                           1
                                           /* TEXT */
                                         )) : vue.createCommentVNode("v-if", true),
-                                        ite.allocationName ? (vue.openBlock(), vue.createElementBlock(
-                                          "text",
-                                          { key: 1 },
-                                          vue.toDisplayString("-" + ite.allocationName),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          "托盘码：" + vue.toDisplayString(ite.trayCode),
+                                          1
+                                          /* TEXT */
+                                        ),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          "数量：" + vue.toDisplayString(ite.num),
+                                          1
+                                          /* TEXT */
+                                        )
+                                      ]);
+                                    }),
+                                    256
+                                    /* UNKEYED_FRAGMENT */
+                                  ))
+                                ])) : vue.createCommentVNode("v-if", true)
+                              ]);
+                            }),
+                            256
+                            /* UNKEYED_FRAGMENT */
+                          ))
+                        ])
+                      ]),
+                      vue.createElementVNode("view", { class: "btx" }, [
+                        vue.createElementVNode("view", {
+                          class: "cancel",
+                          onClick: _cache[13] || (_cache[13] = ($event) => setshowstate(0))
+                        }, "取消"),
+                        vue.createElementVNode("view", {
+                          class: "confirm",
+                          onClick: confirmlist
+                        }, "确认")
+                      ])
+                    ])) : vue.createCommentVNode("v-if", true),
+                    vue.createCommentVNode(" 库存品 -- 录入 "),
+                    vue.unref(showstate) === 3 ? (vue.openBlock(), vue.createElementBlock(
+                      "view",
+                      {
+                        key: 2,
+                        class: "inputbox",
+                        onTouchmove: _cache[21] || (_cache[21] = vue.withModifiers(() => {
+                        }, ["stop"])),
+                        onClick: _cache[22] || (_cache[22] = vue.withModifiers(() => {
+                        }, ["stop", "prevent"]))
+                      },
+                      [
+                        vue.createElementVNode("view", { class: "flex-c-sb w100 rem-0-9" }, [
+                          vue.createElementVNode("view", { class: "" }, " 搜索方式： "),
+                          vue.createElementVNode(
+                            "view",
+                            {
+                              onClick: _cache[15] || (_cache[15] = ($event) => vue.unref(details).stock.activeStatus = "materialName"),
+                              class: vue.normalizeClass({ checkbtn: true, active: vue.unref(details).stock.activeStatus === "materialName" })
+                            },
+                            " 物料名称 ",
+                            2
+                            /* CLASS */
+                          ),
+                          vue.createElementVNode(
+                            "view",
+                            {
+                              onClick: _cache[16] || (_cache[16] = ($event) => vue.unref(details).stock.activeStatus = "materialCode"),
+                              class: vue.normalizeClass({ checkbtn: true, active: vue.unref(details).stock.activeStatus !== "materialName" })
+                            },
+                            " 物料编码 ",
+                            2
+                            /* CLASS */
+                          )
+                        ]),
+                        vue.createElementVNode("view", { class: "inputscan mt20" }, [
+                          vue.withDirectives(vue.createElementVNode("input", {
+                            class: "flex1",
+                            placeholder: vue.unref(details).stock.activeStatus === "materialName" ? "请输入物料名称" : "输入物料编码",
+                            "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => vue.unref(details).stock.materialCode = $event)
+                          }, null, 8, ["placeholder"]), [
+                            [vue.vModelText, vue.unref(details).stock.materialCode]
+                          ]),
+                          vue.createElementVNode("view", {
+                            class: "scanbt ml10",
+                            onClick: stockSearch
+                          }, "搜索")
+                        ]),
+                        vue.createCommentVNode(' 					<view class="inputscan mt20">\r\n						<input class="flex1" placeholder="输入物料名称" v-model="details.stock.materialName" />\r\n					</view> '),
+                        vue.createElementVNode(
+                          "scroll-view",
+                          {
+                            "scroll-y": "true",
+                            onTouchmove: _cache[19] || (_cache[19] = vue.withModifiers(() => {
+                            }, ["stop"])),
+                            class: "scvbw"
+                          },
+                          [
+                            vue.createElementVNode("view", { class: "scboxitem" }, [
+                              (vue.openBlock(true), vue.createElementBlock(
+                                vue.Fragment,
+                                null,
+                                vue.renderList(vue.unref(details).stock.searchStockList, (item2, index2) => {
+                                  return vue.openBlock(), vue.createElementBlock("view", { class: "items" }, [
+                                    vue.createElementVNode("view", { class: "type1s" }, [
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "物料编码："),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          vue.toDisplayString(item2.cargoNumber),
+                                          1
+                                          /* TEXT */
+                                        )
+                                      ])
+                                    ]),
+                                    vue.createElementVNode("view", { class: "type1s" }, [
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "物料名称："),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          vue.toDisplayString(item2.descriptionGoods),
                                           1
                                           /* TEXT */
-                                        )) : vue.createCommentVNode("v-if", true)
+                                        )
+                                      ])
+                                    ]),
+                                    vue.createElementVNode("view", { class: "type1s" }, [
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "订单编号："),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          vue.toDisplayString(item2.orderCode),
+                                          1
+                                          /* TEXT */
+                                        )
+                                      ])
+                                    ]),
+                                    vue.createElementVNode("view", { class: "type1s" }, [
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "物料单位："),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          vue.toDisplayString(item2.cargoUnit),
+                                          1
+                                          /* TEXT */
+                                        )
                                       ]),
-                                      vue.createElementVNode(
-                                        "view",
-                                        null,
-                                        "托盘码：" + vue.toDisplayString(ite.trayCode),
-                                        1
-                                        /* TEXT */
-                                      ),
-                                      vue.createElementVNode(
-                                        "view",
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "包装数量："),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          vue.toDisplayString(item2.cargoNorms),
+                                          1
+                                          /* TEXT */
+                                        )
+                                      ])
+                                    ]),
+                                    vue.createElementVNode("view", { class: "type1s" }, [
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "剩余数量："),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          vue.toDisplayString(item2.quantityStock) + vue.toDisplayString(item2.cargoUnit),
+                                          1
+                                          /* TEXT */
+                                        )
+                                      ]),
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "SKU："),
+                                        vue.createElementVNode(
+                                          "view",
+                                          null,
+                                          vue.toDisplayString(item2.sku),
+                                          1
+                                          /* TEXT */
+                                        )
+                                      ])
+                                    ]),
+                                    vue.createElementVNode("view", {
+                                      class: "rksu",
+                                      onClick: _cache[18] || (_cache[18] = vue.withModifiers(() => {
+                                      }, ["stop", "prevent"]))
+                                    }, [
+                                      vue.createElementVNode("view", null, [
+                                        vue.createElementVNode("view", null, "数量："),
+                                        vue.withDirectives(vue.createElementVNode("input", {
+                                          placeholder: "请输入数量",
+                                          "onUpdate:modelValue": ($event) => item2.maknumber = $event,
+                                          onInput: ($event) => stockInput(item2)
+                                        }, null, 40, ["onUpdate:modelValue", "onInput"]), [
+                                          [vue.vModelText, item2.maknumber]
+                                        ])
+                                      ])
+                                    ]),
+                                    vue.unref(checkinarr).indexOf(index2) != -1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                                      key: 0,
+                                      class: "lisbite"
+                                    }, [
+                                      (vue.openBlock(true), vue.createElementBlock(
+                                        vue.Fragment,
                                         null,
-                                        "数量：" + vue.toDisplayString(ite.num),
-                                        1
-                                        /* TEXT */
-                                      )
-                                    ]);
-                                  }),
-                                  256
-                                  /* UNKEYED_FRAGMENT */
-                                ))
-                              ])) : vue.createCommentVNode("v-if", true)
-                            ]);
-                          }),
-                          256
-                          /* UNKEYED_FRAGMENT */
-                        ))
-                      ])
-                    ]),
-                    vue.createElementVNode("view", { class: "btx" }, [
-                      vue.createElementVNode("view", {
-                        class: "cancel",
-                        onClick: _cache[17] || (_cache[17] = ($event) => setshowstate(0))
-                      }, "取消"),
-                      vue.createElementVNode("view", {
-                        class: "confirm",
-                        onClick: confirmlur
-                      }, "确认")
-                    ])
-                  ])) : vue.createCommentVNode("v-if", true)
-                ])) : vue.createCommentVNode("v-if", true)
+                                        vue.renderList(item2.positionList, (ite) => {
+                                          return vue.openBlock(), vue.createElementBlock("view", { class: "itembox" }, [
+                                            vue.createElementVNode("view", null, [
+                                              vue.createTextVNode(" 库位： "),
+                                              ite.areaName ? (vue.openBlock(), vue.createElementBlock(
+                                                "text",
+                                                { key: 0 },
+                                                vue.toDisplayString(ite.areaName),
+                                                1
+                                                /* TEXT */
+                                              )) : vue.createCommentVNode("v-if", true),
+                                              ite.allocationName ? (vue.openBlock(), vue.createElementBlock(
+                                                "text",
+                                                { key: 1 },
+                                                vue.toDisplayString("-" + ite.allocationName),
+                                                1
+                                                /* TEXT */
+                                              )) : vue.createCommentVNode("v-if", true)
+                                            ]),
+                                            vue.createElementVNode(
+                                              "view",
+                                              null,
+                                              "托盘码：" + vue.toDisplayString(ite.trayCode),
+                                              1
+                                              /* TEXT */
+                                            ),
+                                            vue.createElementVNode(
+                                              "view",
+                                              null,
+                                              "数量：" + vue.toDisplayString(ite.num),
+                                              1
+                                              /* TEXT */
+                                            )
+                                          ]);
+                                        }),
+                                        256
+                                        /* UNKEYED_FRAGMENT */
+                                      ))
+                                    ])) : vue.createCommentVNode("v-if", true)
+                                  ]);
+                                }),
+                                256
+                                /* UNKEYED_FRAGMENT */
+                              ))
+                            ])
+                          ],
+                          32
+                          /* NEED_HYDRATION */
+                        ),
+                        vue.createElementVNode("view", { class: "btx" }, [
+                          vue.createElementVNode("view", {
+                            class: "cancel",
+                            onClick: _cache[20] || (_cache[20] = ($event) => setshowstate(0))
+                          }, "取消"),
+                          vue.createElementVNode("view", {
+                            class: "confirm",
+                            onClick: confirmlur
+                          }, "确认")
+                        ])
+                      ],
+                      32
+                      /* NEED_HYDRATION */
+                    )) : vue.createCommentVNode("v-if", true)
+                  ],
+                  32
+                  /* NEED_HYDRATION */
+                )) : vue.createCommentVNode("v-if", true)
               ],
               64
               /* STABLE_FRAGMENT */
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index 9cdc16a..8feebbc 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -7,8 +7,8 @@
   "id": "__UNI__EB22F37",
   "name": "货无忧",
   "version": {
-    "name": "1.1.35",
-    "code": 1135
+    "name": "1.1.36",
+    "code": 1136
   },
   "description": "",
   "developer": {
diff --git a/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css b/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
index 25e1ba9..df31b88 100644
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
@@ -225,7 +225,146 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.mabxtop {
+.flex[data-v-ca2cce65] {
+	display: flex;
+}
+.flex-wrap[data-v-ca2cce65] {
+	flex-wrap: wrap;
+}
+.flex-c-c[data-v-ca2cce65] {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.flex-c-sb[data-v-ca2cce65] {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.flex-c-sa[data-v-ca2cce65] {
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+}
+.align-center[data-v-ca2cce65] {
+	display: flex;
+	align-items: center;
+}
+.flex1[data-v-ca2cce65] {
+	flex: 1;
+}
+.flexnone[data-v-ca2cce65] {
+	flex: none;
+}
+.mt10[data-v-ca2cce65] {
+	margin-top: 0.3125rem;
+}
+.mt20[data-v-ca2cce65] {
+	margin-top: 0.625rem;
+}
+.ml10[data-v-ca2cce65] {
+	margin-left: 0.3125rem;
+}
+.ml20[data-v-ca2cce65] {
+	margin-left: 0.625rem;
+}
+.mb10[data-v-ca2cce65] {
+	margin-bottom: 0.3125rem;
+}
+.mb20[data-v-ca2cce65] {
+	margin-bottom: 0.625rem;
+}
+.mr10[data-v-ca2cce65] {
+	margin-right: 0.3125rem;
+}
+.mr20[data-v-ca2cce65] {
+	margin-right: 0.625rem;
+}
+.pd10[data-v-ca2cce65] {
+	padding: 0.3125rem;
+}
+.pd15[data-v-ca2cce65] {
+	padding: 0.46875rem;
+}
+.pd20[data-v-ca2cce65] {
+	padding: 0.625rem;
+}
+.pb10[data-v-ca2cce65] {
+	padding-bottom: 0.3125rem;
+}
+.pb15[data-v-ca2cce65] {
+	padding-bottom: 0.46875rem;
+}
+.pb20[data-v-ca2cce65] {
+	padding-bottom: 0.625rem;
+}
+.pt10[data-v-ca2cce65] {
+	padding-top: 0.3125rem;
+}
+.pt15[data-v-ca2cce65] {
+	padding-top: 0.46875rem;
+}
+.pt20[data-v-ca2cce65] {
+	padding-top: 0.625rem;
+}
+.pl10[data-v-ca2cce65] {
+	padding-left: 0.3125rem;
+}
+.pl15[data-v-ca2cce65] {
+	padding-left: 0.46875rem;
+}
+.pl20[data-v-ca2cce65] {
+	padding-left: 0.625rem;
+}
+.pr10[data-v-ca2cce65] {
+	padding-right: 0.3125rem;
+}
+.pr15[data-v-ca2cce65] {
+	padding-right: 0.46875rem;
+}
+.pr20[data-v-ca2cce65] {
+	padding-right: 0.625rem;
+}
+.w100[data-v-ca2cce65] {
+	width: 100%;
+}
+.h100[data-v-ca2cce65] {
+	height: 100%;
+}
+.text-center[data-v-ca2cce65] {
+	text-align: center;
+}
+.text-start[data-v-ca2cce65] {
+	text-align: start;
+}
+.text-end[data-v-ca2cce65] {
+	text-align: end;
+}
+.fwb[data-v-ca2cce65] {
+	font-weight: bold;
+}
+.fwn[data-v-ca2cce65] {
+	font-weight: normal;
+}
+.rem-1[data-v-ca2cce65] {
+	font-size: 1rem;
+}
+.rem-0-8[data-v-ca2cce65] {
+	font-size: 0.8rem;
+}
+.rem-0-9[data-v-ca2cce65] {
+	font-size: 0.9rem;
+}
+.rem-1-5[data-v-ca2cce65] {
+	font-size: 1.5rem;
+}
+.primaryColor[data-v-ca2cce65] {
+	color: #172e60;
+}
+.primaryColorIm[data-v-ca2cce65] {
+	color: #172e60 !important;
+}
+.mabxtop[data-v-ca2cce65] {
   position: relative;
   width: 21.375rem;
   background: #ffffff;
@@ -239,88 +378,88 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   align-items: center;
   justify-content: center;
 }
-.mabxtop > uni-view {
+.mabxtop > uni-view[data-v-ca2cce65] {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin-bottom: 0.3125rem;
 }
-.mabxtop > uni-view:nth-last-child(1) {
+.mabxtop > uni-view[data-v-ca2cce65]:nth-last-child(1) {
   margin-bottom: 0;
 }
-.mabxtop > uni-view > uni-view {
+.mabxtop > uni-view > uni-view[data-v-ca2cce65] {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
 }
-.mabxtop > uni-view > uni-view:nth-of-type(1) {
+.mabxtop > uni-view > uni-view[data-v-ca2cce65]:nth-of-type(1) {
   width: 60%;
 }
-.mabxtop > uni-view > uni-view:nth-of-type(2) {
+.mabxtop > uni-view > uni-view[data-v-ca2cce65]:nth-of-type(2) {
   width: 40%;
 }
-.mabxtop > uni-view > uni-view > uni-view:nth-of-type(1) {
+.mabxtop > uni-view > uni-view > uni-view[data-v-ca2cce65]:nth-of-type(1) {
   font-size: 1rem;
   font-weight: 400;
   color: #020b18;
   word-wrap: break-word;
   word-break: break-all;
 }
-.mabxtop > uni-view > uni-view > uni-view:nth-of-type(2) {
+.mabxtop > uni-view > uni-view > uni-view[data-v-ca2cce65]:nth-of-type(2) {
   font-size: 0.875rem;
   font-weight: 400;
   color: #90a0af;
 }
-.mabxtop .printBtn {
-  background: #d3832a;
+.mabxtop .printBtn[data-v-ca2cce65] {
+  background: var(--subjectColor);
   color: #fff !important;
   width: 3.125rem;
   padding: 0.3125rem;
   text-align: center;
   border-radius: 0.15625rem;
 }
-.bgimg {
+.bgimg[data-v-ca2cce65] {
   position: fixed;
   left: 0;
   top: 0;
   width: 100%;
 }
-.scvmabx {
+.scvmabx[data-v-ca2cce65] {
   width: 21.375rem;
   height: 45vh;
   margin: auto;
   margin-top: 0.625rem;
 }
-.scvmabx .marketName {
+.scvmabx .marketName[data-v-ca2cce65] {
   display: flex;
   margin-bottom: 0.625rem;
   align-items: center;
 }
-.scvmabx .maxboxs {
+.scvmabx .maxboxs[data-v-ca2cce65] {
   width: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.scvmabx .maxboxs .chuanhuo {
+.scvmabx .maxboxs .chuanhuo[data-v-ca2cce65] {
   border: #ff0000;
 }
-.scvmabx .maxboxs .weiqt {
+.scvmabx .maxboxs .weiqt[data-v-ca2cce65] {
   position: absolute;
   right: 0;
   top: 0;
   width: 2.1875rem;
   height: 2.1875rem;
 }
-.scvmabx .maxboxs .qitao {
+.scvmabx .maxboxs .qitao[data-v-ca2cce65] {
   position: absolute;
   right: 0;
   top: 0;
   width: 2.1875rem;
   height: 2.1875rem;
 }
-.scvmabx .maxboxs > .items {
+.scvmabx .maxboxs > .items[data-v-ca2cce65] {
   width: 21.5625rem;
   display: flex;
   flex-direction: column;
@@ -332,10 +471,10 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   margin-bottom: 0.9375rem;
   position: relative;
 }
-.scvmabx .maxboxs > .items:nth-last-child(1) {
+.scvmabx .maxboxs > .items[data-v-ca2cce65]:nth-last-child(1) {
   margin-bottom: 0.625rem;
 }
-.scvmabx .maxboxs > .items .tophd {
+.scvmabx .maxboxs > .items .tophd[data-v-ca2cce65] {
   width: 100%;
   display: flex;
   align-items: flex-start;
@@ -345,42 +484,42 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   padding-top: 0.9375rem;
   border-bottom: 0.125rem solid #eeeeee;
 }
-.scvmabx .maxboxs > .items .tophd > uni-image {
+.scvmabx .maxboxs > .items .tophd > uni-image[data-v-ca2cce65] {
   width: 1.5rem;
   height: 1.5rem;
   margin-right: 0.3125rem;
   box-sizing: border-box;
 }
-.scvmabx .maxboxs > .items .tophd > uni-view {
+.scvmabx .maxboxs > .items .tophd > uni-view[data-v-ca2cce65] {
   font-size: 1rem;
   color: #020b18;
   font-weight: 400;
   word-wrap: break-word;
   word-break: break-all;
 }
-.scvmabx .maxboxs > .items .tophd > uni-view:nth-of-type(1) {
+.scvmabx .maxboxs > .items .tophd > uni-view[data-v-ca2cce65]:nth-of-type(1) {
   width: 5.625rem;
 }
-.scvmabx .maxboxs > .items .tophd > uni-view:nth-of-type(2) {
+.scvmabx .maxboxs > .items .tophd > uni-view[data-v-ca2cce65]:nth-of-type(2) {
   flex: 1;
 }
-.scvmabx .maxboxs > .items .tophd1 {
+.scvmabx .maxboxs > .items .tophd1[data-v-ca2cce65] {
   width: 100%;
   display: flex;
   box-sizing: border-box;
   padding: 0.46875rem 0.625rem;
   border-bottom: 0.125rem solid #eeeeee;
 }
-.scvmabx .maxboxs > .items .tophd1 > uni-view {
+.scvmabx .maxboxs > .items .tophd1 > uni-view[data-v-ca2cce65] {
   display: flex;
   flex: 1;
   align-items: center;
 }
-.scvmabx .maxboxs > .items .tophd1 uni-image {
+.scvmabx .maxboxs > .items .tophd1 uni-image[data-v-ca2cce65] {
   width: 2rem;
   height: 2rem;
 }
-.scvmabx .maxboxs > .items .numbxvie {
+.scvmabx .maxboxs > .items .numbxvie[data-v-ca2cce65] {
   width: 100%;
   display: flex;
   align-items: center;
@@ -388,28 +527,28 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   padding: 0.46875rem 0.78125rem;
   box-sizing: border-box;
 }
-.scvmabx .maxboxs > .items .numbxvie .zhon {
-  color: #d3832a;
+.scvmabx .maxboxs > .items .numbxvie .zhon[data-v-ca2cce65] {
+  color: var(--subjectColor);
 }
-.scvmabx .maxboxs > .items .numbxvie .yish {
+.scvmabx .maxboxs > .items .numbxvie .yish[data-v-ca2cce65] {
   color: #1197eb;
 }
-.scvmabx .maxboxs > .items .numbxvie .weish {
+.scvmabx .maxboxs > .items .numbxvie .weish[data-v-ca2cce65] {
   color: #020b18;
 }
-.scvmabx .maxboxs > .items .numbxvie > uni-view {
+.scvmabx .maxboxs > .items .numbxvie > uni-view[data-v-ca2cce65] {
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.scvmabx .maxboxs > .items .numbxvie > uni-view > uni-view:nth-of-type(1) {
+.scvmabx .maxboxs > .items .numbxvie > uni-view > uni-view[data-v-ca2cce65]:nth-of-type(1) {
   font-size: 1.125rem;
   margin-bottom: 0.375rem;
 }
-.scvmabx .maxboxs > .items .numbxvie > uni-view > uni-view:nth-of-type(2) {
+.scvmabx .maxboxs > .items .numbxvie > uni-view > uni-view[data-v-ca2cce65]:nth-of-type(2) {
   font-size: 0.875rem;
 }
-.headtop {
+.headtop[data-v-ca2cce65] {
   width: 21.375rem;
   padding: 0.625rem;
   display: flex;
@@ -423,14 +562,14 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   border-radius: 0.625rem;
   margin-top: 0.9375rem;
 }
-.headtop > uni-view {
+.headtop > uni-view[data-v-ca2cce65] {
   flex: 1;
 }
-.headtop > uni-view > uni-input {
+.headtop > uni-view > uni-input[data-v-ca2cce65] {
   flex: 1;
   font-size: 0.875rem;
 }
-.hedtopt {
+.hedtopt[data-v-ca2cce65] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -439,7 +578,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   padding: 1.125rem 1rem;
   box-sizing: border-box;
 }
-.hedtopt .typto {
+.hedtopt .typto[data-v-ca2cce65] {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -449,10 +588,10 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   color: #092c4d;
   margin-bottom: 0.625rem;
 }
-.hedtopt .typto:nth-last-child(1) {
+.hedtopt .typto[data-v-ca2cce65]:nth-last-child(1) {
   margin-bottom: 0;
 }
-.hedtopt .typto > uni-view {
+.hedtopt .typto > uni-view[data-v-ca2cce65] {
   flex: 1;
 }
 /**
@@ -498,7 +637,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   display: block;
   position: absolute;
   height: 0.125rem;
-  background: #d3832a;
+  background: var(--subjectColor);
   width: 0;
   left: 50%;
   bottom: 0;
@@ -522,10 +661,10 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
   justify-content: center;
   font-size: 1rem;
   font-weight: bold;
-  color: #d3832a;
+  color: var(--subjectColor);
   margin: auto;
   margin-top: 0.625rem;
-  border: 0.09375rem solid #d3832a;
+  border: 0.09375rem solid var(--subjectColor);
 }
 .tanchuangbg[data-v-ca2cce65] {
   width: 100%;
@@ -739,4 +878,14 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
 .tanchuangbg .inputbox .btx > .confirm[data-v-ca2cce65] {
   background-color: #d3832a;
   color: #ffffff;
+}
+.checkbtn[data-v-ca2cce65] {
+  padding: 0.3125rem 0.625rem;
+  background-color: #eee;
+  transition: all 0.3s;
+  border-radius: 0.15625rem;
+}
+.checkbtn.active[data-v-ca2cce65] {
+  background-color: var(--subjectColor);
+  color: #fff;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
deleted file mode 100644
index 22fe6af..0000000
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ /dev/null
@@ -1,159 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const common_vendor = require("./common/vendor.js");
-const uni_modules_fantMiniPlus_index = require("./uni_modules/fant-mini-plus/index.js");
-const utils_functions = require("./utils/functions.js");
-const utils_utils = require("./utils/utils.js");
-const store_index = require("./store/index.js");
-require("./utils/IDCardVerification.js");
-require("./utils/base64.js");
-require("./config/host.js");
-if (!Math) {
-  "./pages/login/login.js";
-  "./pages/index/index.js";
-  "./pages/user/user.js";
-  "./pages/news/news.js";
-  "./pages/taskList/taskList.js";
-  "./pages/reportForms/reportForms.js";
-  "./pagesHome/pages/pickingScan/pickingScan.js";
-  "./pagesHome/pages/StowageList/StowageList.js";
-  "./pagesHome/pages/CreateAbnormalWorkOrder/CreateAbnormalWorkOrder.js";
-  "./pagesHome/pages/StowageListDetails/StowageListDetails.js";
-  "./pagesHome/pages/RelayScanList/RelayScanList.js";
-  "./pagesHome/pages/codePlateBracket/codePlateBracket.js";
-  "./pagesHome/pages/billsList/billsList.js";
-  "./pagesHome/pages/PickUpLotList/PickUpLotList.js";
-  "./pagesHome/pages/TranNumber/TranNumber.js";
-  "./pagesHome/pages/onLoadByScan/onLoadByScan.js";
-  "./pagesHome/pages/onLoadOrderDetails/onLoadOrderDetails.js";
-  "./pagesHome/pages/ArrivalList/ArrivalList.js";
-  "./pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.js";
-  "./pagesHome/pages/Preentrytrainnumber/Preentrytrainnumber.js";
-  "./pagesHome/pages/PreStoragePackage/PreStoragePackage.js";
-  "./pagesHome/pages/PalletizingwarehousingList/PalletizingwarehousingList.js";
-  "./pagesHome/pages/Palletizingwarehousing/Palletizingwarehousing.js";
-  "./pagesHome/pages/Listinginboundtrains/Listinginboundtrains.js";
-  "./pagesHome/pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray.js";
-  "./pagesHome/pages/SelfPickupScan/SelfPickupScan.js";
-  "./pagesHome/pages/LoadingScan/LoadingScan.js";
-  "./pagesHome/pages/loadingRetention/loadingRetention.js";
-  "./pagesHome/pages/StockUplist/StockUplist.js";
-  "./pagesHome/pages/StockUplistByZero/StockUplistByZero.js";
-  "./pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js";
-  "./pagesHome/pages/DownScan/DownScan.js";
-  "./pagesHome/pages/signinScan/signinScan.js";
-  "./pagesHome/pages/directGoMarket/directGoMarket.js";
-  "./pagesHome/pages/directGoMarketDetails/directGoMarketDetails.js";
-  "./pagesHome/pages/SelfPScanList/SelfPScanList.js";
-  "./pagesHome/pages/SelfPickupDetails/SelfPickupDetails.js";
-  "./pagesHome/pages/LoadingDetails/LoadingDetails.js";
-  "./pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js";
-  "./pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js";
-  "./pagesHome/pages/CustomerSign/CustomerSign.js";
-  "./pagesHome/pages/signOrderScan/signOrderScan.js";
-  "./pagesHome/pages/signPackageScan/signPackageScan.js";
-  "./pagesHome/pages/SignDetailScan/SignDetailScan.js";
-  "./pagesHome/pages/setbarcode/setbarcode.js";
-  "./pagesHome/pages/OfflineUpload/OfflineUpload.js";
-  "./pagesHome/pages/createTask/createTask.js";
-  "./pagesHome/pages/ordersorting/ordersorting.js";
-  "./pagesHome/pages/lnventorysorting/lnventorysorting.js";
-  "./pagesHome/pages/scansorting/scansorting.js";
-  "./pagesHome/pages/peopleSorting/peopleSorting.js";
-  "./pagesHome/pages/OrderSortingDetail/OrderSortingDetail.js";
-  "./pagesHome/pages/ScanSortingType/ScanSortingType.js";
-  "./pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.js";
-  "./pagesHome/pages/inventoryType/inventoryType.js";
-  "./pagesHome/pages/inventoryDetail/inventoryDetail.js";
-  "./pagesHome/pages/inventoryDetailList/inventoryDetailList.js";
-  "./pagesHome/pages/inventoryenter/inventoryenter.js";
-  "./pagesHome/pages/lnventorysortinglist/lnventorysortinglist.js";
-  "./pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.js";
-  "./pagesHome/pages/ScanUpType/ScanUpType.js";
-  "./pagesHome/pages/ScanUp/ScanUp.js";
-  "./pagesHome/pages/RelocationType/RelocationType.js";
-  "./pagesHome/pages/Relocation/Relocation.js";
-  "./pagesHome/pages/PeopleScanUpType/PeopleScanUpType.js";
-  "./pagesHome/pages/PeopleScanUp/PeopleScanUp.js";
-  "./pagesHome/pages/PickingScanList/PickingScanList.js";
-  "./pagesHome/pages/Retention/Retention.js";
-  "./pagesHome/pages/MergeTray/MergeTray.js";
-  "./pagesHome/pages/MergeTrayDetails/MergeTrayDetails.js";
-  "./pagesHome/pages/DownGoodsType/DownGoodsType.js";
-  "./pagesHome/pages/DownGoods/DownGoods.js";
-  "./pagesHome/pages/SetPrice/SetPrice.js";
-  "./pagesHome/pages/RemoveTray/RemoveTray.js";
-  "./pagesHome/pages/Check/Check.js";
-  "./pagesHome/pages/createAddServe/createAddServe.js";
-  "./pagesHome/pages/orderDetail/orderDetail.js";
-  "./pagesHome/pages/RelocationAllocationId/RelocationAllocationId.js";
-  "./pagesHome/pages/orderDetails/orderDetails.js";
-  "./pagesHome/pages/orderInquiry/orderInquiry.js";
-  "./pagesHome/pages/waybillInquiry/waybillInquiry.js";
-  "./pagesHome/pages/storageInquiry/storageInquiry.js";
-  "./pagesHome/pages/trayInquiry/trayInquiry.js";
-  "./pagesHome/pages/inventoryInquiry/inventoryInquiry.js";
-  "./pagesHome/pages/StorageLocationList/StorageLocationList.js";
-  "./pagesHome/pages/MaterialMaintenance/MaterialMaintenance.js";
-  "./pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails.js";
-  "./pagesHome/pages/StockUpListZero/StockUpListZero.js";
-  "./pagesHome/pages/SearchTray/SearchTray.js";
-  "./pagesHome/pages/integral/integral.js";
-  "./pagesHome/pages/integralEdit/integralEdit.js";
-  "./pagesHome/pages/integralMy/integralMy.js";
-  "./pagesUser/pages/about/about.js";
-  "./pagesUser/pages/systemSettings/systemSettings.js";
-  "./pagesUser/pages/securitySettings/securitySettings.js";
-  "./pagesTask/pages/dynamicCheck/dynamicCheck.js";
-  "./pagesTask/pages/checkTaskList/checkTaskList.js";
-  "./pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.js";
-  "./pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.js";
-  "./pagesTask/pages/trayCheckDetails/trayCheckDetails.js";
-  "./pagesTask/pages/contracts/contracts.js";
-}
-const _sfc_main = {
-  setup() {
-    common_vendor.onLaunch(() => {
-      console.log("onLaunch");
-    });
-    common_vendor.onShow(() => {
-      console.log("onshow");
-    });
-    return {};
-  }
-};
-const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/worksp/logpm/App.vue"]]);
-const saomiao = () => "./compoment/saomiao.js";
-const tips = () => "./compoment/tips/tips.js";
-const tiplist = () => "./compoment/tiplist/tiplist.js";
-const InputNum = () => "./compoment/InputNum/InputNum.js";
-const BasicContainer = () => "./compoment/BasicContainer/BasicContainer.js";
-const PopUp = () => "./compoment/PopUp/PopUp.js";
-const BluetoothList = () => "./compoment/BluetoothList/BluetoothList.js";
-const ScrollList = () => "./compoment/ScrollList/ScrollList.js";
-const PullDownBox = () => "./compoment/PullDownBox/PullDownBox.js";
-const MyTree = () => "./compoment/MyTree/MyTree.js";
-const CheckBox = () => "./compoment/CheckBox/CheckBox.js";
-const MyInput = () => "./compoment/MyInput/MyInput.js";
-const saomiao1 = () => "./compoment/saomiao1.js";
-const saomiao2 = () => "./compoment/saomiao2.js";
-const saomiao3 = () => "./compoment/saomiao3.js";
-const saomiao4 = () => "./compoment/saomiao4.js";
-function createApp() {
-  const app = common_vendor.createSSRApp(App);
-  app.config.warnHandler = () => null;
-  app.provide("functions", utils_functions.api);
-  app.provide("utils", utils_utils.utils);
-  app.use(common_vendor.uviewPlus);
-  app.use(store_index.store);
-  app.use(common_vendor.createPinia());
-  app.use(uni_modules_fantMiniPlus_index.fantMini);
-  app.component("saomiao", saomiao).component("tips", tips).component("tiplist", tiplist).component("saomiao1", saomiao1).component("saomiao2", saomiao2).component("saomiao3", saomiao3).component("saomiao4", saomiao4).component("InputNum", InputNum).component("BasicContainer", BasicContainer).component("PopUp", PopUp).component("BluetoothList", BluetoothList).component("ScrollList", ScrollList).component("PullDownBox", PullDownBox).component("MyTree", MyTree).component("CheckBox", CheckBox).component("MyInput", MyInput);
-  common_vendor.index.$u.config.unit = "rpx";
-  return {
-    app,
-    Pinia: common_vendor.Pinia
-  };
-}
-createApp().app.mount("#app");
-exports.createApp = createApp;
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
deleted file mode 100644
index da8da34..0000000
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-  "pages": [
-    "pages/login/login",
-    "pages/index/index",
-    "pages/user/user",
-    "pages/news/news",
-    "pages/taskList/taskList",
-    "pages/reportForms/reportForms"
-  ],
-  "subPackages": [
-    {
-      "root": "pagesHome",
-      "pages": [
-        "pages/pickingScan/pickingScan",
-        "pages/StowageList/StowageList",
-        "pages/CreateAbnormalWorkOrder/CreateAbnormalWorkOrder",
-        "pages/StowageListDetails/StowageListDetails",
-        "pages/RelayScanList/RelayScanList",
-        "pages/codePlateBracket/codePlateBracket",
-        "pages/billsList/billsList",
-        "pages/PickUpLotList/PickUpLotList",
-        "pages/TranNumber/TranNumber",
-        "pages/onLoadByScan/onLoadByScan",
-        "pages/onLoadOrderDetails/onLoadOrderDetails",
-        "pages/ArrivalList/ArrivalList",
-        "pages/VehicleArrivalDetails/VehicleArrivalDetails",
-        "pages/Preentrytrainnumber/Preentrytrainnumber",
-        "pages/PreStoragePackage/PreStoragePackage",
-        "pages/PalletizingwarehousingList/PalletizingwarehousingList",
-        "pages/Palletizingwarehousing/Palletizingwarehousing",
-        "pages/Listinginboundtrains/Listinginboundtrains",
-        "pages/VehicleArrivalDetailsByTray/VehicleArrivalDetailsByTray",
-        "pages/SelfPickupScan/SelfPickupScan",
-        "pages/LoadingScan/LoadingScan",
-        "pages/loadingRetention/loadingRetention",
-        "pages/StockUplist/StockUplist",
-        "pages/StockUplistByZero/StockUplistByZero",
-        "pages/StockUplistScandetails/StockUplistScandetails",
-        "pages/DownScan/DownScan",
-        "pages/signinScan/signinScan",
-        "pages/directGoMarket/directGoMarket",
-        "pages/directGoMarketDetails/directGoMarketDetails",
-        "pages/SelfPScanList/SelfPScanList",
-        "pages/SelfPickupDetails/SelfPickupDetails",
-        "pages/LoadingDetails/LoadingDetails",
-        "pages/CustomerOrdersDetails/CustomerOrdersDetails",
-        "pages/DeliveryCustomerScan/DeliveryCustomerScan",
-        "pages/CustomerSign/CustomerSign",
-        "pages/signOrderScan/signOrderScan",
-        "pages/signPackageScan/signPackageScan",
-        "pages/SignDetailScan/SignDetailScan",
-        "pages/setbarcode/setbarcode",
-        "pages/OfflineUpload/OfflineUpload",
-        "pages/createTask/createTask",
-        "pages/ordersorting/ordersorting",
-        "pages/lnventorysorting/lnventorysorting",
-        "pages/scansorting/scansorting",
-        "pages/peopleSorting/peopleSorting",
-        "pages/OrderSortingDetail/OrderSortingDetail",
-        "pages/ScanSortingType/ScanSortingType",
-        "pages/PeopleSortingDetail/PeopleSortingDetail",
-        "pages/inventoryType/inventoryType",
-        "pages/inventoryDetail/inventoryDetail",
-        "pages/inventoryDetailList/inventoryDetailList",
-        "pages/inventoryenter/inventoryenter",
-        "pages/lnventorysortinglist/lnventorysortinglist",
-        "pages/OrderSortingDetailList/OrderSortingDetailList",
-        "pages/ScanUpType/ScanUpType",
-        "pages/ScanUp/ScanUp",
-        "pages/RelocationType/RelocationType",
-        "pages/Relocation/Relocation",
-        "pages/PeopleScanUpType/PeopleScanUpType",
-        "pages/PeopleScanUp/PeopleScanUp",
-        "pages/PickingScanList/PickingScanList",
-        "pages/Retention/Retention",
-        "pages/MergeTray/MergeTray",
-        "pages/MergeTrayDetails/MergeTrayDetails",
-        "pages/DownGoodsType/DownGoodsType",
-        "pages/DownGoods/DownGoods",
-        "pages/SetPrice/SetPrice",
-        "pages/RemoveTray/RemoveTray",
-        "pages/Check/Check",
-        "pages/createAddServe/createAddServe",
-        "pages/orderDetail/orderDetail",
-        "pages/RelocationAllocationId/RelocationAllocationId",
-        "pages/orderDetails/orderDetails",
-        "pages/orderInquiry/orderInquiry",
-        "pages/waybillInquiry/waybillInquiry",
-        "pages/storageInquiry/storageInquiry",
-        "pages/trayInquiry/trayInquiry",
-        "pages/inventoryInquiry/inventoryInquiry",
-        "pages/StorageLocationList/StorageLocationList",
-        "pages/MaterialMaintenance/MaterialMaintenance",
-        "pages/CustomerTrayDetails/CustomerTrayDetails",
-        "pages/StockUpListZero/StockUpListZero",
-        "pages/SearchTray/SearchTray",
-        "pages/integral/integral",
-        "pages/integralEdit/integralEdit",
-        "pages/integralMy/integralMy"
-      ]
-    },
-    {
-      "root": "pagesUser",
-      "pages": [
-        "pages/about/about",
-        "pages/systemSettings/systemSettings",
-        "pages/securitySettings/securitySettings"
-      ]
-    },
-    {
-      "root": "pagesTask",
-      "pages": [
-        "pages/dynamicCheck/dynamicCheck",
-        "pages/checkTaskList/checkTaskList",
-        "pages/dynamicCheckDetails/dynamicCheckDetails",
-        "pages/storageLocationCheckDetails/storageLocationCheckDetails",
-        "pages/trayCheckDetails/trayCheckDetails",
-        "pages/contracts/contracts"
-      ]
-    }
-  ],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "tabBar": {
-    "color": "#999999",
-    "selectedColor": "#df8926",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "/static/TabberIcon/icon1.png",
-        "selectedIconPath": "/static/TabberIcon/icon1check.png",
-        "text": "工作台"
-      },
-      {
-        "pagePath": "pages/taskList/taskList",
-        "iconPath": "/static/TabberIcon/icon2.png",
-        "selectedIconPath": "/static/TabberIcon/icon2check.png",
-        "text": "任务"
-      },
-      {
-        "pagePath": "pages/user/user",
-        "iconPath": "/static/TabberIcon/icon5.png",
-        "selectedIconPath": "/static/TabberIcon/icon5check.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "permission": {
-    "scope.userFuzzyLocation": {
-      "desc": "你的位置信息将用于小程序位置接口的效果展示"
-    },
-    "scope.userLocation": {
-      "desc": "你的位置信息将用于小程序位置接口的效果展示"
-    }
-  },
-  "requiredPrivateInfos": [
-    "getLocation"
-  ],
-  "usingComponents": {
-    "saomiao": "/compoment/saomiao",
-    "tips": "/compoment/tips/tips",
-    "tiplist": "/compoment/tiplist/tiplist",
-    "input-num": "/compoment/InputNum/InputNum",
-    "basic-container": "/compoment/BasicContainer/BasicContainer",
-    "pop-up": "/compoment/PopUp/PopUp",
-    "bluetooth-list": "/compoment/BluetoothList/BluetoothList",
-    "scroll-list": "/compoment/ScrollList/ScrollList",
-    "pull-down-box": "/compoment/PullDownBox/PullDownBox",
-    "my-tree": "/compoment/MyTree/MyTree",
-    "check-box": "/compoment/CheckBox/CheckBox",
-    "my-input": "/compoment/MyInput/MyInput",
-    "saomiao1": "/compoment/saomiao1",
-    "saomiao2": "/compoment/saomiao2",
-    "saomiao3": "/compoment/saomiao3",
-    "saomiao4": "/compoment/saomiao4"
-  }
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/app.wxss b/unpackage/dist/dev/mp-weixin/app.wxss
deleted file mode 100644
index 80b7642..0000000
--- a/unpackage/dist/dev/mp-weixin/app.wxss
+++ /dev/null
@@ -1,562 +0,0 @@
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-@font-face {
-  font-family: "fant-icon"; /* Project id 705786 */
-  src: url('https://at.alicdn.com/t/c/font_705786_b0sy9iwbr29.woff2?t=1684376358152') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_705786_b0sy9iwbr29.woff?t=1684376358152') format('woff'),
-       url('https://at.alicdn.com/t/c/font_705786_b0sy9iwbr29.ttf?t=1684376358152') format('truetype');
-}
-.fant-icon {
-  font-family: "fant-icon" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.ic_checkdisable_line:before {
-  content: "\e68d";
-}
-.img_default_image_load_failed:before {
-  content: "\e696";
-}
-.img_default_image_loading:before {
-  content: "\e695";
-}
-.ic_deletepic_fill:before {
-  content: "\e68f";
-}
-.ic_uploadpic_line:before {
-  content: "\e68e";
-}
-.ic_toastcheck_fill:before {
-  content: "\e664";
-}
-.ic_toasterror_fill:before {
-  content: "\e661";
-}
-.ic_toastwarn_fill:before {
-  content: "\e662";
-}
-.ic_tosatwarn_line:before {
-  content: "\e663";
-}
-.ic_tosatcheck_line:before {
-  content: "\e65f";
-}
-.ic_tosaterror_line:before {
-  content: "\e660";
-}
-.ic_arrowright_line:before {
-  content: "\e65d";
-}
-.ic_arrowleft_line:before {
-  content: "\e65e";
-}
-.ic_scan_line:before {
-  content: "\e658";
-}
-.ic_minus_fill:before {
-  content: "\e65b";
-}
-.ic_help_fill:before {
-  content: "\e65c";
-}
-.ic_add_fill:before {
-  content: "\e64b";
-}
-.ic_warn_fill:before {
-  content: "\e64e";
-}
-.ic_info_fill:before {
-  content: "\e657";
-}
-.ic_close_fill:before {
-  content: "\e659";
-}
-.ic_deletekeyboard_fill:before {
-  content: "\e65a";
-}
-.ic_tagup_fill:before {
-  content: "\e683";
-}
-.ic_arrowup_line:before {
-  content: "\e684";
-}
-.ic_close_line:before {
-  content: "\e685";
-}
-.ic_cate_line:before {
-  content: "\e688";
-}
-.ic_add_line:before {
-  content: "\e689";
-}
-.ic_eyeclose_line:before {
-  content: "\e68a";
-}
-.ic_check_fill:before {
-  content: "\e68b";
-}
-.ic_arrowdown_line:before {
-  content: "\e68c";
-}
-.ic_visible_line:before {
-  content: "\e670";
-}
-.ic_circlewarn_line:before {
-  content: "\e671";
-}
-.ic_phone_line:before {
-  content: "\e672";
-}
-.ic_safe_line:before {
-  content: "\e673";
-}
-.ic_invisible_line:before {
-  content: "\e674";
-}
-.ic_circleminus_line:before {
-  content: "\e675";
-}
-.ic_lock_line:before {
-  content: "\e676";
-}
-.ic_minus_line:before {
-  content: "\e677";
-}
-.ic_search_line:before {
-  content: "\e678";
-}
-.ic_info_line:before {
-  content: "\e679";
-}
-.ic_deletekeyboard_line:before {
-  content: "\e67a";
-}
-.ic_right_line:before {
-  content: "\e67b";
-}
-.ic_check_line:before {
-  content: "\e67c";
-}
-.ic_eyeopen_line:before {
-  content: "\e67d";
-}
-.ic_tagdown_fill:before {
-  content: "\e67e";
-}
-.ic_help_line:before {
-  content: "\e67f";
-}
-.ic_list_line:before {
-  content: "\e680";
-}
-.ic_circleclose_line:before {
-  content: "\e681";
-}
-.ic_checkuncheck_line:before {
-  content: "\e682";
-}
-.ic_voice_fill2:before {
-  content: "\e649";
-}
-.ic_voice_line2:before {
-  content: "\e64a";
-}
-.ic_address_line1:before {
-  content: "\e64c";
-}
-.ic_collection_line1:before {
-  content: "\e64d";
-}
-.ic_me_line1:before {
-  content: "\e64f";
-}
-.ic_right_fill1:before {
-  content: "\e650";
-}
-.ic_message_line1:before {
-  content: "\e651";
-}
-.ic_disable_line:before {
-  content: "\e652";
-}
-.ic_time_line2:before {
-  content: "\e653";
-}
-.ic_upload_line:before {
-  content: "\e654";
-}
-.ic_edit_line:before {
-  content: "\e655";
-}
-.ic_shutdown_line:before {
-  content: "\e656";
-}
-.ic_delete_line:before {
-  content: "\e641";
-}
-.ic_daifukuan_line:before {
-  content: "\e642";
-}
-.ic_copy_line:before {
-  content: "\e643";
-}
-.ic_more_fill1:before {
-  content: "\e644";
-}
-.ic_down_fill1:before {
-  content: "\e645";
-}
-.ic_switch_line:before {
-  content: "\e646";
-}
-.ic_refresh_line:before {
-  content: "\e647";
-}
-.ic_more_line1:before {
-  content: "\e648";
-}
-.ic_down_fill:before {
-  content: "\e62f";
-}
-.ic_setup_fill:before {
-  content: "\e630";
-}
-.ic_me_fill:before {
-  content: "\e631";
-}
-.ic_time_fill:before {
-  content: "\e632";
-}
-.ic_left_fill:before {
-  content: "\e633";
-}
-.ic_right_fill:before {
-  content: "\e634";
-}
-.ic_address_fill:before {
-  content: "\e635";
-}
-.ic_more_fill:before {
-  content: "\e636";
-}
-.ic_home_fill:before {
-  content: "\e637";
-}
-.ic_screen_fill:before {
-  content: "\e638";
-}
-.ic_voice_fill:before {
-  content: "\e639";
-}
-.ic_shoppingcart_fill:before {
-  content: "\e63a";
-}
-.ic_collection_fill:before {
-  content: "\e63b";
-}
-.ic_sort_fill:before {
-  content: "\e63c";
-}
-.ic_up_fill:before {
-  content: "\e63d";
-}
-.ic_more_line:before {
-  content: "\e623";
-}
-.ic_setup_line:before {
-  content: "\e625";
-}
-.ic_screen_line:before {
-  content: "\e628";
-}
-.ic_customerservice:before {
-  content: "\e629";
-}
-.ic_voice_line1:before {
-  content: "\e62b";
-}
-.ic_sort_line:before {
-  content: "\e62e";
-}
-.u-line-1 {
-  display: -webkit-box !important;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-break: break-all;
-  -webkit-line-clamp: 1;
-  -webkit-box-orient: vertical !important;
-}
-.u-line-2 {
-  display: -webkit-box !important;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-break: break-all;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical !important;
-}
-.u-line-3 {
-  display: -webkit-box !important;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-break: break-all;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical !important;
-}
-.u-line-4 {
-  display: -webkit-box !important;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-break: break-all;
-  -webkit-line-clamp: 4;
-  -webkit-box-orient: vertical !important;
-}
-.u-line-5 {
-  display: -webkit-box !important;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-break: break-all;
-  -webkit-line-clamp: 5;
-  -webkit-box-orient: vertical !important;
-}
-.u-border {
-  border-width: 0.5px !important;
-  border-color: #dadbde !important;
-  border-style: solid;
-}
-.u-border-top {
-  border-top-width: 0.5px !important;
-  border-color: #dadbde !important;
-  border-top-style: solid;
-}
-.u-border-left {
-  border-left-width: 0.5px !important;
-  border-color: #dadbde !important;
-  border-left-style: solid;
-}
-.u-border-right {
-  border-right-width: 0.5px !important;
-  border-color: #dadbde !important;
-  border-right-style: solid;
-}
-.u-border-bottom {
-  border-bottom-width: 0.5px !important;
-  border-color: #dadbde !important;
-  border-bottom-style: solid;
-}
-.u-border-top-bottom {
-  border-top-width: 0.5px !important;
-  border-bottom-width: 0.5px !important;
-  border-color: #dadbde !important;
-  border-top-style: solid;
-  border-bottom-style: solid;
-}
-.u-reset-button {
-  padding: 0;
-  background-color: transparent;
-  font-size: inherit;
-  line-height: inherit;
-  color: inherit;
-}
-.u-reset-button::after {
-  border: none;
-}
-.u-hover-class {
-  opacity: 0.7;
-}
-.u-primary-light {
-  color: #ecf5ff;
-}
-.u-warning-light {
-  color: #fdf6ec;
-}
-.u-success-light {
-  color: #f5fff0;
-}
-.u-error-light {
-  color: #fef0f0;
-}
-.u-info-light {
-  color: #f4f4f5;
-}
-.u-primary-light-bg {
-  background-color: #ecf5ff;
-}
-.u-warning-light-bg {
-  background-color: #fdf6ec;
-}
-.u-success-light-bg {
-  background-color: #f5fff0;
-}
-.u-error-light-bg {
-  background-color: #fef0f0;
-}
-.u-info-light-bg {
-  background-color: #f4f4f5;
-}
-.u-primary-dark {
-  color: #398ade;
-}
-.u-warning-dark {
-  color: #f1a532;
-}
-.u-success-dark {
-  color: #53c21d;
-}
-.u-error-dark {
-  color: #e45656;
-}
-.u-info-dark {
-  color: #767a82;
-}
-.u-primary-dark-bg {
-  background-color: #398ade;
-}
-.u-warning-dark-bg {
-  background-color: #f1a532;
-}
-.u-success-dark-bg {
-  background-color: #53c21d;
-}
-.u-error-dark-bg {
-  background-color: #e45656;
-}
-.u-info-dark-bg {
-  background-color: #767a82;
-}
-.u-primary-disabled {
-  color: #9acafc;
-}
-.u-warning-disabled {
-  color: #f9d39b;
-}
-.u-success-disabled {
-  color: #a9e08f;
-}
-.u-error-disabled {
-  color: #f7b2b2;
-}
-.u-info-disabled {
-  color: #c4c6c9;
-}
-.u-primary {
-  color: #3c9cff;
-}
-.u-warning {
-  color: #f9ae3d;
-}
-.u-success {
-  color: #5ac725;
-}
-.u-error {
-  color: #f56c6c;
-}
-.u-info {
-  color: #909399;
-}
-.u-primary-bg {
-  background-color: #3c9cff;
-}
-.u-warning-bg {
-  background-color: #f9ae3d;
-}
-.u-success-bg {
-  background-color: #5ac725;
-}
-.u-error-bg {
-  background-color: #f56c6c;
-}
-.u-info-bg {
-  background-color: #909399;
-}
-.u-main-color {
-  color: #303133;
-}
-.u-content-color {
-  color: #606266;
-}
-.u-tips-color {
-  color: #909193;
-}
-.u-light-color {
-  color: #c0c4cc;
-}
-.u-safe-area-inset-top {
-  padding-top: 0;
-  padding-top: constant(safe-area-inset-top);
-  padding-top: env(safe-area-inset-top);
-}
-.u-safe-area-inset-right {
-  padding-right: 0;
-  padding-right: constant(safe-area-inset-right);
-  padding-right: env(safe-area-inset-right);
-}
-.u-safe-area-inset-bottom {
-  padding-bottom: 0;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-}
-.u-safe-area-inset-left {
-  padding-left: 0;
-  padding-left: constant(safe-area-inset-left);
-  padding-left: env(safe-area-inset-left);
-}
-::-webkit-scrollbar {
-  display: none;
-  width: 0 !important;
-  height: 0 !important;
-  -webkit-appearance: none;
-  background: transparent;
-}
-input {
-  font-size: 28rpx;
-}
-/*每个页面公共css */
-page {
-  background-color: #F5F5F6;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-}
-.golink {
-  color: #0086F1 !important;
-  text-decoration: underline;
-}
-:root {
-  --subjectColor: #d3832a;
-  --errColor: #f8544B;
-  --primaryColor: #0086f1;
-  font-size: 1rem;
-}
-page {
-  --subjectColor: #d3832a;
-  --errColor: #f8544B;
-  --primaryColor: #0086f1;
-  font-size: 1rem;
-}
-.u-fade-enter-to {
-  z-index: 10000;
-}page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}[data-c-h="true"]{display: none !important;}
\ No newline at end of file