修复下架重复扫描问题

1 year ago · 942955e228
44 changed files with 1025 additions and 743 deletions
--- a/App.vue
+++ b/App.vue
@ -20,7 +20,7 @@

 				// #endif
 				console.log('onLaunch');
-				// watermark.set('/static/check.png')
+				// watermark.set('/static/water.png')
 			})

 			onShow(() => {
--- a/compoment/BasicContainer/BasicContainer.vue
+++ b/compoment/BasicContainer/BasicContainer.vue
@ -91,7 +91,7 @@
 			uni.hideLoading()
 			// 清空定时器
 			antiShake = null
-		}, 1000)
+		}, 500)
 	})


@ -104,8 +104,16 @@
 			uni.stopPullDownRefresh()
 			// 清除定时器
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
+
+	// 触发下拉刷新
+	function startPullDownRefresh() {
+		console.log('触发下拉')
+		uni.startPullDownRefresh()
+	}
+
+	defineExpose({ startPullDownRefresh })
 </script>

 <style>
--- a/compoment/tiplist/tiplist.vue
+++ b/compoment/tiplist/tiplist.vue
@ -98,7 +98,7 @@
 					<!-- 零担 -->
 					<template v-if="details.goodsType === '零担'">
 						<view class="inputbx">
-							<input v-model="details.upform.article.contractNumber" placeholder="请输入合同号" />
+							<input v-model="details.upform.article.contractNumber" placeholder="请输入订单号" />
 						</view>
 						<view class="inputbx">
 							<input v-model="details.upform.article.orderPackageCode" placeholder="请输入或扫描包条码" />
@ -124,7 +124,7 @@
 								</template>
 							</view>
 						</view>
-						<view class="inputbx" @click="handleshowMarket">
+						<view class="inputbx" @touchstart="handleshowMarket">
 							<input v-model="details.upform.stock.marketName" placeholder="请选择商城" disabled="true" />
 							<template v-if="details.showMarketList">
 								<view :class="{'select_content': true, 'show': details.showMarketList}">
@ -421,7 +421,7 @@
 			const { code } = res
 			if (code === 200) details.materialName = res.data
 			clearTimeout(_atn)
-		}, 1000)
+		}, 500)
 	}

 	function checkSec(val) {
@ -593,9 +593,13 @@

 			.select_content {
 				position: absolute;
+				// margin: 0 auto;
 				z-index: 99;
-				top: 110%;
+				top: 120%;
+				left: 50%;
+				transform: translateX(-50%);
 				background: #fff;
+				border: 1upx solid #eee;
 				width: 100%;
 				overflow: hidden;

@ -603,6 +607,10 @@
 					text-align: center;
 					padding: 20upx 0;
 					border-bottom: 1upx solid #000;
+
+					&:last-child {
+						border-bottom: 0;
+					}
 				}
 			}
 		}
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -172,7 +172,7 @@
 	async function init() {
 		let tabber = uni.getStorageSync('homerouter')
 		if (tabber) {
-			details.tablist = tabber
+			// details.tablist = tabber
 			return
 		}
 		let res = await appMenuroutes({})
@ -305,7 +305,7 @@
 		uni.setStorageSync('authbuts', qxan)
 	}
 	onShow(() => {
-		// updateApp()
+		updateApp()
 		init()

 		// print()
@ -324,7 +324,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	function print() {
@ -417,19 +417,19 @@
 	}

 	async function updateApp() {
-		// let version=await utils.getversion()
-		let version = {
-			version: '5.1.9',
-			pkName: 'com.hwy.pda.test'
-		}
-		console.log(version)
+		let version = await utils.getversion()
+		// let version = {
+		// 	version: '1.0.9',
+		// 	pkName: 'com.hwy.pda'
+		// }
 		let data = {
 			betenantCode: uni.getStorageSync('userinfo').tenant_id,
 			versionCode: version.version.split('.').join(''),
 			versionType: version.pkName.indexOf('test') != -1 ? '1' : version.pkName.indexOf('bate') != -1 ? '2' : '3',
 		}
-		console.log(data);
+		console.log('data', data);
 		let response = await AppPdaversiondetail(data)
+		console.log('response :>> ', response);
 		if (response.code == 200 && response.data) {
 			console.log(response.data);
 			console.log('有可更新包');
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -110,7 +110,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	function ckeckitem(item) {
--- a/pages/news/news.vue
+++ b/pages/news/news.vue
@ -24,7 +24,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	let iptis = ref<string>('http://192.168.10.12:1086/')
--- a/pages/reportForms/reportForms.vue
+++ b/pages/reportForms/reportForms.vue
@ -15,7 +15,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 </script>

--- a/pages/taskList/taskList.vue
+++ b/pages/taskList/taskList.vue
@ -71,7 +71,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	const { tablist } = toRefs(details)
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@ -101,7 +101,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	function ckeckitem(item) {
--- a/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
+++ b/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.vue
@ -294,7 +294,7 @@
 			uni.stopPullDownRefresh()
 			// 清除定时器
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	const loadingNub = computed(() => {
--- a/pagesHome/pages/CustomerSign/CustomerSign.vue
+++ b/pagesHome/pages/CustomerSign/CustomerSign.vue
@ -154,7 +154,7 @@
 			await initpage()
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	async function getconfig() {
--- a/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue
+++ b/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue
@ -125,7 +125,7 @@
 			initpage()
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	const ordernumber = computed(() => {
 		let num = 0
--- a/pagesHome/pages/DownGoods/DownGoods.vue
+++ b/pagesHome/pages/DownGoods/DownGoods.vue
@ -261,7 +261,7 @@
 			</view>
 		</view>
 	</view>
-
+	<button @click="moni">模拟</button>
 	<saomiao2></saomiao2>
 	<tips ref="tip"></tips>
 	<tiplist ref="tiplists"></tiplist>
@ -307,7 +307,8 @@
 		typelist: [],
 		Marketlist: [],
 		checkmarkindex: 0,
-		allocaTitle: ''
+		allocaTitle: '',
+		scandataList: []
 	})
 	onLoad((op) => {
 		// details.upshelfScanType = op.type
@ -354,7 +355,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	function backun() {
@ -389,6 +390,30 @@
 	}
 	async function scandata() {
 		// let res=await 
+		const _scancode = details.scancode
+
+		// 是否请求
+		let _flag = true
+
+		// 根据扫码的值去重
+		if (details.scandataList.includes(_scancode)) _flag = false
+
+		// 根据包条码去重
+		if (Number(details.pageType) === 3 && details.datalist.find(val => val.associationValue === _scancode)) _flag = false
+
+		if (!_flag) {
+			// #ifdef APP
+			utils.ttsspke('重复扫码')
+			// #endif
+
+			return uni.showToast({
+				title: '重复扫码',
+				icon: 'none'
+			})
+		}
+		console.log('111 :>> ', 111);
+		details.scandataList.push(_scancode)
+		try {
 			let res = null
 			let data = null;
 			switch (Number(details.pageType)) {
@ -428,6 +453,7 @@
 						orderPackageCode: details.scancode
 					}
 					res = await warehouseUpdownTypedownScanPackage(data)
+					console.log('res', res)
 					if (res.code == 200) {
 						details.datalist = details.datalist.concat([res.data])
 						details.checkdatalist = details.checkdatalist.concat([res.data])
@ -459,7 +485,18 @@
 					}
 					break;
 			}
+		} catch (err) {
+			console.log('err :>> ', err);
+			//TODO handle the exception
+		} finally {
+			// 请求完成, 清除阻止项
+			details.scandataList.splice(details.scandataList.indexOf(_scancode), 1)
+		}
+	}

+	function moni() {
+		details.scancode = '22022803211-80'
+		scandata()
 	}

 	async function downs() {
--- a/pagesHome/pages/LoadingScan/LoadingScan.vue
+++ b/pagesHome/pages/LoadingScan/LoadingScan.vue
@ -160,7 +160,7 @@
 			await initpage()
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	function setstates(state : number) {
 		if (details.checkstate == state) {
--- a/pagesHome/pages/MergeTray/MergeTray.vue
+++ b/pagesHome/pages/MergeTray/MergeTray.vue
@ -204,7 +204,7 @@
 			// 关闭下拉动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	function setstate(state : number) {
 		details.scantype = state
--- a/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
+++ b/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue
@ -54,6 +54,9 @@
 				<view>{{details.Remarktext}}</view>
 				<view>备注</view>
 			</view>
+			<view>
+				<view class="printBtn" @click="print">打印</view>
+			</view>
 		</view>
 	</view>

@ -331,7 +334,6 @@
 			</template>
 		</view>
 	</template>
-	<!-- <button @click="moni">模拟</button> -->
 	<saomiao2></saomiao2>
 	<tips ref="tip"></tips>
 	<tiplist ref="tiplists"></tiplist>
@ -423,7 +425,7 @@

 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	async function godetaillist(item) {
 		uni.navigateTo({
@ -863,15 +865,97 @@


 	}
-	function moni() {
-		details.scancode = '22071803223-2'
-		scandata()
+
+	/**
+	 * 打印
+	 */
+	const print = () => {
+		let list = [], checklist = []
+		// details.dataList.map((item, index) => {
+		// 	list.push(item.packageBarCode)
+		// 	checklist.push(index)
+		// })
+		tiplists.value.setdetails({
+			title: '是否打印',
+			isshow: true,
+			tipstate: 2,
+			list,
+			checklist,
+			inputtext: '',
+			confirmTxt: '确认打印',
+			isonecheck: true,
+			success: (deta) => {
+				// #ifdef APP
+
+				let text = `
+					^XA
+					^CF0,40
+					^FO50,50^FD打印时间:2023/10/10/2319:22:23^FS
+					^FO50,100^FD汇通龙泉03850^FS
+					^FO50,150^FD按商场: 江油欧派衣橱^FS
+					^FO50,200^FD车次号: QYZX231021008^FS
+					^FO50,250^FD分拣人: 陈勇^FS
+					^FO50,300^FD分拣完成时间: 2023/10/2318:45:00^FS
+					
+					^FO50,350^FD备注:^FS
+					
+					^FO50,400^GB500,5,5^FS
+					^FO50,400^GB5,400,5^FS
+					^FO50,450^FD订单自编号^FS
+					^FO200,450^FD总件数^FS
+					^FO350,450^FD在托件数^FS
+					^FO200,400^GB5,450,5^FS
+					^FO350,400^GB5,450,5^FS
+					
+					^FO50,500^FDONLYA江油市230900003MA1-1^FS
+					^FO200,500^FD13^FS
+					^FO350,500^FD11^FS
+					
+					^FO50,550^FDOPLYA江油市231000003YA8-1^FS
+					^FO200,550^FD24^FS
+					^FO350,550^FD2^FS		
+					^XZ
+				`
+
+				let text1 = `
+					^XA
+					^CF0,40
+					^FO0,50^FD打印时间:2023/10/10/2319:22:23^FS
+					^FO0,100^FD汇通龙泉03850^FS
+					^FO0,150^FD按商场: 江油欧派衣橱^FS
+					^FO0,200^FD车次号: QYZX231021008^FS
+					^FO0,250^FD分拣人: 陈勇^FS
+					^FO0,300^FD分拣完成时间: 2023/10/2318:45:00^FS
+						
+					^XZ
+				`
+				let sylist = utils.initbl()
+				console.log(sylist);
+				sylist.map(item => {
+					console.log(item);
+					if (item.uuids) {
+						utils.getbl(item, text1)
+					}
+				})
+
+				// #endif
+				tiplists.value.setdetails({ isshow: false })
+			},
+			cancel: (details) => {
+				tiplists.value.setdetails({ isshow: false })
+			},
+			close: (details) => {
+				tiplists.value.setdetails({ isshow: false })
+			}
+		})
 	}

 	const { datelist, detauser, showstate, waybillCode, checkinarr, Remarktext, codelist } = toRefs(details)
 </script>

 <style lang="scss">
+	$subjectColor: #d3832a;
+
 	.mabxtop {
 		position: relative;
 		width: 684upx;
@ -926,6 +1010,15 @@
 				}
 			}
 		}
+
+		.printBtn {
+			background: $subjectColor;
+			color: #fff !important;
+			width: 100upx;
+			padding: 10upx;
+			text-align: center;
+			border-radius: 5upx;
+		}
 	}

 	.bgimg {
@ -1046,7 +1139,7 @@
 					box-sizing: border-box;

 					.zhon {
-						color: #D3832A;
+						color: $subjectColor;
 					}

 					.yish {
@ -1133,6 +1226,8 @@
 </style>

 <style lang="scss" scoped>
+	$subjectColor: #d3832a;
+
 	// tabBar
 	.tabBar {
 		margin-top: 10upx;
@ -1152,7 +1247,7 @@
 				display: block;
 				position: absolute;
 				height: 4upx;
-				background: #d3832a;
+				background: $subjectColor;
 				width: 0;
 				left: 50%;
 				bottom: 0;
@ -1167,19 +1262,23 @@
 	}

 	.buts {
+		position: fixed;
+		bottom: 20upx;
+		left: 50%;
+		transform: translateX(-50%);
 		width: 320upx;
 		height: 88upx;
-		background: #D3832A;
 		border-radius: 8upx 8upx 8upx 8upx;
 		opacity: 1;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		font-size: 32upx;
-		font-weight: 400;
-		color: #FFFFFF;
+		font-weight: bold;
+		color: $subjectColor;
 		margin: auto;
 		margin-top: 20upx;
+		border: 1upx solid $subjectColor;
 	}

 	// 零担弹窗
--- a/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue
+++ b/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.vue
@ -204,7 +204,7 @@
 			// 停止刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	async function initpage() {
 		let data = {
--- a/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
+++ b/pagesHome/pages/PeopleScanUp/PeopleScanUp.vue
@ -409,7 +409,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	function stop() {
--- a/pagesHome/pages/PickingScanList/PickingScanList.vue
+++ b/pagesHome/pages/PickingScanList/PickingScanList.vue
@ -157,7 +157,7 @@
 			// 关闭下拉刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	// 初始化请求页面数据
--- a/pagesHome/pages/Relocation/Relocation.vue
+++ b/pagesHome/pages/Relocation/Relocation.vue
@ -314,7 +314,7 @@
 			// 关闭下拉动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	function goorderdetail(item) {
 		uni.navigateTo({
--- a/pagesHome/pages/RemoveTray/RemoveTray.vue
+++ b/pagesHome/pages/RemoveTray/RemoveTray.vue
@ -186,7 +186,7 @@
 			// 关闭下拉动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	async function scandata() {
 		let submitData = {
--- a/pagesHome/pages/ScanUp/ScanUp.vue
+++ b/pagesHome/pages/ScanUp/ScanUp.vue
@ -32,7 +32,7 @@
 		<view class="numbox">
 			<view>
 				<view>
-					<view>库位总数</view>
+					<view>库位订单总数</view>
 					<view>{{reqobj.totalNum||0}}</view>
 				</view>
 				<view>
@ -140,7 +140,8 @@
 						</view>

 						<view class="tpbx">
-							<template v-if="Number(details.upshelfScanType) === 1 || Number(details.upshelfScanType) === 2">
+							<template
+								v-if="Number(details.upshelfScanType) === 1 || Number(details.upshelfScanType) === 2 ||details.checkstate === 2">
 								<image src="/pagesHome/static/kuweiicon.png"></image>
 								<view style="flex: 1; display: inline-flex; justify-content: space-between;">
 									<view>总数：{{item.totalNum}}</view>
@ -248,7 +249,7 @@
 		const timer = setTimeout(() => {
 			// 重置数据
 			details.allocationId = ''
-			details.reqobj = []
+			details.reqobj = {}
 			details.renderList = []
 			details.datalist = []
 			details.uplistarr = []
@ -256,7 +257,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	async function scandata() {
--- a/pagesHome/pages/ScanUpType/ScanUpType.vue
+++ b/pagesHome/pages/ScanUpType/ScanUpType.vue
@ -35,7 +35,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	function gotourl(item : any) {
 		let url = '/pagesHome/pages/ScanUp/ScanUp?type=' + item.type + '&pageName=' + item.name
--- a/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
+++ b/pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue
@ -183,7 +183,7 @@
 			const timer = setTimeout(() => {
 				utils.ttsspke(details.signedNum + '件')
 				clearTimeout(timer)
-			}, 1000)
+			}, 500)
 		}
 	})
 	onHide(() => {
--- a/pagesHome/pages/SetPrice/SetPrice.vue
+++ b/pagesHome/pages/SetPrice/SetPrice.vue
@ -119,7 +119,7 @@
 			init()
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	const tiplists = ref(null)
--- a/pagesHome/pages/StockUplist/StockUplist.vue
+++ b/pagesHome/pages/StockUplist/StockUplist.vue
@ -137,7 +137,8 @@
 		onLoad,
 		onShow,
 		onHide,
-		onUnload
+		onUnload,
+		onPullDownRefresh
 	} from '@dcloudio/uni-app'
 	import {
 		detailType,
@ -196,6 +197,13 @@
 		uni.$off('scancodedate')
 		details.isscan = false
 	})
+	onPullDownRefresh(() => {
+		const timer = setTimeout(async () => {
+			await initpage()
+			uni.stopPullDownRefresh()
+			clearTimeout(timer)
+		}, 500)
+	})
 	function goorderdetail(item) {
 		uni.navigateTo({
 			url: '/pagesHome/pages/orderDetails/orderDetails?orderCode=' + item.orderCode
@ -228,6 +236,7 @@
 		details.stockList = response.data?.stockList
 		if (details.orderStatus === 3) details.zeroOrderList = response.data?.orderList
 		details.isscan = false
+		return null
 	}
 	// 库存品详情页
 	function godetails(item : any) {
--- a/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
+++ b/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue
@ -180,7 +180,7 @@
 			// 停止刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	function prinbut() {
--- a/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue
+++ b/pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue
@ -163,7 +163,7 @@
 					return option.isEnd = true
 				}
 				clearTimeout(antiShake)
-			}, 1000)
+			}, 500)
 		} catch (err) {
 			//TODO handle the exception
 			console.log('err :>> ', err);
--- a/pagesHome/pages/orderInquiry/orderInquiry.vue
+++ b/pagesHome/pages/orderInquiry/orderInquiry.vue
@ -241,7 +241,7 @@

 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	function scandata() { }
--- a/pagesHome/pages/pickingScan/pickingScan.vue
+++ b/pagesHome/pages/pickingScan/pickingScan.vue
@ -149,7 +149,7 @@
 		const timer = setTimeout(() => {
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	function init() {
 		details.currentPage = 1
--- a/pagesHome/pages/scansorting/scansorting.vue
+++ b/pagesHome/pages/scansorting/scansorting.vue
@ -173,7 +173,7 @@
 					return option.isEnd = true
 				}
 				clearTimeout(antiShake)
-			}, 1000)
+			}, 500)
 		} catch (err) {
 			//TODO handle the exception
 			console.log('err :>> ', err);
--- a/pagesHome/pages/signOrderScan/signOrderScan.vue
+++ b/pagesHome/pages/signOrderScan/signOrderScan.vue
@ -279,7 +279,7 @@
 			// 关闭下拉动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})
 	async function scandata() {
 		let data = {
--- a/pagesHome/pages/signinScan/signinScan.vue
+++ b/pagesHome/pages/signinScan/signinScan.vue
@ -130,7 +130,7 @@
 	onPullDownRefresh(() => {
 		setTimeout(() => {
 			uni.stopPullDownRefresh()
-		}, 1000)
+		}, 500)
 	})
 	const date = ref<number | string[]>([])
 	function showCalendar() {
--- a/pagesTask/pages/checkTaskList/checkTaskList.vue
+++ b/pagesTask/pages/checkTaskList/checkTaskList.vue
@ -287,7 +287,7 @@
 			const res = await initPage()
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	// 请求页面数据
@ -436,7 +436,7 @@
 			console.log('res >>>>>>>>', res);
 			if (res.code !== 403) {
 				uni.navigateTo({
-					url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.searchText.taryText}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}`
+					url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}`
 				})
 			}
 		})
@ -444,6 +444,7 @@

 	// 按库位盘点点击跳转到详情
 	const goStorageDetails = (val) => {
+		console.log('val :>> ', val);
 		getWarehouseTaskAllocationDetailByStrip({
 			questId: details.id,
 			allocationId: val.allocationId
--- a/pagesTask/pages/dynamicCheck/dynamicCheck.vue
+++ b/pagesTask/pages/dynamicCheck/dynamicCheck.vue
@ -147,7 +147,7 @@
 			// 关闭刷新动画
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 		// }
 	})

--- a/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
+++ b/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails.vue
@ -1,5 +1,5 @@
 <template>
-	<BasicContainer :option="option">
+	<BasicContainer ref="basicContainer" :option="option">
 		<template #head>
 			<!-- 主体内容 -->
 			<view class="main">
@ -37,20 +37,25 @@
 				<!-- tabBar选项卡 -->
 				<view class="tabBar">
 					<view :class="{'tabBar-item': true, 'active': tabBarCode === 1}" @click="handleTabBarCode(1)">
-						定制品 <text v-if='tabBarCode==1'>（{{article.total}}）</text>
+						定制品（{{article.total}}）
 					</view>
 					<view :class="{'tabBar-item': true, 'active': tabBarCode === 2}" @click="handleTabBarCode(2)">
-						零担<text v-if='tabBarCode==2'> （{{zero.total}}）</text>
+						零担（{{zero.total}}）
 					</view>
 					<view :class="{'tabBar-item': true, 'active': tabBarCode === 3}" @click="handleTabBarCode(3)">
-						库存品<text v-if='tabBarCode==3'> （{{stock.total}}）</text>
+						库存品（{{stock.total}}）
 					</view>
 				</view>

 				<!-- 控件 -->
 				<view class="control">
 					<view class="button" @click="showControl = true" v-show="!showControl">批量操作</view>
+					<template v-if="tabBarCode === 2">
+						<view class="button" @click="grounding" v-show="!showControl">添加订单</view>
+					</template>
+					<template v-else-if="tabBarCode === 3">
 						<view class="button" @click="grounding" v-show="!showControl">添加物料</view>
+					</template>
 					<template v-if="showControl">
 						<view class="button" @click="handleInvertSelection">反选</view>

@ -234,7 +239,7 @@
 		onLoad,
 		onHide,
 	} from '@dcloudio/uni-app'
-	import { ref, reactive, toRefs, watch } from "vue";
+	import { ref, reactive, toRefs, watch, onMounted } from "vue";

 	import utils from '@/utils/utils.js';

@ -255,15 +260,25 @@
 		haveData: true,
 		async pullDownRefreshInitPage() {
 			console.log('下拉刷新')
-			// 页面信息清空
+			// 控件关闭
+			details.showControl = false
+			// 渲染列表清空
+			details.renderList = []
+			// 定制品页面信息清空
 			article.articleList = []
+			// 零担页面信息清空
+			zero.zeroCheckList = []
+			// 库存品页面信息清空
+			stock.stockCheckList = []
 			return await initPage()
 		},
 		async reachBottomInitPage() {
 			console.log('触底加载')

 			return true
-		}
+		},
+		// 开启刷新
+		startPullDownRefresh: () => { },
 	})

 	const details = reactive({
@ -378,13 +393,14 @@

 	const tiplists = ref(null)

+	const basicContainer = ref(null)
+
 	// 页面初始化执行回调
 	onLoad((info) => {
 		details.allocationId = info.allocationId
 		details.questId = info.questId
 		console.log('info :>> ', info.marketName);
 		details.marketName = JSON.parse(info.marketName)
-
 	})

 	// 开启监听扫描
@ -575,7 +591,8 @@
 			const { code, msg } = res
 			console.log('res :>> ', res);
 			if (code === 200) {
-				initPage()
+				basicContainer.value.startPullDownRefresh()
+				// initPage()
 				utils.ttsspke(msg)
 			}
 		} else {
@ -587,6 +604,7 @@
 	function handleTabBarCode(code : number) {
 		showControl.value = false
 		tabBarCode.value = code
+		initPage()
 	}

 	/**
@ -925,15 +943,6 @@
 	function stockAdd(deta) {
 		console.log('deta :>> ', deta);
 		const { upform: { stock: { orderCode, stockNum, marketName, incomingBatch } } } = deta
-		// if (!contractNumber) return uni.showToast({
-		// 	title: '请输入合同号',
-		// 	icon: 'none'
-		// })
-
-		// if (!orderPackageCode) return uni.showToast({
-		// 	title: '请输入或扫描包条码',
-		// 	icon: 'none'
-		// })
 		console.log('data :>> ', deta);
 		const submitData = {
 			questDetail: {
--- a/pagesTask/pages/trayCheckDetails/trayCheckDetails.vue
+++ b/pagesTask/pages/trayCheckDetails/trayCheckDetails.vue
@ -1,5 +1,5 @@
 <template>
-	<BasicContainer :option="option">
+	<BasicContainer ref="basicContainer" :option="option">
 		<template #head>
 			<!-- 主体内容 -->
 			<view class="main">
@ -297,6 +297,8 @@

 	const tiplists = ref(null)

+	const basicContainer = ref(null)
+
 	// 页面初始化执行回调
 	onLoad((data) => {
 		details.pageInfo = JSON.parse(data.info)
@ -319,7 +321,7 @@
 			}
 		})
 		if (details.holdBackFirstPost) return
-		initPage()
+		basicContainer.value.startPullDownRefresh()
 	})

 	// 关闭扫描监听
@ -453,6 +455,7 @@
 		const res = await postqueryupdateQuestDetailAllocation({ allocationId: details.scancode, questId: details.pageInfo.taskId, questDetailList })
 		if (res.code === 200) {
 			details.showUpData = false
+
 		}
 		utils.ttsspke(res.msg)
 	}
@ -498,7 +501,7 @@
 				console.log('111 :>> ', 111);
 				try {
 					getWarehouseDeleteQuestDetail({ questDetailList, questId: details.pageInfo.taskId }).then(res => {
-						initPage()
+						basicContainer.value.startPullDownRefresh()
 					})
 				} catch (e) {
 					//TODO handle the exception
@ -515,11 +518,6 @@
 		})
 	}

-	/**
-	 * 批量上架
-	 */
-	function handleBatchUp() { }
-
 	/**
 	 * 批量修改状态
 	 */
@ -562,7 +560,7 @@
 				// console.log('res :>> ', res);
 				try {
 					getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId }).then(res => {
-						initPage()
+						basicContainer.value.startPullDownRefresh()
 					})
 				} catch (e) {
 					//TODO handle the exception
@ -659,7 +657,7 @@
 					}]
 					const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: details.pageInfo.taskId })
 					const { code } = res
-					if (code === 200) initPage()
+					if (code === 200) basicContainer.value.startPullDownRefresh()
 					tiplists.value.setdetails({ isshow: false })
 				},
 				cancel: () => {
@ -715,7 +713,7 @@
 				console.log('res :>> ', res);
 				const { code } = res
 				if (code === 200) {
-					initPage()
+					basicContainer.value.startPullDownRefresh()
 					uni.showToast({
 						title: '操作成功',
 						icon: 'success'
@ -767,15 +765,6 @@
 	function stockAdd(deta) {
 		console.log('deta :>> ', deta);
 		const { upform: { stock: { orderCode, stockNum, marketName, incomingBatch } } } = deta
-		// if (!contractNumber) return uni.showToast({
-		// 	title: '请输入合同号',
-		// 	icon: 'none'
-		// })
-
-		// if (!orderPackageCode) return uni.showToast({
-		// 	title: '请输入或扫描包条码',
-		// 	icon: 'none'
-		// })
 		console.log('data :>> ', deta);
 		const submitData = {
 			questDetail: {
--- a/pagesUser/pages/systemSettings/systemSettings.vue
+++ b/pagesUser/pages/systemSettings/systemSettings.vue
@ -32,7 +32,7 @@
 			// 关闭下拉刷新
 			uni.stopPullDownRefresh()
 			clearTimeout(timer)
-		}, 1000)
+		}, 500)
 	})

 	const details = reactive({
--- a/static/water.png
+++ b/static/water.png
--- a/uni_modules/fant-mini-plus/components/hd-count-down/hd-count-down.vue
+++ b/uni_modules/fant-mini-plus/components/hd-count-down/hd-count-down.vue
@ -1,51 +1,38 @@
 <template>
 	<view class="hd-count-down">
-    <view
-      v-if="showDay"
-      class="hd-count-down-number"
-      :style="{
+		<view v-if="showDay" class="hd-count-down-number" :style="{
        borderColor: borderColor,
        color: color,
        background: backgroundColor
-      }"
-    >
+      }">
 			{{ d }}
 		</view>
 		<view v-if="showDay" class="hd-count-down-splitor" :style="{ color: splitorColor }">天</view>
-    <view
-      class="hd-count-down-number"
-      :style="{
+		<view class="hd-count-down-number" :style="{
        borderColor: borderColor,
        color: color,
        background: backgroundColor
-      }"
-    >
+      }">
 			{{ h }}
 		</view>
 		<view class="hd-count-down-splitor" :style="{ color: splitorColor }">
 			{{ showColon ? ':' : '时' }}
 		</view>
-    <view
-      class="hd-count-down-number"
-      :style="{
+		<view class="hd-count-down-number" :style="{
        borderColor: borderColor,
        color: color,
        background: backgroundColor
-      }"
-    >
+      }">
 			{{ m }}
 		</view>
 		<view class="hd-count-down-splitor" :style="{ color: splitorColor }">
 			{{ showColon ? ':' : '分' }}
 		</view>
-    <view
-      class="hd-count-down-number"
-      :style="{
+		<view class="hd-count-down-number" :style="{
        borderColor: borderColor,
        color: color,
        background: backgroundColor
-      }"
-    >
+      }">
 			{{ s }}
 		</view>
 		<view v-if="!showColon" class="hd-count-down-splitor" :style="{ color: splitorColor }">秒</view>
@ -176,6 +163,7 @@ function countDown() {
 		flex-wrap: nowrap;
 		justify-content: center;
 		align-items: center;
+
 		&-splitor {
 			justify-content: center;
 			line-height: 20px;
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
--- a/unpackage/dist/dev/app-plus/app.css
+++ b/unpackage/dist/dev/app-plus/app.css
@ -820,8 +820,11 @@ body {
 .modtips .inputbx .select_content[data-v-a3a2f036] {
  position: absolute;
  z-index: 99;
-  top: 110%;
+  top: 120%;
+  left: 50%;
+  transform: translateX(-50%);
  background: #fff;
+  border: 0.03125rem solid #eee;
  width: 100%;
  overflow: hidden;
 }
@ -830,6 +833,9 @@ body {
  padding: 0.625rem 0;
  border-bottom: 0.03125rem solid #000;
 }
+.modtips .inputbx .select_content uni-view[data-v-a3a2f036]:last-child {
+  border-bottom: 0;
+}
 .modtips .listcheck[data-v-a3a2f036] {
  display: flex;
  flex-direction: column;
--- a/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
+++ b/unpackage/dist/dev/app-plus/pagesHome/pages/OrderSortingDetail/OrderSortingDetail.css
@ -272,6 +272,14 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
  font-weight: 400;
  color: #90A0AF;
 }
+.mabxtop .printBtn {
+  background: #d3832a;
+  color: #fff !important;
+  width: 3.125rem;
+  padding: 0.3125rem;
+  text-align: center;
+  border-radius: 0.15625rem;
+}
 .bgimg {
  position: fixed;
  left: 0;
@ -376,7 +384,7 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
  box-sizing: border-box;
 }
 .scvmabx .maxboxs > .items .numbxvie .zhon {
-  color: #D3832A;
+  color: #d3832a;
 }
 .scvmabx .maxboxs > .items .numbxvie .yish {
  color: #1197EB;
@ -496,19 +504,23 @@ uni-view[data-v-f631659b], uni-scroll-view[data-v-f631659b], uni-swiper-item[dat
  width: 100%;
 }
 .buts[data-v-ca2cce65] {
+  position: fixed;
+  bottom: 0.625rem;
+  left: 50%;
+  transform: translateX(-50%);
  width: 10rem;
  height: 2.75rem;
-  background: #D3832A;
  border-radius: 0.25rem 0.25rem 0.25rem 0.25rem;
  opacity: 1;
  display: flex;
  align-items: center;
  justify-content: center;
  font-size: 1rem;
-  font-weight: 400;
-  color: #FFFFFF;
+  font-weight: bold;
+  color: #d3832a;
  margin: auto;
  margin-top: 0.625rem;
+  border: 0.03125rem solid #d3832a;
 }
 .tanchuangbg[data-v-ca2cce65] {
  width: 100%;
--- a/utils/watermark.js
+++ b/utils/watermark.js
@ -9,16 +9,15 @@ watermark.set = (path) => {
 	let div = document.createElement('div');
 	div.id = id;
 	div.style.pointerEvents = 'none';
-	div.style.top = '44px';
-	div.style.left = '0px';
-	div.style.bottom = '50px';
-	div.style.right = '0px';
+	div.style.top = '50%';
+	div.style.left = '50%';
+	div.style.fontSize = '50px';
 	div.style.position = 'fixed';
 	div.style.zIndex = '100000';
 	div.style.zoom = '0.6'; //设置缩放  
 	div.style.opacity = '0.5'; //设置透明度  
 	div.style.background = 'url(' + path + ') left top repeat';
-	div.innerText = '测试'
+	div.innerText = '货物优测试'
 	document.body.appendChild(div);
 	return id;
 	// #endif