版本迭代

App.vue

@@ -60,7 +60,9 @@
 <style lang="scss">
 	@import '@/uni_modules/fant-mini-plus/libs/iconfont/iconfont.css';
 	@import "@/uni_modules/uview-plus/index.scss";
-
+	input{
+		font-size: 28upx;
+	}
 	/*每个页面公共css */
 	// page{
 	// 	// background-image: url('/static/bg.png');

api/user.js

@@ -889,4 +889,124 @@ export function warehouseUpdownTypemoveAllocationScanTrayCode(data) {
 		method: "post",
 		data
 	});
+}
+/**
+ * 滞留包件列表
+ * @param {Object} data
+ */
+export function warehouseRetentionretentionPackageList(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseRetention/retentionPackageList`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 滞留扫描包件码
+ * @param {Object} data
+ */
+export function warehouseRetentionretentionScanPackage(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseRetention/retentionScanPackage`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 下架扫描包件
+ * @param {Object} data
+ */
+export function warehouseUpdownTypedownScanPackage(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseUpdownType/downScanPackage`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 扫描来源托盘
+ * @param {Object} data
+ */
+export function warehouseTrayTypescanSourceTrayCode(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseTrayType/scanSourceTrayCode`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 扫描目标托盘
+ * @param {Object} data
+ */
+export function warehouseTrayTypescanTargetTrayCode(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseTrayType/scanTargetTrayCode`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 确认合托
+ * @param {Object} data
+ */
+export function warehouseTrayTypemergeTray(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseTrayType/mergeTray`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 下架包件
+ * @param {Object} data
+ */
+export function warehouseUpdownTypedownPackage(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseUpdownType/downPackage`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 下架托盘
+ * @param {Object} data
+ */
+export function warehouseUpdownTypedownTrayCode(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseUpdownType/downTrayCode`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 下架库存品
+ * @param {Object} data
+ */
+export function warehouseUpdownTypedownStock(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseUpdownType/downStock`,
+		method: "post",
+		data
+	});
+}
+/**
+ * 下架零担
+ * @param {Object} data
+ */
+export function warehouseUpdownTypedownZeroOrder(data) {
+
+	return request({
+		url: `logpm-warehouse/api/warehouseUpdownType/downZeroOrder`,
+		method: "post",
+		data
+	});
 }

config/host.js

@@ -7,11 +7,11 @@
 // lmy
 // const devhost='http://192.168.10.123:8889/'
 // hy
-// const devhost='http://192.168.10.48:8888/'
+const devhost='http://192.168.10.48:8888/'
 // tjj
 // const devhost='http://192.168.10.29:13000/'
 // cyz
-const devhost='http://192.168.10.75:8777/'
+// const devhost='http://192.168.10.75:8777/'
 // cg
 // const devhost='http://192.168.10.200:8888/'
 /**

interfaces/pagesHome/StockUplist.ts

@@ -36,4 +36,5 @@ export interface detailType{
 		 * */
 		scanNum:string;
 	}
+	stockupId:string
 }

interfaces/pagesHome/StockUplistScandetails.ts

@@ -13,7 +13,7 @@ export interface detailType{
 		goodsType?:string|number;
 		/** 是否备货
 		 * */
-		 scanId?:string|number;
+		 isScan?:string|number;
 		 /** 备货
 		  * */
 		StockUp?:string|number;
@@ -60,4 +60,5 @@ export interface detailType{
 	/** 扫描结果
 	 * */
 	scancode:string;
+	stockupId:string
 }

pages.json

@@ -376,6 +376,30 @@
 					"navigationStyle": "custom"
 				}
 
+			}, {
+				"path": "pages/MergeTrayDetails/MergeTrayDetails",
+				"style": {
+					"navigationBarTitleText": "合并托盘",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
+			}, {
+				"path": "pages/DownGoodsType/DownGoodsType",
+				"style": {
+					"navigationBarTitleText": "下架扫描",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
+			}, {
+				"path": "pages/DownGoods/DownGoods",
+				"style": {
+					"navigationBarTitleText": "下架扫描",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
+				}
+
 			}
 		]
 	}],

pages/index/index.vue

@@ -79,6 +79,11 @@
 						name: '合托',
 						router: '/pagesHome/pages/MergeTray/MergeTray',
 					},
+					{
+						icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+						name: '下架',
+						router: '/pagesHome/pages/DownGoodsType/DownGoodsType',
+					},
 				]
 			},
 			{

pagesHome/pages/CustomerSign/CustomerSign.vue

@@ -99,6 +99,9 @@
 		details.id=JSON.parse(op.item).id
 		initpage()
 	})
+	onShow(()=>{
+		initpage()
+	})
 	const deliveryNumber=computed(()=>{
 		let num=0
 		details.datalist.map(item=>{

pagesHome/pages/DownGoods/DownGoods.vue

@@ -0,0 +1,545 @@
+<template>
+	<u-navbar title="下架扫描" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
+		:autoBack="true" leftIconSize='35'></u-navbar>
+	<image mode="widthFix" class="bgimg" src="/pagesHome/static/bgby.png"></image>
+<!-- 	<view class="scanqcview">
+		<image src="/pagesHome/static/scanqc.png"></image>
+		<view>请直接扫描库位码</view>
+	</view> -->
+	<view class="viewbx" v-if="pageType=='1'">
+		<view class="vwtybx1">
+			<view>
+				<view>
+					<image src="/pagesHome/static/tuoicon.png"></image>
+					<view>托盘码</view>
+				</view>
+				<view>
+					<input placeholder="扫码或输入托盘码" v-model="trayCode"/>
+				</view>
+			</view>
+<!-- 			<view>
+				<view>
+					<image src="/pagesHome/static/topicons.png"></image>
+					<view>托盘编号</view>
+				</view>
+				<view>
+					汇通龙泉001
+				</view>
+			</view> -->
+			<view>
+				<view>
+					<image src="/pagesHome/static/kuicon.png"></image>
+					<view>库位码</view>
+				</view>
+				<view>
+					汇通龙泉001
+				</view>
+			</view>
+		</view>
+	<!-- 	<view class="numvie">
+			<view>数量</view>
+			<view>20</view>
+		</view> -->
+	</view>
+	<view class="tbchec">
+		<view :class="!isallcheck?'':'xz'" @click="allquanxuan">
+			<image :src="!isallcheck?'/pagesHome/static/downnocheck.png':'/pagesHome/static/downcheck.png'"></image>
+			<view>全选</view>
+		</view>
+		<!-- <view>
+			<image src="/pagesHome/static/downnocheck.png"></image>
+			<view>全选</view>
+		</view> -->
+	</view>
+	<scroll-view scroll-y="true" class="scvorder" :style="{'--height':pageType=='1'?'50vh':'65vh'}">
+		<view class="itembox" v-for="(item,index) in datalist">
+			<view class="topon1" @click="checkite(item)">
+				<view>
+					<image :src="checkdatalist.indexOf(item)==-1?'/pagesHome/static/downnocheck.png':'/pagesHome/static/downcheck.png'"></image>
+					<view>{{index+1}}</view>
+				</view>
+			</view>
+			<view class="topon2" v-if="item?.associationId">
+				<image src="/pagesHome/static/checi.png"></image>
+				<view>订单号：{{item?.associationId}}</view>
+			</view>
+			<view class="topon2" v-if="item?.associationValue">
+				<image src="/pagesHome/static/checi.png"></image>
+				<view>包装号：{{item?.associationValue}}</view>
+			</view>
+			<view class="topon2" v-if="item?.orderCode">
+				<image src="/pagesHome/static/checi.png"></image>
+				<view>订单号：{{item?.orderCode}}</view>
+			</view>
+			<view class="topon2" v-if="item?.orderPackageCode">
+				<image src="/pagesHome/static/checi.png"></image>
+				<view>包装号：{{item?.orderPackageCode}}</view>
+			</view>
+			<view class="topon2" v-if="item?.trayCode">
+				<image src="/pagesHome/static/checi.png"></image>
+				<view>托盘码：{{item?.trayCode}}</view>
+			</view>
+		</view>
+	</scroll-view>
+	<view class="butys">
+		<view class="qut">取消</view>
+		<view class="conf" @click="downs">确认下架</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import {
+		warehouseUpdownTypedownScanPackage,
+		warehouseUpdownTypeupShelfScanAllocation,
+		warehouseUpdownTypedownPackage,
+		warehouseUpdownTypeupShelfScanGoods,
+		warehouseUpdownTypedownTrayCode,
+		warehouseUpdownTypedownZeroOrder,
+		warehouseUpdownTypedownStock,
+	} from '@/api/user.js'
+	import {
+		onLoad,
+		onShow,
+		onHide,
+		onUnload
+	} from '@dcloudio/uni-app'
+	import { reactive, toRefs, watchEffect } from "vue";
+	const details=reactive({
+		scantype:1,
+		mergeTray:'',
+		newmergeTray:'',
+		scancode:'',
+		pageType:1,
+		datalist:[],
+		checkdatalist:[],
+		isallcheck:false,
+		resdata:{} as any,
+		trayCode:'',
+	})
+	onLoad((op) => {
+		// details.upshelfScanType = op.type
+		details.pageType=op.type
+		// details.scancode = '23072506670-2'
+		details.scancode = '1687644549722112002'
+		// details.scancode = 'HT20230800001'
+		scandata()
+		// setTimeout(()=>{
+		// 	details.scancode='23072506670-2'
+		// 	scandata()
+		// },4500)
+		uni.$on('scancodedate', function (code) {
+			if (code) {
+				// console.log(code);
+				details.scancode = code
+				scandata()
+			}
+		})
+	})
+	watchEffect(()=>{
+		if(details.datalist.length==details.checkdatalist.length){
+			details.isallcheck=true
+		}else{
+			details.isallcheck=false
+		}
+	})
+	async function scandata(){
+		// let res=await 
+		let res=null
+		let data=null;
+		switch (Number(details.pageType)){
+			case 1:
+			
+			data={
+				upshelfScanType:'4',
+				code:details.scancode
+			}
+			res=await warehouseUpdownTypeupShelfScanGoods(data)
+			if(res.code==200){
+				details.datalist=details.datalist.concat(res.data)
+				details.checkdatalist=details.checkdatalist.concat(res.data)
+				details.trayCode=details.scancode
+			}else {
+				uni.showToast({
+					title:res.msg,
+					icon:'none'
+				})
+			}
+				break;
+			case 2:
+			data={
+				allocationId:details.scancode
+			}
+			res=await warehouseUpdownTypeupShelfScanAllocation(data)
+			if(res.code==200){
+				details.datalist=details.datalist.concat(res.data.list)
+				details.checkdatalist=details.checkdatalist.concat(res.data.list)
+				details.resdata=res.data
+			}else {
+				uni.showToast({
+					title:res.msg,
+					icon:'none'
+				})
+			}
+				break;
+			case 3:
+			data={
+				orderPackageCode:details.scancode
+			}
+			res=await warehouseUpdownTypedownScanPackage(data)
+			if(res.code==200){
+				details.datalist=details.datalist.concat([res.data])
+				details.checkdatalist=details.checkdatalist.concat([res.data])
+			}else {
+				uni.showToast({
+					title:res.msg,
+					icon:'none'
+				})
+			}
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+		}
+		
+	}
+	async function downs(){
+		let res=null
+		let data=null;
+		let list=[]
+		switch (Number(details.pageType)){
+			case 1:
+			
+			data={
+				trayCode:details.trayCode
+			}
+			res=await warehouseUpdownTypedownTrayCode(data)
+				break;
+			case 2:
+			data={
+				allocationId:details.resdata.allocationId
+			}
+			res=await warehouseUpdownTypeupShelfScanAllocation(data)
+				break;
+			case 3:
+			list=[]
+			details.checkdatalist.map(item=>{
+				list.push({
+					orderPackageCode:item.associationValue
+				})
+			})
+			data={
+				upShelfPackageList:list,
+			}
+			res=await warehouseUpdownTypedownPackage(data)
+				break;
+			case 4:
+			data={
+				allocationId:details.resdata.allocationId
+			}
+			res=await warehouseUpdownTypedownStock(data)
+				break;
+			case 5:
+			list=[]
+			
+			data={
+				upShelfZeroOrderList:details.resdata.allocationId
+			}
+			res=await warehouseUpdownTypedownZeroOrder(data)
+				break;
+		}
+		if(res.code==200){
+			uni.showToast({
+				title:'下架成功',
+				icon:'none'
+			})
+		}else {
+			uni.showToast({
+				title:res.msg,
+				icon:'none'
+			})
+		}
+	}
+	function checkite(item){
+		if(details.checkdatalist.indexOf(item)==-1){
+			details.checkdatalist.push(item)
+		}else{
+			details.checkdatalist.splice(details.checkdatalist.indexOf(item),1)
+		}
+	}
+	function allquanxuan(){
+		if(details.datalist.length==details.checkdatalist.length){
+			details.checkdatalist=[]
+		}else{
+			details.datalist.map(item=>{
+				if(details.checkdatalist.indexOf(item)==-1){
+					details.checkdatalist.push(item)
+				}
+			})
+		}
+	}
+	const {
+		trayCode,
+		isallcheck,
+		checkdatalist,
+		pageType,
+		datalist
+	}=toRefs(details)
+</script>
+
+<style lang="scss">
+	.butys{
+		display: flex;
+		align-items: center;
+		margin-top: 20upx;
+		justify-content: space-around;
+		>.conf{
+			width: 320upx;
+			height: 100upx;
+			border-radius: 20upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #FFFFFF;
+			background-color: #D3832A;
+		}
+		>.qut{
+			width: 320upx;
+			height: 100upx;
+			border-radius: 20upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #5A6875;
+			background-color: #FFFFFF;
+		}
+	}
+	.scvorder{
+		width: 100%;
+		margin-top: 20upx;
+		height: var(--height);
+		.itembox{
+			width: 686upx;
+			border-radius: 20upx;
+			padding: 0 20upx;
+			box-sizing: border-box;
+			background-color: #ffffff;
+			margin: auto;
+			margin-bottom: 20upx;
+			.topon1:nth-last-child(1){
+				border-bottom: 4upx solid #EEEEEE00 !important;
+			}
+			>.topon1{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 20upx 10upx;
+				box-sizing: border-box;
+				border-bottom: 4upx solid #EEEEEE;
+				&:nth-last-child(1){
+					border-bottom: 4upx solid #EEEEEE00 !important;
+				}
+				>view:nth-of-type(1){
+					display: flex;
+					align-items: center;
+					>image{
+						width: 48upx;
+						height: 48upx;
+						margin-right: 30upx;
+					}
+					>view{
+						width: 50rpx;
+						height: 50rpx;
+						background: #178AF220;
+						border-radius: 50%;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 28upx;
+						font-weight: 500;
+						color: #178AF2;
+					}
+				}
+				>view:nth-of-type(2){
+					display: flex;
+					align-items: center;
+					>view{
+						width: 136upx;
+						height: 64upx;
+						border-radius: 8upx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #90A0AF;
+						background-color: #F5F5F6;
+						margin-right: 20upx;
+						&:nth-last-child(1){
+							margin-right: 0upx;
+						}
+					}
+					.xzc{
+						background-color: #178AF2 !important;
+						color: #ffffff !important;
+					}
+					.xze{
+						background-color: #F8544B !important;
+						color: #ffffff !important;
+					}
+					>image{
+						width: 64upx;
+						height: 64upx;
+					}
+				}
+			}
+			>.topon2{
+				display: flex;
+				align-items: center;
+				justify-content: flex-start;
+				padding: 20upx 10upx;
+				box-sizing: border-box;
+				border-bottom: 4upx solid #EEEEEE;
+				>image{
+					width: 64upx;
+					height: 64upx;
+					margin-right: 20upx;
+				}
+				>view{
+					font-size: 28upx;
+					font-weight: 400;
+					color: #020B18;
+				}
+			}
+		}
+	}
+	.tbchec{
+		width: 686rpx;
+		height: 80rpx;
+		padding: 16upx 36upx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 20upx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+		position: relative;
+		background-color: #ffffff;
+		border-radius: 20upx;
+		.xz{
+			color: #D3832A !important;
+		}
+		>view{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #90A0AF;
+			>image{
+				width: 48upx;
+				height: 48upx;
+				margin-right: 16upx;
+			}
+		}
+	}
+	.viewbx{
+		width: 686upx;
+		// height: 356upx;
+		background: #FFFFFF;
+		border-radius: 20upx;
+		position: relative;
+		padding: 10upx 20upx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 40upx;
+		.numvie{
+			display: flex;
+			align-items: center;
+			font-size: 28upx;
+			font-weight: 400;
+			color: #020B18;
+			padding: 30upx 0;
+			>view:nth-of-type(1){
+				width: 200upx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			>view:nth-of-type(2){
+				
+			}
+		}
+		.vwtybx1{
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			padding: 20upx 0;
+			box-sizing: border-box;
+			// border-bottom: 4upx solid #EEEEEE;
+			// &:nth-last-child(1){
+			// 	border-bottom: none;
+			// }
+			>view{
+				display: flex;
+				align-items: center;
+				margin-bottom: 20upx;
+				&:nth-last-child(1){
+					margin-bottom: 0upx;
+				}
+				>view:nth-of-type(1){
+					display: flex;
+					align-items: center;
+					width: 200upx;
+					font-size: 28upx;
+					font-weight: 400;
+					color: #020B18;
+					>image{
+						width: 48upx;
+						height: 48upx;
+						margin-right: 15upx;
+					}
+				}
+				>view:nth-of-type(2){
+					font-size: 28upx;
+					font-weight: 400;
+					color: #020B18;
+					>input{
+						flex: 1;
+					}
+				}
+			}
+		}
+	}
+	.bgimg {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+	
+	}
+	
+	.scanqcview {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		margin-top: 10upx;
+	
+		>image {
+			width: 72upx;
+			height: 72upx;
+			margin-right: 16upx;
+		}
+	
+		>view {
+			font-size: 32upx;
+			font-weight: 400;
+			color: #FFFFFF;
+		}
+	}
+</style>

pagesHome/pages/DownGoodsType/DownGoodsType.vue

@@ -0,0 +1,94 @@
+<template>
+	<u-navbar title="下架扫描"
+	 bgColor='#D3832A' leftIconColor='#ffffff'
+	titleStyle='color:#ffffff' placeholder :autoBack="true" leftIconSize='35'></u-navbar>
+	<view class="pepleview">
+		<view class="pepleietm" @click="gotourl(item)" v-for="item in typelist">
+			<image :src="item.src"></image>
+			<view>{{item.name}}</view>
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import {
+		onLoad,
+		onShow,
+		onHide,
+		onUnload
+	} from '@dcloudio/uni-app'
+	import { ref } from "vue";
+	let typelist = ref<{ type : number, name : string,src:string }[]>([])
+	let pageType=ref(null)
+	let trayCode=ref(null)
+	onLoad((op) => {
+		pageType.value=op.type
+		trayCode.value=op.trayCode
+		typelist.value = [
+			{ type: 1, name: '按托盘下架',src:'/pagesHome/static/pandown.png' },
+			{ type: 2, name: '库位下架',src:'/pagesHome/static/scicon5.png' },
+			{ type: 3, name: '按件下架',src:'/pagesHome/static/jiandown.png' },
+			{ type: 4, name: '按库存品下架',src:'/pagesHome/static/upicon3.png' },
+			{ type: 5, name: '按零担下架',src:'/pagesHome/static/rgicon2.png' },
+		]
+	})
+	function gotourl(item : any) {
+		let url = '/pagesHome/pages/DownGoods/DownGoods?type='+item.type
+		uni.navigateTo({
+			url
+		})
+	}
+</script>
+
+<style lang="scss">
+	
+	.pepleview{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-top: 40upx;
+		.pepleietm{
+			width: 600upx;
+			height: 440upx;
+			background: #FFFFFF;
+			border-radius: 20upx;
+			margin-bottom: 20upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			box-shadow: 0upx 8upx 20upx 0upx rgba(0,0,0,0.1);
+			font-size: 32upx;
+			font-weight: 400;
+			color: #020B18;
+			>image{
+				width:236upx;
+				height: 236upx;
+				margin-bottom: 40upx;
+			}
+		}
+	}
+	.maxbxview {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-top: 30upx;
+
+		>.items {
+			width: 350upx;
+			height: 100upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-radius: 10upx;
+			border: 1upx solid #FA8C16;
+			color: #FA8C16;
+			font-size: 28upx;
+			margin-bottom: 50upx;
+			box-shadow: 0upx 8upx 20upx 0upx rgba(0,0,0,0.1);
+			&:nth-last-child(1) {
+				margin-bottom: 0;
+			}
+		}
+	}
+</style>

pagesHome/pages/LoadingDetails/LoadingDetails.vue

@@ -118,6 +118,9 @@
 	onLoad((op)=>{
 		details.items=JSON.parse(op.item)
 		details.id=JSON.parse(op.item).id
+		
+	})
+	onShow(()=>{
 		init()
 	})
 	function init(){

pagesHome/pages/LoadingScan/LoadingScan.vue

@@ -26,7 +26,7 @@
 							<text style="color: #90A0AF;">配送类型：</text>{{item.type_name}}
 						</view>
 						<view>
-							<text style="color: #90A0AF;">配送装车：</text>{{item.vehicleStatus_name}}
+							<text style="color: #90A0AF;">配送状态：</text>{{item.vehicleStatus_name}}
 						</view>
 					</view>
 					<view class="type1s">

pagesHome/pages/MergeTray/MergeTray.vue

@@ -6,57 +6,221 @@
 		<view class="srview">
 			<view>被合并托盘码</view>
 			<view>
-				<input placeholder="请扫描或输入"/>
+				<input placeholder="请扫描或输入" v-model="mergeTray" @focus="setstate(1)"/>
 			</view>
 		</view>
 		<view class="srview">
 			<view>合并托盘码</view>
 			<view>
-				<input placeholder="请扫描或输入"/>
+				<input placeholder="请扫描或输入" v-model="newmergeTray" @focus="setstate(2)"/>
 			</view>
 		</view>
 	</view>
 	<view class="tabsetnumb">
-		<view class="xz">
+		<view @click="settabberstate(1)" :class="tabberstate==1?'xz':''">
 			<view>被合并托盘数据</view>
 			<view></view>
 		</view>
-		<view>
+		<view @click="settabberstate(2)" :class="tabberstate==2?'xz':''">
 			<view>合并托盘数据</view>
 			<view></view>
 		</view>
 	</view>
 	<view class="tarynumvw">
-		托盘数量：10
+		托盘数量：{{(tabberstate==1?(beilist?.totalNum):(newbeilist?.totalNum))||0}}
 	</view>
 	<scroll-view scroll-y="true" class="scvorder">
-		<view class="itembox">
+		<view class="itembox" v-for="(item,index) in (beilist?.list||[])" v-if="tabberstate==1">
 			<view class="topon1">
-				<view>2</view>
+				<view>{{index+1}}</view>
 				<view>
-					<view class="xzc">正常</view>
-					<view>异常</view>
-					<!-- <image src="/pagesHome/static/removeitem.png"></image> -->
+					<view :class="item.isFleeing=='0'?'xzc':''">正常</view>
+					<view :class="item.isFleeing=='1'?'xze':''">异常</view>
 				</view>
 			</view>
-			<view class="topon2">
-				<image src="/pagesHome/static/checi.png"></image>
-				<view>订单号：DS258932</view>
+			<view class="topon2" v-if="item.orderCode">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>订单号：{{item.orderCode}}</view>
 			</view>
-			<view class="topon2">
-				<image src="/pagesHome/static/checi.png"></image>
-				<view>包装号：DF25642332563</view>
+			<view class="topon2" v-if="item.code">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>包装号：{{item.code}}</view>
+			</view>
+			<view class="topon2" v-if="item.num">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>录入数量：{{item.num}}</view>
+			</view>
+		</view>
+		<view class="itembox" v-for="(item,index) in (newbeilist?.list||[])" v-if="tabberstate==2">
+			<view class="topon1">
+				<view>{{index+1}}</view>
+				<view>
+					<view :class="item.isFleeing=='0'?'xzc':''">正常</view>
+					<view :class="item.isFleeing=='1'?'xze':''">异常</view>
+				</view>
+			</view>
+			<view class="topon2" v-if="item.orderCode">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>订单号：{{item.orderCode}}</view>
+			</view>
+			<view class="topon2" v-if="item.code">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>包装号：{{item.code}}</view>
+			</view>
+			<view class="topon2" v-if="item.num">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>录入数量：{{item.num}}</view>
 			</view>
 		</view>
 	</scroll-view>
 	<view class="butys">
 		<view class="qut">取消</view>
-		<view class="conf">确认滞留</view>
+		<view class="conf" @click="godetails">确认合并</view>
 	</view>
+	<tips ref="tip"></tips>
 </template>
 
 <script lang="ts" setup>
-	
+	import {
+		warehouseTrayTypescanSourceTrayCode,
+		warehouseTrayTypescanTargetTrayCode,
+		warehouseTrayTypemergeTray
+	} from '@/api/user.js'
+	import {
+		onLoad,
+		onShow,
+		onHide,
+		onUnload
+	} from '@dcloudio/uni-app'
+	import { reactive, ref, toRefs } from "vue";
+	const tip=ref(null)
+	const details=reactive({
+		scantype:1,
+		mergeTray:'',//来源托盘
+		newmergeTray:'',//目标托盘
+		scancode:'',
+		tabberstate:1,
+		beilist:{} as any,
+		newbeilist:{} as any,
+	})
+	onLoad((op) => {
+		// details.upshelfScanType = op.type
+		details.scancode = 'HT20230800002'
+		scandata()
+		setTimeout(()=>{
+			details.scantype=2
+			details.scancode = 'HT20230800001'
+			scandata()
+		},2500)
+		// setTimeout(()=>{
+		// 	details.scancode='23072506670-2'
+		// 	scandata()
+		// },4500)
+		uni.$on('scancodedate', function (code) {
+			if (code) {
+				// console.log(code);
+				details.scancode = code
+				scandata()
+			}
+		})
+	})
+	function setstate(state:number){
+		details.scantype=state
+	}
+	async function scandata(){
+		// let res=await 
+		let res=null
+		if(details.scantype==1){
+			let data={
+				trayCode:details.scancode
+			}
+			res=await warehouseTrayTypescanSourceTrayCode(data)
+		}else if(details.scantype==2){
+			let data={
+				trayCode:details.scancode
+			}
+			res=await warehouseTrayTypescanTargetTrayCode(data)
+		}
+		if(res.code==200){
+			if(details.scantype==1){
+				details.beilist=res.data
+				details.mergeTray=details.scancode
+			}else if(details.scantype==2){
+				details.newbeilist=res.data
+				details.newmergeTray=details.scancode
+			}
+		}else{
+			uni.showToast({
+				title:res.msg,
+				icon:'none'
+			})
+		}
+		console.log(res);
+	}
+	function settabberstate(state:number){
+		details.tabberstate=state
+	}
+	function godetails(){
+		// uni.navigateTo({
+		// 	url:'/pagesHome/pages/MergeTrayDetails/MergeTrayDetails'
+		// })
+		if(!details.newmergeTray){
+			uni.showToast({
+				title:'请扫描目标托盘',
+				icon:'none'
+			})
+			return
+		}
+		if(!details.mergeTray){
+			uni.showToast({
+				title:'请扫描来源托盘',
+				icon:'none'
+			})
+			return
+		}
+		tip.value.setdetails({
+			isshow:true,
+			content:'是否确认合并？',
+			confirmTxt:'合并',
+			success:async ()=>{
+				let data={
+					sourceTrayCode:details.mergeTray,
+					targetTrayCode:details.newmergeTray
+				}
+				let res=await warehouseTrayTypemergeTray(data)
+				if(res.code==200){
+					uni.showToast({
+						title:'合并成功',
+						icon:'none'
+					})
+					uni.navigateTo({
+						url:'/pagesHome/pages/MergeTrayDetails/MergeTrayDetails?tray='+details.newmergeTray
+					})
+				}else{
+					uni.showToast({
+						title:res.msg,
+						icon:'none'
+					})
+				}
+				tip.value.setdetails({isshow:false})
+			},
+			cancel:()=>{
+				tip.value.setdetails({isshow:false})
+			},
+			close:()=>{
+				tip.value.setdetails({isshow:false})
+			},
+		})
+	}
+	const {
+		beilist,
+		newbeilist,
+		newmergeTray,
+		mergeTray,
+		scantype,
+		scancode,
+		tabberstate,
+	}=toRefs(details)
 </script>
 
 <style lang="scss">
@@ -238,6 +402,7 @@
 				flex: 1;
 				>input{
 					flex: 1;
+					font-size: 28upx;
 				}
 			}
 		}

pagesHome/pages/MergeTrayDetails/MergeTrayDetails.vue

@@ -0,0 +1,270 @@
+<template>
+	<u-navbar title="合托托盘"
+	 bgColor='#D3832A' leftIconColor='#ffffff'
+	titleStyle='color:#ffffff' placeholder :autoBack="true" leftIconSize='35'></u-navbar>
+	<view class="topbos">
+		<view class="srview">
+			<view>合并托盘码</view>
+			<view>
+				<input placeholder="请扫描或输入" v-model="resdata.trayCode"/>
+			</view>
+		</view>
+		<view class="srview">
+			<view>托盘数量：{{resdata?.totalNum}}</view>
+			<!-- <view>
+				<input placeholder="请扫描或输入"/>
+			</view> -->
+		</view>
+	</view>
+	<!-- <view class="tabsetnumb">
+		<view class="xz">
+			<view>被合并托盘数据</view>
+			<view></view>
+		</view>
+		<view>
+			<view>合并托盘数据</view>
+			<view></view>
+		</view>
+	</view> -->
+	<!-- <view class="tarynumvw">
+		托盘数量：10
+	</view> -->
+	<scroll-view scroll-y="true" class="scvorder">
+		<view class="itembox" v-for="(item,index) in (resdata?.list)">
+			<view class="topon1">
+				<view>{{index+1}}</view>
+				<view>
+					<view :class="item.isFleeing=='0'?'xzc':''">正常</view>
+					<view :class="item.isFleeing=='1'?'xze':''">异常</view>
+				</view>
+			</view>
+			<view class="topon2" v-if="item.orderCode">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>订单号：{{item.orderCode}}</view>
+			</view>
+			<view class="topon2" v-if="item.code">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>包装号：{{item.code}}</view>
+			</view>
+			<view class="topon2" v-if="item.num">
+				<image src="/pagesHome/static/scanicon1.png"></image>
+				<view>录入数量：{{item.num}}</view>
+			</view>
+		</view>
+	</scroll-view>
+<!-- 	<view class="butys">
+		<view class="qut">取消</view>
+		<view class="conf" @click="">确认</view>
+	</view> -->
+</template>
+
+<script lang="ts" setup>
+	import {
+		warehouseTrayTypescanTargetTrayCode
+	} from '@/api/user.js'
+	import {
+		onLoad,
+		onShow,
+		onHide,
+		onUnload
+	} from '@dcloudio/uni-app'
+	import { ref } from "vue";
+	let trayCode=ref('')
+	let resdata=ref<any>({})
+	onLoad((op)=>{
+		trayCode.value=op.tray
+		init()
+	})
+	async function init(){
+		let data={
+			trayCode:trayCode.value
+		}
+		let res=await warehouseTrayTypescanTargetTrayCode(data)
+		resdata.value=res.data
+	}
+</script>
+
+<style lang="scss">
+	.butys{
+		display: flex;
+		align-items: center;
+		margin-top: 20upx;
+		justify-content: space-around;
+		>.conf{
+			width: 320upx;
+			height: 100upx;
+			border-radius: 20upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #FFFFFF;
+			background-color: #D3832A;
+		}
+		>.qut{
+			width: 320upx;
+			height: 100upx;
+			border-radius: 20upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 32upx;
+			font-weight: 400;
+			color: #5A6875;
+			background-color: #FFFFFF;
+		}
+	}
+	.scvorder{
+		width: 100%;
+		margin-top: 20upx;
+		height: 64vh;
+		.itembox{
+			width: 686upx;
+			border-radius: 20upx;
+			padding: 0 20upx;
+			box-sizing: border-box;
+			background-color: #ffffff;
+			margin: auto;
+			margin-bottom: 20upx;
+			>.topon1{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 20upx 10upx;
+				box-sizing: border-box;
+				border-bottom: 4upx solid #EEEEEE;
+				>view:nth-of-type(1){
+					width: 50rpx;
+					height: 50rpx;
+					background: #178AF220;
+					border-radius: 50%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 28upx;
+					font-weight: 500;
+					color: #178AF2;
+				}
+				>view:nth-of-type(2){
+					display: flex;
+					align-items: center;
+					>view{
+						width: 136upx;
+						height: 64upx;
+						border-radius: 8upx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #90A0AF;
+						background-color: #F5F5F6;
+						margin-right: 20upx;
+						&:nth-last-child(1){
+							margin-right: 0upx;
+						}
+					}
+					.xzc{
+						background-color: #178AF2 !important;
+						color: #ffffff !important;
+					}
+					.xze{
+						background-color: #F8544B !important;
+						color: #ffffff !important;
+					}
+					>image{
+						width: 64upx;
+						height: 64upx;
+					}
+				}
+			}
+			>.topon2{
+				display: flex;
+				align-items: center;
+				justify-content: flex-start;
+				padding: 20upx 10upx;
+				box-sizing: border-box;
+				border-bottom: 4upx solid #EEEEEE;
+				>image{
+					width: 64upx;
+					height: 64upx;
+					margin-right: 20upx;
+				}
+				>view{
+					font-size: 28upx;
+					font-weight: 400;
+					color: #020B18;
+				}
+			}
+		}
+	}
+	.tarynumvw{
+		width: 100%;
+		padding: 24upx 70upx;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		margin-top: 4upx;
+		box-sizing: border-box;
+	}
+	.tabsetnumb{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #ffffff;
+		margin-top: 20upx;
+		.xz{
+			>view:nth-of-type(1){
+				color: #D3832A !important;
+			}
+			>view:nth-of-type(2){
+				background-color: #D3832A !important;
+			}
+		}
+		>view{
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			
+			>view:nth-of-type(1){
+				font-size: 32upx;
+				font-weight: 400;
+				color: #020B18;
+				padding: 30upx 0;
+			}
+			>view:nth-of-type(2){
+				width: 96upx;
+				height: 8upx;
+				background-color: #D3832A00;
+				border-radius: 4upx;
+			}
+		}
+	}
+	.topbos{
+		display: flex;
+		flex-direction: column;
+		>.srview{
+			display: flex;
+			align-items: center;
+			padding: 26upx 32upx;
+			box-sizing: border-box;
+			background-color: #ffffff;
+			margin-bottom: 4upx;
+			&:nth-last-child(1){
+				margin-bottom: 0;
+			}
+			>view:nth-of-type(1){
+				width: 190upx;
+				font-size: 28upx
+			}
+			>view:nth-of-type(2){
+				font-size: 28upx;
+				flex: 1;
+				>input{
+					flex: 1;
+				}
+			}
+		}
+	}
+</style>

pagesHome/pages/OrderSortingDetail/OrderSortingDetail.vue

@@ -114,11 +114,12 @@
 		details.trayCode=op.trayCode
 		details.trayType=op.trayType
 		setTimeout(()=>{
-			details.scancode='23072506122-1'
+			details.scancode='23072506516-3'
 			scandata()
 		},3000)
 		setTimeout(()=>{
-			details.scancode='23072506122-2'
+			
+			details.scancode='23072506670-2'
 			scandata()
 		},6000)
 		let trayCodeTypearr=uni.getStorageSync('trayCodeType')

pagesHome/pages/PeopleScanUp/PeopleScanUp.vue

@@ -170,7 +170,7 @@
 			</view>
 			<scroll-view scroll-y="true" class="scvbw">
 				<view class="scboxitem">
-					<view class="items" v-for="(item,index) in codelist">
+					<view class="items" @click="setchecl(index)" v-for="(item,index) in codelist">
 						<view class="type1s">
 							<view>
 								<view>订单号：</view>
@@ -187,8 +187,14 @@
 								<input placeholder="请输入入库数" v-model="item.enterNum"/>
 							</view>
 						</view>
+						<view class="lisbite" v-if="checkinarr.indexOf(index)!=-1">
+							<view class="itembox" v-for="ite in item.list">
+								<view v-if="ite.allocationName">库位码：{{ite.allocationName}}</view>
+								<view v-if="ite.trayCode">托盘码：{{ite.trayCode}}</view>
+							</view>
+						</view>
 					</view>
-				</view>
+				</view> 
 			</scroll-view>
 			<view class="btx">
 				<view class="cancel" @click="setshowstate(0)">取消</view>
@@ -236,6 +242,7 @@
 		codelist:[],
 		Marketlist:[],
 		checkmakindex:0,
+		checkinarr:[],
 	})
 	onLoad((op) => {
 		details.upshelfScanType = op.type
@@ -431,10 +438,18 @@
 			}
 		})
 	}
+	function setchecl(index:number){
+		if(details.checkinarr.indexOf(index)==-1){
+			details.checkinarr.push(index)
+		}else{ 
+			details.checkinarr.splice(details.checkinarr.indexOf(index),1)
+		}
+	}
 	function setstate(state : number) {
 		details.checkstate = state
 	}
 	const {
+		checkinarr,
 		checkmakindex,
 		Marketlist,
 		codelist,
@@ -527,6 +542,31 @@
 						margin-top: 10upx;
 						padding: 20upx;
 						box-sizing: border-box;
+						>.lisbite{
+							width: 100%;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							// position: absolute;
+							>.itembox{
+								width: 100%;
+								display: flex;
+								flex-direction: column;
+								align-items: flex-start;
+								justify-content: space-between;
+								font-size: 28upx;
+								color: #020B18;
+								border: 1upx solid #D3832A;
+								padding:10upx 20upx;
+								box-sizing: border-box;
+								border-radius: 20upx;
+								color: #D3832A;
+								>view{
+									word-wrap: break-word;
+									word-break: break-all;
+								}
+							}
+						}
 						>.type1s{
 							display: flex;
 							align-items: center;

pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail.vue

@@ -134,7 +134,7 @@
 			</view>
 			<scroll-view scroll-y="true" class="scvbw">
 				<view class="scboxitem">
-					<view class="items" v-for="(item,index) in codelist">
+					<view class="items" @click="setchecl(index)" v-for="(item,index) in codelist">
 						<view class="type1s">
 							<view>
 								<view>订单号：</view>
@@ -151,6 +151,12 @@
 								<input placeholder="请输入入库数" v-model="item.number"/>
 							</view>
 						</view>
+						<view class="lisbite" v-if="checkinarr.indexOf(index)!=-1">
+							<view class="itembox" v-for="ite in item.positionList">
+								<view v-if="ite.allocationName">库位码：{{ite.allocationName}}</view>
+								<view v-if="ite.trayCode">托盘码：{{ite.trayCode}}</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</scroll-view>
@@ -188,7 +194,8 @@
 		trayCodevalue:'',
 		trayType:'',
 		warehouseTray:({} as any),
-		Remarktext:''
+		Remarktext:'',
+		checkinarr:[],
 	})
 	const tip=ref(null)
 	onLoad((op)=>{
@@ -406,11 +413,18 @@
 	}
 	function scandata(){
 		
+	}
+	function setchecl(index:number){
+		if(details.checkinarr.indexOf(index)==-1){
+			details.checkinarr.push(index)
+		}else{ 
+			details.checkinarr.splice(details.checkinarr.indexOf(index),1)
+		}
 	}
 	function setshowstate(state:number){
 		details.showstate=state
 	}
-	const { Remarktext,datalist,warehouseTray,showstate,waybillCode,codelist } =toRefs(details)
+	const { checkinarr,Remarktext,datalist,warehouseTray,showstate,waybillCode,codelist } =toRefs(details)
 </script>
 
 <style lang="scss" scoped>
@@ -605,6 +619,32 @@
 						margin-top: 10upx;
 						padding: 20upx;
 						box-sizing: border-box;
+						position: relative;
+						>.lisbite{
+							width: 100%;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							// position: absolute;
+							>.itembox{
+								width: 100%;
+								display: flex;
+								flex-direction: column;
+								align-items: flex-start;
+								justify-content: space-between;
+								font-size: 28upx;
+								color: #020B18;
+								border: 1upx solid #D3832A;
+								padding:10upx 20upx;
+								box-sizing: border-box;
+								border-radius: 20upx;
+								color: #D3832A;
+								>view{
+									word-wrap: break-word;
+									word-break: break-all;
+								}
+							}
+						}
 						>.type1s{
 							display: flex;
 							align-items: center;

pagesHome/pages/PickingScanList/PickingScanList.vue

@@ -153,7 +153,9 @@
 	}
 	function goCustomerOrdersDetails(item){
 		uni.navigateTo({
-			url:'/pagesHome/pages/StockUplist/StockUplist?item='+JSON.stringify(item)+'&id='+item.reservationId
+			url:'/pagesHome/pages/StockUplist/StockUplist?item='
+			+JSON.stringify(item)+'&id='+item.reservationId
+			+'&stockupId='+details.id
 		})
 	}
 	const { authbuts,items,datalist }=toRefs(details)

pagesHome/pages/Retention/Retention.vue

@@ -12,37 +12,119 @@
 		</view>
 	</view>
 	<scroll-view class="scvm" scroll-y="true">
-		<view class="itembox">
+		<view class="itembox" v-for="(item,index) in codelist">
 			<view class="topon1">
-				<view>2</view>
+				<view>{{index+1}}</view>
 				<view>
-					<view class="xzc">正常</view>
-					<view>异常</view>
-					<image src="/pagesHome/static/removeitem.png"></image>
+					<!-- <view class="xzc">正常</view> -->
+					<!-- <view>异常</view> -->
+					<!-- <image src="/pagesHome/static/removeitem.png"></image> -->
 				</view>
 			</view>
 			<view class="topon2">
 				<image src="/pagesHome/static/checi.png"></image>
-				<view>滞留车次：D001</view>
+				<view>滞留车次：{{item.retentionCarNo}}</view>
 			</view>
 			<view class="topon2">
 				<image src="/pagesHome/static/checi.png"></image>
-				<view>订单号：DS258932</view>
+				<view>订单号：{{item.orderCode}}</view>
 			</view>
 			<view class="topon2">
 				<image src="/pagesHome/static/checi.png"></image>
-				<view>包装号：DF25642332563</view>
+				<view>包件码：{{item.packageCode}}</view>
 			</view>
 		</view>
 	</scroll-view>
-	<view class="butys">
+<!-- 	<view class="butys">
 		<view class="qut">取消</view>
-		<view class="conf">确认合并</view>
-	</view>
+		<view class="conf">确认滞留</view>
+	</view> -->
 </template>
 
 <script lang="ts" setup>
+	import {
+		warehouseRetentionretentionPackageList,
+		warehouseRetentionretentionScanPackage
+	} from '@/api/user.js'
+	import {
+		onLoad,
+		onShow,
+		onHide,
+		onUnload
+	} from '@dcloudio/uni-app'
+	import { reactive, toRefs } from "vue";
+	const details=reactive({
+		scancode:'',
+		codelist:[],
+		pageNum:1,
+		pageSize:10,
+	})
+	onLoad((op) => {
+		// details.upshelfScanType = op.type
 	
+		details.scancode = '23072506516-3'
+		scandata()
+		init()
+		// setTimeout(()=>{
+		// 	details.scancode='23072506670-2'
+		// 	scandata()
+		// },4500)
+		uni.$on('scancodedate', function (code) {
+			if (code) {
+				// console.log(code);
+				details.scancode = code
+				scandata()
+			}
+		})
+	})
+	function init(){
+		details.pageNum=1
+		details.codelist=[]
+		initpage()
+	}
+	function jiazai(){
+		details.pageNum++
+		initpage()
+	}
+	async function initpage(){
+		let data={
+			pageNum:details.pageNum,
+			pageSize:details.pageSize,
+		}
+		let res=await warehouseRetentionretentionPackageList(data)
+		if(res.code==200){
+			details.codelist=details.codelist.concat(res.data.records)
+		}else{
+			uni.showToast({
+				title:res.msg,
+				icon:'none'
+			})
+		}
+	}
+	async function scandata(){
+		let data={
+			orderPackageCode:details.scancode
+		}
+		let res=await warehouseRetentionretentionScanPackage(data)
+		if(res.code==200){
+			uni.showToast({
+				title:'扫码成功',
+				icon:'none'
+			})
+			init()
+		}else{
+			uni.showToast({
+				title:res.msg,
+				icon:'none'
+			})
+		}
+	}
+	const {
+		scancode,
+		codelist,
+		pageNum,
+		pageSize,
+	}=toRefs(details)
 </script>
 
 <style lang="scss">
@@ -78,7 +160,7 @@
 	}
 	.scvm{
 		width: 100%;
-		height: 64vh;
+		height: 74vh;
 		margin-top: 20upx;
 		.itembox{
 			width: 686upx;
@@ -178,6 +260,9 @@
 				height: 32upx;
 				margin-right: 12upx;
 			}
+			>input{
+				font-size: 28upx;
+			}
 		}
 		.viewboxs{
 			display: flex;

pagesHome/pages/ScanUp/ScanUp.vue

@@ -174,7 +174,7 @@
 		details.scancode='1687644549722112002'
 		scandata()
 		setTimeout(()=>{
-			details.scancode='HT20230800001'
+			details.scancode='HT20230800002'
 			scandata()
 		},1500)
 		// setTimeout(()=>{

pagesHome/pages/StockUplist/StockUplist.vue

@@ -113,10 +113,12 @@
 			planNum:'',
 			scanNum:'',
 		},
-		stockList:[]
+		stockList:[],
+		stockupId:''
 	})
 	onLoad((op)=>{
 		details.reservationId=op.id
+		details.stockupId=op.stockupId
 		// details.user.goodsAreaName=op.stockupArea
 		// details.reservationId='1682676882390781953'
 		initpage()
@@ -143,6 +145,7 @@
 			'&orderStatus='+
 			details.orderStatus+'&reservationId='+details.reservationId+
 			'&allocation='+item.allocation+'&pallet='+item.pallet+'&orderCode='+item.orderCode
+			+'&stockupId='+details.stockupId
 			
 		})
 	}

pagesHome/pages/StockUplistScandetails/StockUplistScandetails.vue

@@ -83,7 +83,7 @@
 					</view>
 					<view>
 						<view>货物类型：{{item.goodsType==1?'定制品':''}}</view>
-						<view>是否备货：{{item.scanId==-1?'否':'是'}}</view>
+						<view>是否备货：{{item.isScan==0?'否':'是'}}</view>
 					</view>
 					<view>
 						<view>备货：{{item.StockUp}}</view>
@@ -127,10 +127,12 @@
 		warehouseArea:'',
 		orderCode:'',
 		scancode:'',
+		stockupId:'',
 	})
 	const tiplists=ref(null)
 	onLoad((op)=>{
 		details.stockArticleId=op.stockArticleId
+		details.stockupId=op.stockupId
 		details.orderStatus=op.orderStatus
 		details.reservationId=op.reservationId
 		// details.stockListId=op.stockListId
@@ -138,7 +140,8 @@
 		details.pallet=op.pallet
 		details.orderCode=op.orderCode
 		initpage()
-		// scandata()
+		details.scancode='23072506516-3'
+		scandata() 
 		uni.$on('scancodedate', function(code) {
 			if (code) {
 				console.log(code);
@@ -174,6 +177,7 @@
 			packetBarCode:details.scancode,
 			stockupArea:details.stockupArea,
 			reservationId:details.reservationId,
+			stockupId:details.stockupId,
 		}
 		let res=await distributionStockupstockupScan(data)
 		console.log(res);
@@ -198,6 +202,7 @@
 			// stockListId:details.stockListId,
 			allocation:details.allocation,
 			pallet:details.pallet,
+			stockupId:details.stockupId,
 		}
 		let response=await distributionStockuporderInfo(data)
 		console.log(response);

pagesHome/pages/inventoryenter/inventoryenter.vue

@@ -88,7 +88,7 @@
 			</view>
 			<scroll-view scroll-y="true" class="scvbw">
 				<view class="scboxitem">
-					<view class="items" v-for="item in details.scanlist">
+					<view class="items" @click="setchecl(index)" v-for="(item,index) in details.scanlist">
 						<view class="type1s">
 							<view>
 								<view>物料编码：</view>
@@ -125,6 +125,12 @@
 								<input placeholder="请输入数量" v-model="maknumber"/>
 							</view>
 						</view>
+						<view class="lisbite" v-if="checkinarr.indexOf(index)!=-1">
+							<view class="itembox" v-for="ite in item.positionList">
+								<view v-if="ite.allocationName">库位码：{{ite.allocationName}}</view>
+								<view v-if="ite.trayCode">托盘码：{{ite.trayCode}}</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</scroll-view>
@@ -166,6 +172,7 @@
 		scanlist:[],
 		materialCode:'',
 		maknumber:'',
+		checkinarr:[],
 	})
 	onLoad((op)=>{
 		details.trayCode=op.trayCode
@@ -317,7 +324,14 @@
 			},
 		})
 	}
-	const { maknumber,datalist,scanlist,checkmakindex,Marketlist,materialCode,showstate }=toRefs(details)
+	function setchecl(index:number){
+		if(details.checkinarr.indexOf(index)==-1){
+			details.checkinarr.push(index)
+		}else{ 
+			details.checkinarr.splice(details.checkinarr.indexOf(index),1)
+		}
+	}
+	const { checkinarr,maknumber,datalist,scanlist,checkmakindex,Marketlist,materialCode,showstate }=toRefs(details)
 </script>
 
 <style lang="scss">
@@ -764,9 +778,34 @@
 						&:nth-last-child(1){
 							margin-bottom: 10upx;
 						}
-						>.type1s{
+						>.lisbite{
+							width: 100%;
 							display: flex;
 							align-items: center;
+							justify-content: center;
+							// position: absolute;
+							>.itembox{
+								width: 100%;
+								display: flex;
+								flex-direction: column;
+								align-items: flex-start;
+								justify-content: space-between;
+								font-size: 28upx;
+								color: #020B18;
+								border: 1upx solid #D3832A;
+								padding:10upx 20upx;
+								box-sizing: border-box;
+								border-radius: 20upx;
+								color: #D3832A;
+								>view{
+									word-wrap: break-word;
+									word-break: break-all;
+								}
+							}
+						}
+						>.type1s{
+							display: flex;
+							align-items: flex-start;
 							justify-content: space-between;
 							margin-bottom: 20upx;
 							>view{

pagesHome/pages/lnventorysortinglist/lnventorysortinglist.vue

@@ -96,7 +96,7 @@
 	const date = ref<(string | number)[]>([])
 	onLoad((op) => {
 		details.pageType = op.type
-		details.scancode='HT20230800001'
+		details.scancode='HT20230800004'
 		scandata()
 		uni.$on('scancodedate', function(code) {
 			if (code) {

pagesHome/pages/scansorting/scansorting.vue

@@ -94,7 +94,7 @@
 	})
 	onLoad((op)=>{
 		details.pageType=op.type
-		details.scancode='HT20230800001'
+		details.scancode='HT20230800003'
 		scandata()
 		uni.$on('scancodedate', function(code) {
 			if (code) {

pagesHome/pages/signinScan/signinScan.vue

@@ -32,7 +32,7 @@
 							<text style="color: #90A0AF;">配送类型：</text>{{item?.type_name}}
 						</view>
 						<view>
-							<text style="color: #90A0AF;">配送装车：</text>{{item?.deliStatus_name}}
+							<text style="color: #90A0AF;">配送状态：</text>{{item?.deliStatus_name}}
 						</view>
 					</view>
 					<view class="type1s">
@@ -131,6 +131,9 @@
 		details.current=1
 		init()
 	})
+	onShow(()=>{
+		init()
+	})
 	function init(){
 		details.current=1
 		initpage()

unpackage/dist/build/app-plus/androidPrivacy.json

@@ -0,0 +1,3 @@
+{
+    "prompt" : "none"
+}

unpackage/dist/build/app-plus/manifest.json

@@ -45,6 +45,11 @@
     "nvueStyleCompiler": "uni-app",
     "compilerVersion": 3,
     "distribute": {
+      "splashscreen": {
+        "androidStyle": "common",
+        "useOriginalMsgbox": false,
+        "iosStyle": "common"
+      },
       "google": {
         "permissions": [
           "<uses-feature android:name=\"android.hardware.camera\"/>",
@@ -65,7 +70,8 @@
         ]
       },
       "apple": {
-        "dSYMs": false
+        "dSYMs": false,
+        "idfa": false
       },
       "plugins": {
         "geolocation": {

unpackage/dist/build/app-plus/pagesHome/pages/DownGoods/DownGoods.css

@@ -0,0 +1 @@
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.tbchec{width:21.4375rem;height:2.5rem;padding:.5rem 1.125rem;box-sizing:border-box;margin:auto;margin-top:.625rem;display:flex;align-items:center;justify-content:flex-start}.tbchec .xz>uni-view{color:#d3832a!important}.tbchec>uni-view{display:flex;align-items:center;justify-content:center;font-size:.875rem;font-weight:400;color:#90a0af}.tbchec>uni-view>uni-image{width:1.5rem;height:1.5rem;margin-right:.5rem}.viewbx{width:21.4375rem;background:#FFFFFF;border-radius:.625rem;position:relative;padding:.3125rem .625rem;box-sizing:border-box;margin:auto;margin-top:1.25rem}.viewbx .numvie{display:flex;align-items:center;font-size:.875rem;font-weight:400;color:#020b18;padding:.9375rem 0}.viewbx .numvie>uni-view:nth-of-type(1){width:6.25rem;display:flex;align-items:center;justify-content:center}.viewbx .vwtybx1{display:flex;flex-direction:column;align-items:flex-start;padding:.625rem 0;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.viewbx .vwtybx1>uni-view{display:flex;align-items:center;margin-bottom:.625rem}.viewbx .vwtybx1>uni-view:nth-last-child(1){margin-bottom:0}.viewbx .vwtybx1>uni-view>uni-view:nth-of-type(1){display:flex;align-items:center;width:6.25rem;font-size:.875rem;font-weight:400;color:#020b18}.viewbx .vwtybx1>uni-view>uni-view:nth-of-type(1)>uni-image{width:1.5rem;height:1.5rem;margin-right:.46875rem}.viewbx .vwtybx1>uni-view>uni-view:nth-of-type(2){font-size:.875rem;font-weight:400;color:#020b18}.viewbx .vwtybx1>uni-view>uni-view:nth-of-type(2)>uni-input{flex:1}.bgimg{position:absolute;left:0;top:0;width:100%}.scanqcview{display:flex;align-items:center;justify-content:center;position:relative;margin-top:.3125rem}.scanqcview>uni-image{width:2.25rem;height:2.25rem;margin-right:.5rem}.scanqcview>uni-view{font-size:1rem;font-weight:400;color:#fff}

unpackage/dist/build/app-plus/pagesHome/pages/DownGoodsType/DownGoodsType.css

@@ -0,0 +1 @@
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.pepleview{display:flex;flex-direction:column;align-items:center;padding-top:1.25rem}.pepleview .pepleietm{width:18.75rem;height:13.75rem;background:#FFFFFF;border-radius:.625rem;margin-bottom:.625rem;display:flex;align-items:center;justify-content:center;flex-direction:column;box-shadow:0 .25rem .625rem rgba(0,0,0,.1);font-size:1rem;font-weight:400;color:#020b18}.pepleview .pepleietm>uni-image{width:7.375rem;height:7.375rem;margin-bottom:1.25rem}.maxbxview{display:flex;flex-direction:column;align-items:center;margin-top:.9375rem}.maxbxview>.items{width:10.9375rem;height:3.125rem;display:flex;align-items:center;justify-content:center;border-radius:.3125rem;border:.03125rem solid #FA8C16;color:#fa8c16;font-size:.875rem;margin-bottom:1.5625rem;box-shadow:0 .25rem .625rem rgba(0,0,0,.1)}.maxbxview>.items:nth-last-child(1){margin-bottom:0}

unpackage/dist/build/app-plus/pagesHome/pages/PeopleScanUpType/PeopleScanUpType.css

@@ -0,0 +1 @@
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.pepleview{display:flex;flex-direction:column;align-items:center;padding-top:1.25rem}.pepleview .pepleietm{width:18.75rem;height:8.125rem;background:#FFFFFF;border-radius:.625rem;margin-bottom:.625rem;display:flex;align-items:center;justify-content:center;flex-direction:column;box-shadow:0 .25rem .625rem rgba(0,0,0,.1)}.pepleview .pepleietm>uni-image{width:5rem;height:5rem;margin-bottom:1.25rem}.maxbxview{display:flex;flex-direction:column;align-items:center;margin-top:.9375rem}.maxbxview>.items{width:10.9375rem;height:3.125rem;display:flex;align-items:center;justify-content:center;border-radius:.3125rem;border:.03125rem solid #FA8C16;color:#fa8c16;font-size:.875rem;margin-bottom:1.5625rem;box-shadow:0 .25rem .625rem rgba(0,0,0,.1)}.maxbxview>.items:nth-last-child(1){margin-bottom:0}

unpackage/dist/build/app-plus/pagesHome/pages/RelocationType/RelocationType.css

@@ -0,0 +1 @@
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.bgimg{position:absolute;left:0;top:0;width:100%}.maxbxview{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;margin-top:.9375rem;width:18.75rem;height:28.125rem;background:#FFFFFF;box-shadow:0 .25rem .625rem rgba(0,0,0,.1);border-radius:.625rem;opacity:1;margin:auto;margin-top:4.6875rem}.maxbxview .border{width:12.5rem;height:.0625rem;background:linear-gradient(90deg,rgba(211,131,42,0) 0%,#D3832A 53%,rgba(211,131,42,0) 100%);border-radius:0;opacity:1}.maxbxview>.items{width:100%;height:13.4375rem;display:flex;align-items:center;justify-content:center}.maxbxview>.items>uni-image{width:6.875rem;height:6.875rem;margin-right:1.875rem}

unpackage/dist/build/app-plus/pagesHome/pages/Retention/Retention.css

@@ -0,0 +1 @@
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.butys{display:flex;align-items:center;margin-top:.625rem;justify-content:space-around}.butys>.conf{width:10rem;height:3.125rem;border-radius:.625rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff;background-color:#d3832a}.butys>.qut{width:10rem;height:3.125rem;border-radius:.625rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#5a6875;background-color:#fff}.scvm{width:100%;height:74vh;margin-top:.625rem}.scvm .itembox{width:21.4375rem;border-radius:.625rem;padding:0 .625rem;box-sizing:border-box;background-color:#fff;margin:auto;margin-bottom:.625rem}.scvm .itembox>.topon1{display:flex;align-items:center;justify-content:space-between;padding:.625rem .3125rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvm .itembox>.topon1>uni-view:nth-of-type(1){width:1.5625rem;height:1.5625rem;background:#178AF220;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:.875rem;font-weight:500;color:#178af2}.scvm .itembox>.topon1>uni-view:nth-of-type(2){display:flex;align-items:center}.scvm .itembox>.topon1>uni-view:nth-of-type(2)>uni-view{width:4.25rem;height:2rem;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:.875rem;font-weight:400;color:#90a0af;background-color:#f5f5f6;margin-right:.625rem}.scvm .itembox>.topon1>uni-view:nth-of-type(2) .xzc{background-color:#178af2!important;color:#fff!important}.scvm .itembox>.topon1>uni-view:nth-of-type(2) .xze{background-color:#f8544b!important;color:#fff!important}.scvm .itembox>.topon1>uni-view:nth-of-type(2)>uni-image{width:2rem;height:2rem}.scvm .itembox>.topon2{display:flex;align-items:center;justify-content:flex-start;padding:.625rem .3125rem;box-sizing:border-box;border-bottom:.125rem solid #EEEEEE}.scvm .itembox>.topon2>uni-image{width:2rem;height:2rem;margin-right:.625rem}.scvm .itembox>.topon2>uni-view{font-size:.875rem;font-weight:400;color:#020b18}.topbox{width:100%;padding:.625rem 1rem;box-sizing:border-box;background-color:#fff}.topbox>.scanbox{display:flex;align-items:center;width:21.4375rem;height:2.5rem;background:#F5F5F6;border-radius:.25rem;box-sizing:border-box;padding:.625rem .9375rem;font-size:.875rem;color:#020b18}.topbox>.scanbox>uni-image{width:1rem;height:1rem;margin-right:.375rem}.topbox .viewboxs{display:flex;align-items:center;justify-content:space-between;margin-top:.625rem}.topbox .viewboxs>uni-view{font-size:.9375rem;font-weight:400;color:#020b18}.topbox .viewboxs .siz{font-size:.875rem}

unpackage/dist/build/app-plus/pagesHome/pages/ScanUpType/ScanUpType.css

@@ -0,0 +1 @@
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.pepleview{display:flex;flex-direction:column;align-items:center;padding-top:1.25rem}.pepleview .pepleietm{width:18.75rem;height:8.125rem;background:#FFFFFF;border-radius:.625rem;margin-bottom:.625rem;display:flex;align-items:center;justify-content:center;flex-direction:column;box-shadow:0 .25rem .625rem rgba(0,0,0,.1)}.pepleview .pepleietm>uni-image{width:5rem;height:5rem;margin-bottom:1.25rem}.maxbxview{display:flex;flex-direction:column;align-items:center;margin-top:.9375rem}.maxbxview>.items{width:10.9375rem;height:3.125rem;display:flex;align-items:center;justify-content:center;border-radius:.3125rem;border:.03125rem solid #FA8C16;color:#fa8c16;font-size:.875rem;margin-bottom:1.5625rem;box-shadow:0 .25rem .625rem rgba(0,0,0,.1)}.maxbxview>.items:nth-last-child(1){margin-bottom:0}

unpackage/dist/build/app-plus/pagesHome/pages/lnventorysorting/lnventorysorting.css

@@ -1 +1 @@
-.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.bgimg{position:absolute;left:0;top:0;width:100%}.maxbxview{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;margin-top:.9375rem;width:18.75rem;height:28.125rem;background:#FFFFFF;box-shadow:0 .25rem .625rem rgba(0,0,0,.1);border-radius:.625rem;opacity:1;margin:auto;margin-top:4.6875rem}.maxbxview .border{width:12.5rem;height:.0625rem;background:linear-gradient(90deg,rgba(211,131,42,0) 0%,#D3832A 53%,rgba(211,131,42,0) 100%);border-radius:0;opacity:1}.maxbxview>.items{height:12.5rem;display:flex;align-items:center;justify-content:center}.maxbxview>.items>uni-image{width:6.875rem;height:6.875rem;margin-right:1.875rem}
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.bgimg{position:absolute;left:0;top:0;width:100%}.maxbxview{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;margin-top:.9375rem;width:18.75rem;height:28.125rem;background:#FFFFFF;box-shadow:0 .25rem .625rem rgba(0,0,0,.1);border-radius:.625rem;opacity:1;margin:auto;margin-top:4.6875rem}.maxbxview .border{width:12.5rem;height:.0625rem;background:linear-gradient(90deg,rgba(211,131,42,0) 0%,#D3832A 53%,rgba(211,131,42,0) 100%);border-radius:0;opacity:1}.maxbxview>.items{width:100%;height:13.4375rem;display:flex;align-items:center;justify-content:center}.maxbxview>.items>uni-image{width:6.875rem;height:6.875rem;margin-right:1.875rem}

unpackage/dist/build/app-plus/pagesHome/pages/ordersorting/ordersorting.css

@@ -1 +1 @@
-.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.bgimg{position:absolute;left:0;top:0;width:100%}.maxbxview{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;margin-top:.9375rem;width:18.75rem;height:28.125rem;background:#FFFFFF;box-shadow:0 .25rem .625rem rgba(0,0,0,.1);border-radius:.625rem;opacity:1;margin:auto;margin-top:4.6875rem}.maxbxview .border{width:12.5rem;height:.0625rem;background:linear-gradient(90deg,rgba(211,131,42,0) 0%,#D3832A 53%,rgba(211,131,42,0) 100%);border-radius:0;opacity:1}.maxbxview>.items{height:12.5rem;display:flex;align-items:center;justify-content:center}.maxbxview>.items>uni-image{width:6.875rem;height:6.875rem;margin-right:1.875rem}
+.u-status-bar[data-v-e5b317dd]{width:100%}uni-view[data-v-28bc635f],uni-scroll-view[data-v-28bc635f],uni-swiper-item[data-v-28bc635f]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-28bc635f]{display:flex;align-items:center}.u-icon--left[data-v-28bc635f]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-28bc635f]{flex-direction:row;align-items:center}.u-icon--top[data-v-28bc635f]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-28bc635f]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-28bc635f]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-28bc635f]{color:#3c9cff}.u-icon__icon--success[data-v-28bc635f]{color:#5ac725}.u-icon__icon--error[data-v-28bc635f]{color:#f56c6c}.u-icon__icon--warning[data-v-28bc635f]{color:#f9ae3d}.u-icon__icon--info[data-v-28bc635f]{color:#909399}.u-icon__img[data-v-28bc635f]{height:auto;will-change:transform}.u-icon__label[data-v-28bc635f]{line-height:1}uni-view[data-v-a05cfecf],uni-scroll-view[data-v-a05cfecf],uni-swiper-item[data-v-a05cfecf]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-navbar--fixed[data-v-a05cfecf]{position:fixed;left:0;right:0;top:0;z-index:11}.u-navbar__content[data-v-a05cfecf]{display:flex;flex-direction:row;align-items:center;height:44px;background-color:#9acafc;position:relative;justify-content:center}.u-navbar__content__left[data-v-a05cfecf],.u-navbar__content__right[data-v-a05cfecf]{padding:0 13px;position:absolute;top:0;bottom:0;display:flex;flex-direction:row;align-items:center}.u-navbar__content__left[data-v-a05cfecf]{left:0}.u-navbar__content__left--hover[data-v-a05cfecf]{opacity:.7}.u-navbar__content__left__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.u-navbar__content__title[data-v-a05cfecf]{text-align:center;font-size:16px;color:#303133}.u-navbar__content__right[data-v-a05cfecf]{right:0}.u-navbar__content__right__text[data-v-a05cfecf]{font-size:15px;margin-left:3px}.bgimg{position:absolute;left:0;top:0;width:100%}.maxbxview{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;margin-top:.9375rem;width:18.75rem;height:28.125rem;background:#FFFFFF;box-shadow:0 .25rem .625rem rgba(0,0,0,.1);border-radius:.625rem;opacity:1;margin:auto;margin-top:4.6875rem}.maxbxview .border{width:12.5rem;height:.0625rem;background:linear-gradient(90deg,rgba(211,131,42,0) 0%,#D3832A 53%,rgba(211,131,42,0) 100%);border-radius:0;opacity:1}.maxbxview>.items{width:100%;height:13.4375rem;display:flex;align-items:center;justify-content:center}.maxbxview>.items>uni-image{width:6.875rem;height:6.875rem;margin-right:1.875rem}