新增托盘和库位查询

api/user.js

@@ -543,7 +543,7 @@ export function signforZeroSignfor(data, loadingObj = {}) {
 	);
 }
 /**
- * 签收订制品详情
+ * 签收定制品详情
  * @param {Object} data
  */
 export function signforwrap(data, loadingObj = {}) {
@@ -627,7 +627,7 @@ export function deliveryloadinginventory(data, loadingObj = {}) {
 	);
 }
 /**
- * 客户签收订制品扫描
+ * 客户签收定制品扫描
  * @param {Object} data
  */
 export function signforsignfor(data, loadingObj = {}) {
@@ -1833,6 +1833,36 @@ export function distributionOrderInfoInQuery(data, loadingObj = {}) {
 	);
 }
 
+/**
+ * 库位详情查询
+ * @param {Object} data
+ */
+export function postFindAllocationData(data, loadingObj = {}) {
+
+	return request({
+			url: `logpm-warehouse/api/warehouseUpdownType/findAllocationData`,
+			method: "post",
+			data
+		},
+		loadingObj
+	);
+}
+
+/**
+ * 托盘详情查询
+ * @param {Object} data
+ */
+export function postFindTrayData(data, loadingObj = {}) {
+
+	return request({
+			url: `logpm-warehouse/api/warehouseTrayType/findTrayData`,
+			method: "post",
+			data
+		},
+		loadingObj
+	);
+}
+
 /**
  * 批量打印包件
  * @param {Object} ids

config/host.js

@@ -8,16 +8,16 @@
 // lmy
 // const devhost = 'http://192.168.10.123:8889/'
 // zhy
-const devhost = 'http://192.168.10.48:13000/'
+// const devhost = 'http://192.168.10.48:13000/'
 // tjj
 // const devhost = 'http://192.168.10.25:13000/'
 // cyz
-// const devhost = 'http://192.168.6.148:9777/'
+// const devhost = 'http://192.168.6.161:9777/'
 // const devhost = 'http://192.168.6.141:8777/'
 // cg
 // const devhost = 'http://192.168.10.57:13000/'
 // 正式
-// const devhost = 'https://h5uapi.huitongys.com/'
+const devhost = 'https://h5uapi.huitongys.com/'
 // cg
 // const devhost = 'http://192.168.10.200:13000/'
 /**

interfaces/pagesHome/StockUplist.ts

@@ -4,7 +4,7 @@ export interface detailType {
 	 * */
 	reservationId : string | number;
 	/**
-	 * 备货客户列表 订制品
+	 * 备货客户列表 定制品
 	 * */
 	orderList : any;
 	/**

pages.json

@@ -210,6 +210,25 @@
 						}
 					}
 
+				},
+				{
+					"path": "pages/PickUpLotList/PickUpLotList",
+					"style": {
+						"navigationBarTitleText": "提货批次列表",
+						"enablePullDownRefresh": true,
+						"onReachBottomDistance": 1,
+						"navigationStyle": "custom",
+						"app-plus": {
+							"animationDuration": 300,
+							"animationType": "zoom-fade-out",
+							"pullToRefresh": {
+								"support": true,
+								"color": "#d3832a", //小圈圈的颜色
+								"style": "circle" //小圈圈的样式
+							}
+						}
+					}
+
 				},
 				{
 					"path": "pages/ArrivalList/ArrivalList",
@@ -1168,7 +1187,46 @@
 						}
 					}
 
-				}, {
+				},
+				{
+					"path": "pages/storageInquiry/storageInquiry",
+					"style": {
+						"navigationBarTitleText": "库位查询",
+						"enablePullDownRefresh": true,
+						"onReachBottomDistance": 1,
+						"navigationStyle": "custom",
+						"app-plus": {
+							"animationDuration": 300,
+							"animationType": "zoom-fade-out",
+							"pullToRefresh": {
+								"support": true,
+								"color": "#d3832a", //小圈圈的颜色
+								"style": "circle" //小圈圈的样式
+							}
+						}
+					}
+
+				},
+				{
+					"path": "pages/trayInquiry/trayInquiry",
+					"style": {
+						"navigationBarTitleText": "托盘查询",
+						"enablePullDownRefresh": true,
+						"onReachBottomDistance": 1,
+						"navigationStyle": "custom",
+						"app-plus": {
+							"animationDuration": 300,
+							"animationType": "zoom-fade-out",
+							"pullToRefresh": {
+								"support": true,
+								"color": "#d3832a", //小圈圈的颜色
+								"style": "circle" //小圈圈的样式
+							}
+						}
+					}
+
+				},
+				{
 					"path": "pages/CustomerTrayDetails/CustomerTrayDetails",
 					"style": {
 						"navigationBarTitleText": "客户托盘扫描",

pages/index/index.vue

@@ -52,6 +52,16 @@
 	// 					name: '订单查询',
 	// 					router: '/pagesHome/pages/orderInquiry/orderInquiry',
 	// 				},
+	// 				{
+	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+	// 					name: '库位查询',
+	// 					router: '/pagesHome/pages/storageInquiry/storageInquiry',
+	// 				},
+	// 				{
+	// 					icon: 'http://htys.oss-cn-chengdu.aliyuncs.com/htys/afb031efec7d2f8620ee68c71f87a80e.png',
+	// 					name: '托盘查询',
+	// 					router: '/pagesHome/pages/trayInquiry/trayInquiry',
+	// 				},
 	// 			]
 	// 		},
 	// 		{

pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.vue

@@ -32,7 +32,7 @@
 					</view>
 					<view>
 						<view>装车件数</view>
-						<view>{{scannedNumber}}</view>
+						<view>{{details.scannedNumber}}</view>
 					</view>
 				</view>
 			</view>
@@ -122,7 +122,9 @@
 		datalist: [],
 		items: {} as any,
 		scancode: '',
-		authbuts: uni.getStorageSync('authbuts')
+		authbuts: uni.getStorageSync('authbuts'),
+		/** 装车件数 */
+		scannedNumber: 0
 	})
 	const tip = ref(null)
 	const tiplists = ref(null)
@@ -170,7 +172,6 @@
 	const scannedNumber = computed(() => {
 		let num = 0
 		details.datalist.forEach(item => {
-			console.log('item.loadingNub :>> ', item.loadingNub);
 			num += Number(item.loadingNub)
 		})
 		return num
@@ -233,16 +234,16 @@
 	barcode: details.scancode 
 	 */
 
-	/** 扫描订制品 */
+	/** 扫描定制品 */
 	const scanOrder = async (loadingId) => {
-		let data = {
+		let submitData = {
 			deliveryId: details.id,
 			loadingId,
 			type: 1,
 			barcode: details.scancode
 		}
-		let res = await deliveryloadingscan(data)
+		let res = await deliveryloadingscan(submitData)
-		const { code, audio } = res
+		const { code, data, audio } = res
 
 		// 异常装车
 		if (code === 5000) {
@@ -251,8 +252,9 @@
 		// 窜货
 		if (code === 3001) utils.ttsspke(audio)
 
-		if (code !== 200) return
+		if (code !== 200 || !data) return
-		basicContainer.value.startPullDownRefresh()
+		// basicContainer.value.startPullDownRefresh()
+		details.scannedNumber = Number(data)
 	}
 
 	/** 扫描库存品 */
@@ -293,7 +295,13 @@
 			let response = await deliverycustom(data)
 			if (response.code !== 200) return
 			console.log('response', response)
-			details.datalist = response.data
+			details.datalist = response.data || []
+
+			details.scannedNumber = 0
+
+			details.datalist.forEach(item => {
+				details.scannedNumber += Number(item.loadingNub)
+			})
 		} catch (e) {
 			//TODO handle the exception
 		} finally {

pagesHome/pages/PickUpLotList/PickUpLotList.vue

@@ -0,0 +1,18 @@
+<template>
+	<BasicContainer :option="option">
+		<template #head>123</template>
+
+		<template #body>333</template>
+	</basicContainer>
+</template>
+
+<script setup lang="ts">
+	import { ref, reactive } from 'vue';
+	const option = reactive({
+		title: '提货批次列表',
+		haveData: true
+	})
+</script>
+
+<style lang="scss" scoped>
+</style>

pagesHome/pages/RemoveTray/RemoveTray.vue

@@ -17,7 +17,7 @@
 	<!-- tabBar -->
 	<view class="tabBar">
 		<view :class="{'tabBar_item': true, 'active': details.tabBarState === 1}" @click="setTabBarState(1)">
-			订制品
+			定制品
 		</view>
 		<view :class="{'tabBar_item': true, 'active': details.tabBarState === 2}" @click="setTabBarState(2)">
 			零担

pagesHome/pages/ScanSortingType/ScanSortingType.vue

@@ -1,6 +1,6 @@
 <template>
-	<u-navbar :title="pageType==1?'扫描分拣':'人工分拣'" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff'
+	<u-navbar title="分拣方式" bgColor='#D3832A' leftIconColor='#ffffff' titleStyle='color:#ffffff' placeholder
-		placeholder :autoBack="true" leftIconSize='35'></u-navbar>
+		:autoBack="true" leftIconSize='35'></u-navbar>
 	<view class="maxbxview">
 		<view class="items" @click="gotourl(item)" v-for="item in typelist">
 			<image :src="item.src"></image>
@@ -18,10 +18,14 @@
 		onUnload
 	} from '@dcloudio/uni-app'
 	import { ref } from "vue";
+	import { useRoute } from 'vue-router';
 	import utils from '@/utils/utils.js';
 	let typelist = ref<{ type : number, name : string, src : string }[]>([])
 	let pageType = ref<string | number>('')
 	let trayCode = ref<string>('')
+
+	const $route = useRoute()
+
 	onShow(() => {
 		// #ifdef APP
 		uni.$off('scancodedate')
@@ -31,6 +35,8 @@
 	onLoad((op) => {
 		trayCode.value = op.trayCode
 
+		console.log('$route.query :>> ', $route.query);
+
 		typelist.value = [
 			{ type: 1, name: '服务号', src: '/pagesHome/static/scicon1.png' },
 			{ type: 2, name: '订单自编码', src: '/pagesHome/static/scicon2.png' },
@@ -71,13 +77,15 @@
 	function gotourl(item : any) {
 		let url = ''
 		console.log('item>>>>>>>', item);
-		url = '/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode='
+
+		const SkipRoute = $route.query.SkipRoute
+
+		console.log('SkipRoute :>> ', SkipRoute);
+
+		url = '/pagesHome/pages' + (SkipRoute ? SkipRoute : '/OrderSortingDetail/OrderSortingDetail') + '?trayCode='
 			+ trayCode.value + '&trayType=' + item.dictKey + '&pageName=' + item.name
 
-		if (Number(pageType.value) == 2) {
+
-			url = '/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail?trayCode='
-				+ trayCode.value + '&trayType=' + item.dictKey + '&pageName=' + item.name
-		}
 		uni.redirectTo({
 			url
 		})

pagesHome/pages/StowageListDetails/StowageListDetails.vue

@@ -577,7 +577,7 @@
 	}
 
 	/** 
-	 * 请求订制品和零担详情
+	 * 请求定制品和零担详情
 	 */
 	const handleDetails = async (item : any, index : number, type : number) => {
 		console.log('item :>> ', item);

pagesHome/pages/codePlateBracket/codePlateBracket.vue

@@ -8,6 +8,7 @@
 				</view>
 				<view @click="scandata">查询</view>
 			</view>
+
 			<view class="schbox">
 				<view>分拣日期：</view>
 				<view @click='showCalendar' class="inputsr">
@@ -21,20 +22,6 @@
 				</view>
 			</view>
 
-			<!-- 是否装车 -->
-			<view class="choose_container">
-				<view class="uni-list-cell-db">
-					<picker @change="bindPickerChange" :value="details.scanStateChooseIndex"
-						:range="details.scanStateList.map(val => val.title)">
-						<view class="uni-input">{{details.scanStateList.map(val => val.title)[details.scanStateChooseIndex]}}
-						</view>
-					</picker>
-				</view>
-				<view class=""></view>
-				<view class="uni-list-cell-left">
-					<u-icon name="arrow-right" color="#000"></u-icon>
-				</view>
-			</view>
 
 		</template>
 
@@ -134,29 +121,29 @@
 		title: '已经打托列表',
 		// 下拉刷新回调函数
 		async pullDownRefreshInitPage() {
-			// 重置页码
+			// // 重置页码
-			details.pageNum = 1
+			// details.pageNum = 1
-			// 重置渲染列表
+			// // 重置渲染列表
-			details.datalist = []
+			// details.datalist = []
-			// 重置渲染列表数据请求是否结束状态
+			// // 重置渲染列表数据请求是否结束状态
-			option.isEnd = false
+			// option.isEnd = false
-			// 重置是否有数据
+			// // 重置是否有数据
-			option.haveData = true
+			// option.haveData = true
-			await initpage()
+			// await initpage()
-			if (datalist.value.length === 0) {
+			// if (datalist.value.length === 0) {
-				uni.showToast({
+			// 	uni.showToast({
-					title: '暂时没有数据',
+			// 		title: '暂时没有数据',
-					icon: 'error'
+			// 		icon: 'error'
-				})
+			// 	})
-				option.haveData = false
+			// 	option.haveData = false
-			}
+			// }
-			if (option.isEnd) {
+			// if (option.isEnd) {
-				return uni.showToast({
+			// 	return uni.showToast({
-					icon: 'success',
+			// 		icon: 'success',
-					title: '数据已加载完毕'
+			// 		title: '数据已加载完毕'
-				})
+			// 	})
-			}
+			// }
-			return null
+			// return null
 		},
 		// 触底加载回到函数
 		reachBottomInitPage: async () => { return null },
@@ -183,17 +170,12 @@
 				clearTimeout(antiShake)
 				return antiShake = null
 			}
-			// 显示Loading, 并阻止点击屏幕
+
-			uni.showLoading({
-				title: '正在加载',
-				mask: true
-			})
 			antiShake = setTimeout(async () => {
 				// 触发触底回调
 				details.pageNum += 1
 				const res = await initpage()
-				// 关闭loading效果
+
-				uni.hideLoading()
 				// 清空定时器
 				antiShake = null
 				// 当返回数据数组长度小于每页数量时, 数据请求完毕
@@ -206,7 +188,7 @@
 					return option.isEnd = true
 				}
 				clearTimeout(antiShake)
-			}, 500)
+			}, 300)
 		} catch (err) {
 			//TODO handle the exception
 			console.log('err :>> ', err);
@@ -220,10 +202,7 @@
 		pageNum: 1,
 		pageSize: 10,
 		datalist: [],
-		scancode: '',
+		scancode: ''
-		scanStateList: [{ title: '未装车', value: 1 }, { title: '已装车', value: 2 }],
-		// 选中的索引 -- 默认为关闭
-		scanStateChooseIndex: 0
 	})
 	onLoad((op) => {
 		details.pageType = op.type
@@ -247,7 +226,6 @@
 			}
 		})
 		// #endif
-		initpage()
 	})
 	// onHide(() => {
 	// 	uni.$off('scancodedate')
@@ -266,10 +244,10 @@
 
 		console.log('res', res);
 		if (Number(res.data.isHasData) === 0) {
-			utils.ttsspke('请选择分拣方式')
+			// utils.ttsspke('请选择分拣方式')
 			uni.setStorageSync('trayCodeType', res.data.data)
 			uni.navigateTo({
-				url: '/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=' + details.scancode
+				url: '/pagesHome/pages/ScanSortingType/ScanSortingType?trayCode=' + details.scancode + '&SkipRoute=/ScanUp/ScanUp'
 			})
 		} else {
 			uni.navigateTo({
@@ -303,17 +281,10 @@
 	function goorderdetail(item : any) {
 		// 去详情页
 		uni.navigateTo({
-			url: '/pagesHome/pages/OrderSortingDetail/OrderSortingDetail?trayCode='
+			url: '/pagesHome/pages/PickUpLotList/PickUpLotList?trayCode='
 				+ item.trayCode + '&trayType='
 				+ item.trayType
 		})
-		if (Number(details.pageType) == 2) {
-			uni.navigateTo({
-				url: '/pagesHome/pages/PeopleSortingDetail/PeopleSortingDetail?trayCode='
-					+ item.trayCode + '&trayType='
-					+ item.trayType
-			})
-		}
 	}
 	function showCalendar() {
 		details.show = !details.show
@@ -338,15 +309,6 @@
 		date.value = []
 		init()
 	}
-
-	/**
-	 * 处理扫描后台监听状态
-	 */
-	function bindPickerChange(e) {
-		console.log('picker发送选择改变，携带值为', e.detail.value)
-		details.scanStateChooseIndex = e.detail.value
-	}
-
 	const {
 		show,
 		datatime,
@@ -355,7 +317,7 @@
 	} = toRefs(details)
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.inputsr {
 		width: 550upx !important;
 		height: 75upx;
@@ -487,9 +449,9 @@
 							align-items: center;
 							font-size: 28upx;
 
-							&:nth-of-type(1) {
+							// &:nth-of-type(1) {
-								margin-bottom: 20upx;
+							// 	margin-bottom: 20upx;
-							}
+							// }
 
 							>view:nth-of-type(1) {
 								width: 180upx;
@@ -508,7 +470,7 @@
 
 					.numbox {
 						width: 686upx;
-						height: 160upx;
+						height: 140upx;
 						background: #F5F7FB;
 						border-radius: 8upx;
 						display: flex;
@@ -526,7 +488,7 @@
 								font-size: 28upx;
 								font-weight: 400;
 								color: #AFB4BA;
-								margin-bottom: 20upx;
+								margin-bottom: 10upx;
 							}
 
 							>view:nth-of-type(2) {
@@ -577,33 +539,3 @@
 		}
 	}
 </style>
-
-<style lang='scss' scoped>
-	.choose_container {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20upx;
-		background: #fff;
-		margin-top: 5upx;
-		position: relative;
-
-		.uni-list-cell-db {
-			position: absolute;
-			top: 0;
-			left: 0;
-			flex: 1;
-			padding-left: 20upx;
-			width: 100vw;
-			height: 100%;
-			/* text-align: right; */
-			box-sizing: border-box;
-			display: flex;
-			align-items: center;
-
-			&>uni-picker {
-				width: 100%;
-			}
-		}
-	}
-</style>

pagesHome/pages/orderInquiry/orderInquiry.vue

@@ -82,14 +82,14 @@
 		<view class="orderInfo">
 			<view class="title">
 				<view @click="showArticleMadeToOrderModule" :class="{'active': showArticleMadeToOrder}">
-					订制品(<text class="title__number">{{packageList.length}}</text>件)
+					定制品(<text class="title__number">{{packageList.length}}</text>件)
 				</view>
 				<view @click="showArticleMadeToOrder = false" :class="{'active': !showArticleMadeToOrder}">
 					库存品(<text class="title__number">{{stockList.length}}</text>件)
 				</view>
 			</view>
 
-			<!-- 订制品 -->
+			<!-- 定制品 -->
 			<view class="packagesList" v-if="packageList.length !== 0 && showArticleMadeToOrder">
 				<view v-if="!isBatchOperation">
 					<view class="batchOperationBtn" @click="batchOperationBtn">批量操作</view>
@@ -222,7 +222,7 @@
 	// 是否开启批量操作
 	const isBatchOperation = ref<Boolean>(false)
 
-	// 是否显示订制品
+	// 是否显示定制品
 	const showArticleMadeToOrder = ref<Boolean>(true)
 
 	// 扫码码值
@@ -366,7 +366,7 @@
 		}
 	}
 
-	// 显示订制品模块
+	// 显示定制品模块
 	function showArticleMadeToOrderModule() {
 		showArticleMadeToOrder.value = true
 		isBatchOperation.value = false

pagesHome/pages/storageInquiry/storageInquiry.vue

@@ -0,0 +1,693 @@
+<template>
+	<!-- 顶部导航栏 -->
+	<u-navbar title="库位查询" placeholder :autoBack="true" leftIconSize='35' bgColor='#d3832a' leftIconColor='#ffffff'
+		titleStyle='color:#ffffff'></u-navbar>
+
+	<!-- 头部 -->
+	<!-- 	<view class="tabBar_top">
+		<view @click="handleTabBarState(1)" :class="{'active': tabBarCode === 1}">
+			库位查询
+		</view>
+		<view @click="handleTabBarState(2)" :class="{'active': tabBarCode === 2}">
+			托盘查询
+		</view>
+		<view @click="handleTabBarState(3)" :class="{'active': tabBarCode === 3}">
+			订单查询
+		</view>
+	</view> -->
+
+	<view class="container">
+		<!-- 顶部搜索栏 -->
+		<view class="header-search">
+			<view class="search">
+				<input class="searchInput" v-model="scancode" type="text">
+			</view>
+
+			<view class="search">
+				<view class="searchType" @click="scandata">
+					搜索
+				</view>
+
+			</view>
+		</view>
+
+		<view class="orderInfo">
+			<!-- 库位数据 -->
+			<view class="orderInfo_title">
+				<view class="">
+					<text class="row_title1">
+						库位：
+					</text>
+					{{info.positionCode || '暂无数据'}}
+				</view>
+
+				<view class="orderInfo_title_row">
+					<view class="">
+						<view class="row_title1">
+							托盘名称：
+						</view>
+						<view>
+							{{info.trayInfo.palletName || '暂无数据'}}
+						</view>
+					</view>
+
+					<view class="">
+						<view class="row_title2">
+							托盘码：
+						</view>
+						<view class="">
+							{{info.trayInfo.palletCode || '暂无数据'}}
+						</view>
+					</view>
+				</view>
+
+				<view class="orderInfo_title_row">
+					<view class="">
+						<text class="row_title1">
+							包件数：
+						</text>
+						{{info.totalNum || 0}}
+					</view>
+
+					<view class="">
+						<text class="row_title2">
+							订单包件总数：
+						</text>
+						{{info.orderTotalNum || 0}}
+					</view>
+				</view>
+
+				<view class="orderInfo_title_row">
+					<view class="">
+						<text class="row_title1">
+							库存品数：
+						</text>
+						{{info.stockNum || 0}}
+					</view>
+
+					<view class="">
+						<text class="row_title2">
+							库存品订单总数：
+						</text>
+						{{info.stockTotalNum || 0}}
+					</view>
+				</view>
+			</view>
+
+			<view class="title">
+				<view @click="handleTabBarState(1)" :class="{'active': tabBarCode === 1}">
+					定制品
+				</view>
+				<view @click="handleTabBarState(2)" :class="{'active': tabBarCode === 2}">
+					零担
+				</view>
+				<view @click="handleTabBarState(3)" :class="{'active': tabBarCode === 3}">
+					库存品
+				</view>
+			</view>
+
+			<!-- 定制品 -->
+			<view class="packagesList" v-if="tabBarCode === 1">
+				<!-- 控件 -->
+				<view class="control">
+					<view v-if="!isBatchOperation">
+						<view class="batchOperationBtn" @click="isBatchOperation = true">批量操作</view>
+					</view>
+					<view v-else style="display: flex;">
+						<view class="batchOperationBtn" @click="batchPrint">打印</view>
+					</view>
+				</view>
+
+				<scroll-view scroll-y="true" style="height: 60vh; margin-top: 10px;">
+					<uni-table type="selection" border stripe emptyText="暂无更多数据"
+						@selection-change="({detail: {index}})=> selectionChange(index, 'order')">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="left">包条码</uni-th>
+							<uni-th align="left">合同号</uni-th>
+							<uni-th align="left">运单号</uni-th>
+							<uni-th align="left">仓库</uni-th>
+							<uni-th align="left">数量</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<block v-for="item in packageList">
+							<uni-tr>
+								<!-- 包条码 -->
+								<uni-td>{{item.orderPackageCode}}</uni-td>
+								<!-- 合同号 -->
+								<uni-td>{{item.orderCode}}</uni-td>
+								<!-- 运单号 -->
+								<uni-td>{{item.waybillNo}}</uni-td>
+								<!-- 仓库 -->
+								<uni-td>{{item.warehouseName}}</uni-td>
+								<!-- 数量 -->
+								<uni-td>{{item.num}}</uni-td>
+							</uni-tr>
+						</block>
+
+					</uni-table>
+				</scroll-view>
+			</view>
+
+			<!-- 零担 -->
+			<view class="packagesList" v-else-if="tabBarCode === 2">
+				<scroll-view scroll-y="true" style="height: 60vh; margin-top: 10px;">
+					<uni-table type="selection" border stripe emptyText="暂无更多数据"
+						@selection-change="({detail: {index}})=>selectionChange(index, 'zero')">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="left">运单号</uni-th>
+							<uni-th align="left">合同号</uni-th>
+							<uni-th align="left">仓库</uni-th>
+							<uni-th align="center">数量</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<block v-for="item in zeroList">
+							<uni-tr>
+								<!-- 运单号 -->
+								<uni-td>{{item.waybillNo}}</uni-td>
+								<!-- 合同号 -->
+								<uni-td>{{item.orderCode}}</uni-td>
+								<!-- 仓库 -->
+								<uni-td>{{item.warehouseName}}</uni-td>
+								<!-- 数量 -->
+								<uni-td align="center">{{item.num}}</uni-td>
+							</uni-tr>
+						</block>
+					</uni-table>
+				</scroll-view>
+			</view>
+
+			<!-- 库存品 -->
+			<view class="packagesList" v-else-if="tabBarCode === 3">
+				<scroll-view scroll-y="true" style="height: 60vh; margin-top: 10px;">
+					<uni-table type="selection" border stripe emptyText="暂无更多数据"
+						@selection-change="({detail: {index}})=>selectionChange(index, 'stock')">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="left">批次号</uni-th>
+							<uni-th align="left">物料编码</uni-th>
+							<uni-th align="left">物料名称</uni-th>
+							<uni-th align="left">商场名称</uni-th>
+							<uni-th align="center">仓库</uni-th>
+							<uni-th align="center">在库数</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<block v-for="item in stockList">
+							<uni-tr>
+								<!-- 批次号 -->
+								<uni-td>{{item.incomingBatch}}</uni-td>
+								<!-- 物料编码 -->
+								<uni-td>{{item.materialCode}}</uni-td>
+								<!-- 物料名称 -->
+								<uni-td>{{item.materialName}}</uni-td>
+								<!-- 商场名称 -->
+								<uni-td>{{item.marketName}}</uni-td>
+								<!-- 仓库 -->
+								<uni-td>{{item.warehouseName}}</uni-td>
+								<!-- 数量 -->
+								<uni-td align="center">{{item.num}}</uni-td>
+							</uni-tr>
+						</block>
+					</uni-table>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+	<tiplist ref="tiplists"></tiplist>
+	<!-- #ifdef APP -->
+	<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
+	<!-- #endif -->
+	<BluetoothList ref="bluetoothList"></BluetoothList>
+</template>
+
+<script lang="ts" setup>
+	import { ref, reactive, shallowRef, watch, nextTick, computed } from 'vue';
+	import {
+		onShow,
+		onHide,
+		onLoad,
+		onReachBottom,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+	import utils from '@/utils/utils.js';
+	import {
+		postFindAllocationData,
+		BatchPrintPackages
+	} from '@/api/user.js'
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	import useSystemSettingsStore from '@/store/useSystemSettingsStore';
+	import { storeToRefs } from 'pinia';
+	const { scanState } = storeToRefs(useSystemSettingsStore())
+	const bluetoothList = ref(null)
+	const bluetoothStore = useBluetoothStore()
+	const { bluetoothInfo } = storeToRefs(bluetoothStore)
+
+	// 订单详情
+	const dataInfo = shallowRef<any>({})
+
+	/** 是否开启批量操作 */
+	const isBatchOperation = ref<Boolean>(false)
+
+	/** 是否显示定制品 */
+	const showArticleMadeToOrder = ref<Boolean>(true)
+
+	/** 扫码码值 */
+	const scancode = ref<string>('')
+
+	/** 包件列表 */
+	const packageList = shallowRef([])
+
+	/** 零担列表 */
+	const zeroList = shallowRef([])
+
+	/** 库存品列表 */
+	const stockList = shallowRef([])
+
+	/** 详情 */
+	const info = ref<any>({ trayInfo: {} })
+
+	// 订单状态字典
+	const orderStateDictionaries = reactive({
+		'10': '部分入库',
+		'20': '已入库',
+		'30': '部分出库',
+		'40': '已出库',
+		'50': '部分装车',
+		'60': '已装车',
+		'70': '部分签收',
+		'80': '已签收',
+	})
+
+	/** tabBar 激活 */
+	const tabBarCode = ref(1)
+
+	/** 修改物料表单 */
+	const form = ref({})
+
+	/** 复选框选中的数据 */
+	const selectionList = ref([])
+
+	// 组件实例
+	const tiplists = ref(null)
+
+
+	onLoad(() => {
+		// #ifdef APP
+		utils.ttsspke('库位查询, 请扫描或输入库位码')
+		// #endif
+	})
+
+	// 开启监听扫描
+	onShow(async () => {
+		// #ifdef APP
+		uni.$off('scancodedate')
+		uni.$on('scancodedate', function (code) {
+			if (code) {
+				scancode.value = code
+
+				scandata()
+			}
+		})
+		// #endif
+	})
+
+	onPullDownRefresh(() => {
+		const timer = setTimeout(() => {
+			dataInfo.value = {}
+			scancode.value = ''
+			packageList.value = []
+
+			uni.stopPullDownRefresh()
+			clearTimeout(timer)
+		}, 300)
+	})
+
+	async function scandata() {
+		const res = await postFindAllocationData({ allocationId: scancode.value })
+		console.log('res :>> ', res);
+		const { code, data } = res
+
+		if (code !== 200 || !data) return
+
+		// 库位信息
+		info.value = data.updownTypeEntity || {}
+
+		// 库位托盘信息
+		info.value.trayInfo = data.trayEntity || {}
+
+		// 定制品
+		packageList.value = data.packageList
+
+		// 零担
+		zeroList.value = data.zeroOrderList
+
+		// 库存品
+		stockList.value = data.stockOrderList
+	}
+
+	/** 设置tabBar激活状态 */
+	const handleTabBarState = (code) => {
+		selectionList.value = []
+		tabBarCode.value = code
+	}
+
+	/** 复选框改变时 */
+	const selectionChange = (list : [], type : string) => {
+		console.log('list :>> ', list);
+		selectionList.value = list
+	}
+
+	/** 打印 */
+	const batchPrint = async () => {
+		if (selectionList.value.length === 0) return uni.showToast({
+			title: '最少选择一条数据',
+			icon: 'none'
+		})
+
+		const _idsArr = []
+
+		for (let i = 0; i < selectionList.value.length; i++) {
+			// selectionList内存储的是被选中的索引
+			const index = selectionList.value[i]
+			_idsArr.push(packageList.value[index].packageId)
+		}
+
+		const idsValue = _idsArr.join(',')
+
+		const res = await BatchPrintPackages(idsValue)
+		const { code, data } = res
+		if (code !== 200) return
+		console.log('res :>> ', res);
+		tiplists.value.setdetails({
+			title: '请选择需要打印的包条码',
+			isshow: true,
+			tipstate: 2,
+			list: [],
+			inputtext: '',
+			confirmTxt: '确认选择',
+			isonecheck: true,
+			success: () => {
+				// if (deta.checklist.length == 0) {
+				// 	uni.showToast({
+				// 		title: '请选择包条码',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				console.log('data :>> ', data);
+				// #ifdef APP
+				if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true })
+				let _isReturn = false
+				data.map(item => {
+					if (_isReturn) return
+					let text = '! 0 200 200 330 1\r\n'
+					text += 'SETBOLD 1\r\n'
+					text += `T 56 0 0 0 ${item.orderCode}\r\n`
+					text += 'LINE 0 50 420 50 3\r\n'
+					text += `T 55 0 0 60 客户\r\n`
+					text += 'LINE 40 50 40 110 3\r\n'
+					text += `T 55 0 50 60 ${item.customerName}\r\n`
+					text += 'LINE 40 80 420 80 3\r\n'
+					text += `T 55 0 50 90 ${item.customerAddress}\r\n`
+					text += 'LINE 0 110 420 110 3\r\n'
+					text += `T 55 0 0 120 物料\r\n`
+					text += 'LINE 40 110 40 140 3\r\n'
+					text += `T 55 0 50 120 ${item.materialName || item.category}\r\n`
+					text += 'LINE 0 140 420 140 3\r\n'
+					text += 'B QR 150 150 M 2 U 4\r\n'
+					text += `MA,${item.qrCode}\r\n`
+					text += 'ENDQR\r\n'
+					text += `T 55 0 140 260 ${item.qrCode}\r\n`
+					text += 'FORM\r\n'
+					text += 'PRINT\r\n'
+					utils.getbl(bluetoothInfo.value, text).catch(() => {
+						bluetoothList.value.setdetails({ isshow: true })
+						_isReturn = true
+					})
+				})
+				if (_isReturn) return
+				// #endif
+				tiplists.value.setdetails({ isshow: false })
+			},
+			cancel: (details) => {
+				tiplists.value.setdetails({ isshow: false })
+			},
+			close: (details) => {
+				tiplists.value.setdetails({ isshow: false })
+			}
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.w100 {
+		width: 100%;
+	}
+
+	// 最外层容器
+	.container {
+		padding: 20upx;
+		font-size: 28upx; // 本页字体大小
+	}
+
+	// 顶部tabbar
+	.tabBar_top {
+		display: flex;
+		justify-content: space-around;
+		font-size: 32upx;
+		// font-weight: bold;
+		margin: 10upx 0;
+
+		&>view {
+			padding: 15upx 0;
+			flex: 1;
+			text-align: center;
+			position: relative;
+			// background: #fff;
+			transition: all 0.3s;
+			border-radius: 10upx;
+
+			&::after {
+				content: '';
+				display: block;
+				position: absolute;
+				height: 4upx;
+				width: 0;
+				background: var(--subjectColor);
+				top: 100%;
+				left: 50%;
+				transition: all 0.5s;
+			}
+
+			&.active {
+				// background: var(--subjectColor);
+				// color: #fff;
+
+				&::after {
+					width: 100%;
+					left: 0;
+				}
+			}
+		}
+	}
+
+	// 顶部搜索栏
+	.header-search {
+		height: 60upx;
+		padding: 0 0 20upx;
+		// border-bottom: 1upx solid #aaa;
+		display: flex;
+		justify-content: space-between;
+
+	}
+
+	.search {
+		position: relative;
+
+		// 查询结果的列表
+		.searchResultList {
+			position: absolute;
+			top: 120%;
+			width: 100%;
+			background: #fff;
+			z-index: 80;
+			text-align: center;
+			line-height: 60upx;
+			max-height: 300upx;
+			overflow-y: scroll;
+		}
+	}
+
+	// 搜索输入框
+	.searchInput {
+		background: #fff;
+		width: 500upx;
+		height: 100%;
+		padding-left: 20upx;
+		border: 1upx solid var(--subjectColor);
+		border-radius: 30upx;
+	}
+
+	// 搜索类型
+	.searchType {
+		height: 100%;
+		display: flex;
+		align-items: center;
+		padding: 0 40upx;
+		background: #fff;
+		border: 1upx solid var(--subjectColor);
+		border-radius: 10upx;
+		color: var(--subjectColor);
+	}
+
+	// 数据详情
+	.dataInfo {
+		display: flex;
+		flex-wrap: wrap;
+		// border-bottom: 1upx solid #aaa;
+		background: #fff;
+	}
+
+	.dataInfo__item {
+		flex: none;
+		min-width: 50%;
+		max-width: 100%;
+		line-height: 60upx;
+		display: inline-flex;
+
+		.label {
+			display: inline-block;
+			width: 160upx;
+			text-align: right;
+			margin-right: 20rpx;
+		}
+	}
+
+	// 订单列表信息
+	.orderInfo {
+		// background: #fff;
+		margin-top: 10upx;
+
+		.orderInfo_title {
+			background: #fff;
+			font-size: 32upx;
+			padding: 15upx;
+			border-radius: 5upx;
+			box-sizing: border-box;
+			box-shadow: 0 0 10px #acc, 3px 3px #abb;
+			font-size: 28upx;
+
+			.row_title1 {
+				display: inline-block;
+				min-width: 140upx;
+			}
+
+			.row_title2 {
+				display: inline-block;
+				min-width: 200upx;
+			}
+
+
+			.orderInfo_title_row {
+				display: flex;
+				margin-top: 10upx;
+
+				&>view {
+					flex: 1;
+				}
+			}
+		}
+
+		// 头部统计
+		.title {
+			display: flex;
+			justify-content: space-around;
+			font-size: 32upx;
+			// font-weight: bold;
+			margin: 10upx 0;
+
+			&>view {
+				padding: 15upx 0;
+				flex: 1;
+				text-align: center;
+				position: relative;
+				// background: #fff;
+				transition: all 0.3s;
+				border-radius: 10upx;
+
+				// &::after {
+				// 	content: '';
+				// 	display: block;
+				// 	position: absolute;
+				// 	height: 4upx;
+				// 	width: 0;
+				// 	// background: var(--subjectColor);
+				// 	top: 100%;
+				// 	left: 50%;
+				// 	transition: all 0.5s;
+				// }
+
+				&.active {
+					background: var(--subjectColor);
+					color: #fff;
+
+					&::after {
+						width: 100%;
+						left: 0;
+					}
+				}
+			}
+		}
+
+		.title__number {
+			color: var(--subjectColor);
+		}
+
+		// 批量操作按钮
+		.batchOperationBtn {
+			border: 1upx solid var(--subjectColor);
+			text-align: center;
+			padding: 10upx 0;
+			color: var(--subjectColor);
+			border-radius: 10upx;
+			width: 200upx;
+			font-size: 28upx;
+			margin: 0;
+			margin-right: 10upx;
+		}
+	}
+
+	// 控件
+	.control {
+		background: #fff;
+		padding: 10upx 0;
+	}
+
+	.uni-table-scroll {
+		zoom: 0.9;
+	}
+
+	.uni-table-td,
+	.uni-table-th {
+		--borderColor: var(--subjectColor);
+		color: var(--borderColor);
+		padding: 10upx;
+
+		font-size: 28upx;
+	}
+
+	.table--border {
+		--borderColor: var(--subjectColor);
+		border-color: var(--borderColor);
+	}
+
+	:deep(.checkbox.tr-table--border) {
+		--borderColor: var(--subjectColor);
+		border-color: var(--borderColor);
+
+		.checkbox__inner {
+			border-color: var(--borderColor);
+		}
+	}
+</style>

pagesHome/pages/trayInquiry/trayInquiry.vue

@@ -0,0 +1,648 @@
+<template>
+	<!-- 顶部导航栏 -->
+	<u-navbar title="库位查询" placeholder :autoBack="true" leftIconSize='35' bgColor='#d3832a' leftIconColor='#ffffff'
+		titleStyle='color:#ffffff'></u-navbar>
+
+	<view class="container">
+		<!-- 顶部搜索栏 -->
+		<view class="header-search">
+			<view class="search">
+				<input class="searchInput" v-model="scancode" type="text">
+			</view>
+
+			<view class="search">
+				<view class="searchType" @click="scandata">
+					搜索
+				</view>
+
+			</view>
+		</view>
+
+		<view class="orderInfo">
+			<!-- 库位数据 -->
+			<view class="orderInfo_title">
+				<view class="orderInfo_title_row">
+					<view class="">
+						<view class="row_title1">
+							托盘名称：
+						</view>
+						<view>
+							{{info.trayInfo.palletName || '暂无数据'}}
+						</view>
+					</view>
+
+					<view class="">
+						<view class="row_title2">
+							托盘码：
+						</view>
+						<view class="">
+							{{info.trayInfo.palletCode || '暂无数据'}}
+						</view>
+					</view>
+				</view>
+
+				<view class="orderInfo_title_row">
+					<view class="">
+						<text class="row_title1">
+							打托方式：
+						</text>
+						{{info.trayType || '暂无数据'}}
+					</view>
+
+					<view class="">
+						<text class="">
+							商场：
+						</text>
+						{{info.marketName || '暂无数据'}}
+					</view>
+				</view>
+
+				<view class="orderInfo_title_row">
+					<view class="">
+						<text class="row_title1">
+							包件数：
+						</text>
+						{{info.totalNum || 0}}
+					</view>
+
+					<view class="">
+						<text class="row_title2">
+							订单包件总数：
+						</text>
+						{{info.orderTotalNum || 0}}
+					</view>
+				</view>
+
+				<view class="orderInfo_title_row">
+					<view class="">
+						<text class="row_title1">
+							库存品数：
+						</text>
+						{{info.stockNum || 0}}
+					</view>
+
+					<view class="">
+						<text class="row_title2">
+							库存品订单总数：
+						</text>
+						{{info.stockTotalNum || 0}}
+					</view>
+				</view>
+			</view>
+
+			<view class="title">
+				<view @click="handleTabBarState(1)" :class="{'active': tabBarCode === 1}">
+					定制品
+				</view>
+				<view @click="handleTabBarState(2)" :class="{'active': tabBarCode === 2}">
+					零担
+				</view>
+				<view @click="handleTabBarState(3)" :class="{'active': tabBarCode === 3}">
+					库存品
+				</view>
+			</view>
+
+			<!-- 定制品 -->
+			<view class="packagesList" v-if="tabBarCode === 1">
+				<!-- 控件 -->
+				<view class="control">
+					<view v-if="!isBatchOperation">
+						<view class="batchOperationBtn" @click="isBatchOperation = true">批量操作</view>
+					</view>
+					<view v-else style="display: flex;">
+						<view class="batchOperationBtn" @click="batchPrint">打印</view>
+					</view>
+				</view>
+
+				<scroll-view scroll-y="true" style="height: 60vh; margin-top: 10px;">
+					<uni-table type="selection" border stripe emptyText="暂无更多数据"
+						@selection-change="({detail: {index}})=> selectionChange(index, 'order')">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="left">包条码</uni-th>
+							<uni-th align="left">合同号</uni-th>
+							<uni-th align="left">运单号</uni-th>
+							<uni-th align="left">仓库</uni-th>
+							<uni-th align="left">数量</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<block v-for="item in packageList">
+							<uni-tr>
+								<!-- 包条码 -->
+								<uni-td>{{item.orderPackageCode}}</uni-td>
+								<!-- 合同号 -->
+								<uni-td>{{item.orderCode}}</uni-td>
+								<!-- 运单号 -->
+								<uni-td>{{item.waybillNo}}</uni-td>
+								<!-- 仓库 -->
+								<uni-td>{{item.warehouseName}}</uni-td>
+								<!-- 数量 -->
+								<uni-td>{{item.num}}</uni-td>
+							</uni-tr>
+						</block>
+
+					</uni-table>
+				</scroll-view>
+			</view>
+
+			<!-- 零担 -->
+			<view class="packagesList" v-else-if="tabBarCode === 2">
+				<scroll-view scroll-y="true" style="height: 60vh; margin-top: 10px;">
+					<uni-table type="selection" border stripe emptyText="暂无更多数据"
+						@selection-change="({detail: {index}})=>selectionChange(index, 'zero')">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="left">运单号</uni-th>
+							<uni-th align="left">合同号</uni-th>
+							<uni-th align="left">仓库</uni-th>
+							<uni-th align="center">数量</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<block v-for="item in zeroList">
+							<uni-tr>
+								<!-- 运单号 -->
+								<uni-td>{{item.waybillNo}}</uni-td>
+								<!-- 合同号 -->
+								<uni-td>{{item.orderCode}}</uni-td>
+								<!-- 仓库 -->
+								<uni-td>{{item.warehouseName}}</uni-td>
+								<!-- 数量 -->
+								<uni-td align="center">{{item.num}}</uni-td>
+							</uni-tr>
+						</block>
+					</uni-table>
+				</scroll-view>
+			</view>
+
+			<!-- 库存品 -->
+			<view class="packagesList" v-else-if="tabBarCode === 3">
+				<scroll-view scroll-y="true" style="height: 60vh; margin-top: 10px;">
+					<uni-table type="selection" border stripe emptyText="暂无更多数据"
+						@selection-change="({detail: {index}})=>selectionChange(index, 'stock')">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="left">批次号</uni-th>
+							<uni-th align="left">物料编码</uni-th>
+							<uni-th align="left">物料名称</uni-th>
+							<uni-th align="left">商场名称</uni-th>
+							<uni-th align="center">仓库</uni-th>
+							<uni-th align="center">在库数</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<block v-for="item in stockList">
+							<uni-tr>
+								<!-- 批次号 -->
+								<uni-td>{{item.incomingBatch}}</uni-td>
+								<!-- 物料编码 -->
+								<uni-td>{{item.materialCode}}</uni-td>
+								<!-- 物料名称 -->
+								<uni-td>{{item.materialName}}</uni-td>
+								<!-- 商场名称 -->
+								<uni-td>{{item.marketName}}</uni-td>
+								<!-- 仓库 -->
+								<uni-td>{{item.warehouseName}}</uni-td>
+								<!-- 数量 -->
+								<uni-td align="center">{{item.num}}</uni-td>
+							</uni-tr>
+						</block>
+					</uni-table>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+	<tiplist ref="tiplists"></tiplist>
+	<!-- #ifdef APP -->
+	<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
+	<!-- #endif -->
+	<BluetoothList ref="bluetoothList"></BluetoothList>
+</template>
+
+<script lang="ts" setup>
+	import { ref, reactive, shallowRef, watch, nextTick, computed } from 'vue';
+	import {
+		onShow,
+		onHide,
+		onLoad,
+		onReachBottom,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app'
+	import utils from '@/utils/utils.js';
+	import {
+		postFindTrayData,
+		BatchPrintPackages
+	} from '@/api/user.js'
+	import useBluetoothStore from '@/store/useBluetoothStore.js';
+	import useSystemSettingsStore from '@/store/useSystemSettingsStore';
+	import { storeToRefs } from 'pinia';
+	const { scanState } = storeToRefs(useSystemSettingsStore())
+	const bluetoothList = ref(null)
+	const bluetoothStore = useBluetoothStore()
+	const { bluetoothInfo } = storeToRefs(bluetoothStore)
+
+	// 订单详情
+	const dataInfo = shallowRef<any>({})
+
+	/** 是否开启批量操作 */
+	const isBatchOperation = ref<Boolean>(false)
+
+	/** 是否显示定制品 */
+	const showArticleMadeToOrder = ref<Boolean>(true)
+
+	/** 扫码码值 */
+	const scancode = ref<string>('')
+
+	/** 包件列表 */
+	const packageList = shallowRef([])
+
+	/** 零担列表 */
+	const zeroList = shallowRef([])
+
+	/** 库存品列表 */
+	const stockList = shallowRef([])
+
+	/** 详情 */
+	const info = ref<any>({ trayInfo: {} })
+
+	// 订单状态字典
+	const orderStateDictionaries = reactive({
+		'10': '部分入库',
+		'20': '已入库',
+		'30': '部分出库',
+		'40': '已出库',
+		'50': '部分装车',
+		'60': '已装车',
+		'70': '部分签收',
+		'80': '已签收',
+	})
+
+	/** tabBar 激活 */
+	const tabBarCode = ref(1)
+
+	/** 修改物料表单 */
+	const form = ref({})
+
+	/** 复选框选中的数据 */
+	const selectionList = ref([])
+
+	// 组件实例
+	const tiplists = ref(null)
+
+
+	onLoad(() => {
+		// #ifdef APP
+		utils.ttsspke('库位查询, 请扫描或输入库位码')
+		// #endif
+	})
+
+	// 开启监听扫描
+	onShow(async () => {
+		// #ifdef APP
+		uni.$off('scancodedate')
+		uni.$on('scancodedate', function (code) {
+			if (code) {
+				scancode.value = code
+
+				scandata()
+			}
+		})
+		// #endif
+	})
+
+	onPullDownRefresh(() => {
+		const timer = setTimeout(() => {
+			dataInfo.value = {}
+			scancode.value = ''
+			packageList.value = []
+
+			uni.stopPullDownRefresh()
+			clearTimeout(timer)
+		}, 300)
+	})
+
+	async function scandata() {
+		const res = await postFindTrayData({ trayCode: scancode.value })
+		console.log('res :>> ', res);
+		const { code, data } = res
+
+		if (code !== 200 || !data) return
+
+		// 库位信息
+		info.value = data.trayTyprInfo || {}
+
+		// 库位托盘信息
+		info.value.trayInfo = data.trayEntity || {}
+
+		// 定制品
+		packageList.value = data.packageList
+
+		// 零担
+		zeroList.value = data.zeroOrderList
+
+		// 库存品
+		stockList.value = data.stockOrderList
+	}
+
+	/** 设置tabBar激活状态 */
+	const handleTabBarState = (code) => {
+		selectionList.value = []
+		tabBarCode.value = code
+	}
+
+	/** 复选框改变时 */
+	const selectionChange = (list : [], type : string) => {
+		console.log('list :>> ', list);
+		selectionList.value = list
+	}
+
+	/** 打印 */
+	const batchPrint = async () => {
+		if (selectionList.value.length === 0) return uni.showToast({
+			title: '最少选择一条数据',
+			icon: 'none'
+		})
+
+		const _idsArr = []
+
+		for (let i = 0; i < selectionList.value.length; i++) {
+			// selectionList内存储的是被选中的索引
+			const index = selectionList.value[i]
+			_idsArr.push(packageList.value[index].packageId)
+		}
+
+		const idsValue = _idsArr.join(',')
+
+		const res = await BatchPrintPackages(idsValue)
+		const { code, data } = res
+		if (code !== 200) return
+		console.log('res :>> ', res);
+		tiplists.value.setdetails({
+			title: '请选择需要打印的包条码',
+			isshow: true,
+			tipstate: 2,
+			list: [],
+			inputtext: '',
+			confirmTxt: '确认选择',
+			isonecheck: true,
+			success: () => {
+				// if (deta.checklist.length == 0) {
+				// 	uni.showToast({
+				// 		title: '请选择包条码',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				console.log('data :>> ', data);
+				// #ifdef APP
+				if (!bluetoothInfo.value.name) return bluetoothList.value.setdetails({ isshow: true })
+				let _isReturn = false
+				data.map(item => {
+					if (_isReturn) return
+					let text = '! 0 200 200 330 1\r\n'
+					text += 'SETBOLD 1\r\n'
+					text += `T 56 0 0 0 ${item.orderCode}\r\n`
+					text += 'LINE 0 50 420 50 3\r\n'
+					text += `T 55 0 0 60 客户\r\n`
+					text += 'LINE 40 50 40 110 3\r\n'
+					text += `T 55 0 50 60 ${item.customerName}\r\n`
+					text += 'LINE 40 80 420 80 3\r\n'
+					text += `T 55 0 50 90 ${item.customerAddress}\r\n`
+					text += 'LINE 0 110 420 110 3\r\n'
+					text += `T 55 0 0 120 物料\r\n`
+					text += 'LINE 40 110 40 140 3\r\n'
+					text += `T 55 0 50 120 ${item.materialName || item.category}\r\n`
+					text += 'LINE 0 140 420 140 3\r\n'
+					text += 'B QR 150 150 M 2 U 4\r\n'
+					text += `MA,${item.qrCode}\r\n`
+					text += 'ENDQR\r\n'
+					text += `T 55 0 140 260 ${item.qrCode}\r\n`
+					text += 'FORM\r\n'
+					text += 'PRINT\r\n'
+					utils.getbl(bluetoothInfo.value, text).catch(() => {
+						bluetoothList.value.setdetails({ isshow: true })
+						_isReturn = true
+					})
+				})
+				if (_isReturn) return
+				// #endif
+				tiplists.value.setdetails({ isshow: false })
+			},
+			cancel: (details) => {
+				tiplists.value.setdetails({ isshow: false })
+			},
+			close: (details) => {
+				tiplists.value.setdetails({ isshow: false })
+			}
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.w100 {
+		width: 100%;
+	}
+
+	// 最外层容器
+	.container {
+		padding: 20upx;
+		font-size: 28upx; // 本页字体大小
+	}
+
+	// 顶部搜索栏
+	.header-search {
+		height: 60upx;
+		padding: 0 0 20upx;
+		// border-bottom: 1upx solid #aaa;
+		display: flex;
+		justify-content: space-between;
+
+	}
+
+	.search {
+		position: relative;
+
+		// 查询结果的列表
+		.searchResultList {
+			position: absolute;
+			top: 120%;
+			width: 100%;
+			background: #fff;
+			z-index: 80;
+			text-align: center;
+			line-height: 60upx;
+			max-height: 300upx;
+			overflow-y: scroll;
+		}
+	}
+
+	// 搜索输入框
+	.searchInput {
+		background: #fff;
+		width: 500upx;
+		height: 100%;
+		padding-left: 20upx;
+		border: 1upx solid var(--subjectColor);
+		border-radius: 30upx;
+	}
+
+	// 搜索类型
+	.searchType {
+		height: 100%;
+		display: flex;
+		align-items: center;
+		padding: 0 40upx;
+		background: #fff;
+		border: 1upx solid var(--subjectColor);
+		border-radius: 10upx;
+		color: var(--subjectColor);
+	}
+
+	// 数据详情
+	.dataInfo {
+		display: flex;
+		flex-wrap: wrap;
+		// border-bottom: 1upx solid #aaa;
+		background: #fff;
+	}
+
+	.dataInfo__item {
+		flex: none;
+		min-width: 50%;
+		max-width: 100%;
+		line-height: 60upx;
+		display: inline-flex;
+
+		.label {
+			display: inline-block;
+			width: 160upx;
+			text-align: right;
+			margin-right: 20rpx;
+		}
+	}
+
+	// 订单列表信息
+	.orderInfo {
+		// background: #fff;
+		margin-top: 10upx;
+
+		.orderInfo_title {
+			background: #fff;
+			font-size: 32upx;
+			padding: 15upx;
+			border-radius: 5upx;
+			box-sizing: border-box;
+			box-shadow: 0 0 10px #acc, 3px 3px #abb;
+			font-size: 28upx;
+
+			.row_title1 {
+				display: inline-block;
+				min-width: 140upx;
+			}
+
+			.row_title2 {
+				display: inline-block;
+				min-width: 200upx;
+			}
+
+
+			.orderInfo_title_row {
+				display: flex;
+				margin-top: 10upx;
+
+				&>view {
+					flex: 1;
+				}
+			}
+		}
+
+		// 头部统计
+		.title {
+			display: flex;
+			justify-content: space-around;
+			font-size: 32upx;
+			// font-weight: bold;
+			margin: 10upx 0;
+
+			&>view {
+				padding: 15upx 0;
+				flex: 1;
+				text-align: center;
+				position: relative;
+				// background: #fff;
+				transition: all 0.3s;
+				border-radius: 10upx;
+
+				// &::after {
+				// 	content: '';
+				// 	display: block;
+				// 	position: absolute;
+				// 	height: 4upx;
+				// 	width: 0;
+				// 	// background: var(--subjectColor);
+				// 	top: 100%;
+				// 	left: 50%;
+				// 	transition: all 0.5s;
+				// }
+
+				&.active {
+					background: var(--subjectColor);
+					color: #fff;
+
+					&::after {
+						width: 100%;
+						left: 0;
+					}
+				}
+			}
+		}
+
+		.title__number {
+			color: var(--subjectColor);
+		}
+
+		// 批量操作按钮
+		.batchOperationBtn {
+			border: 1upx solid var(--subjectColor);
+			text-align: center;
+			padding: 10upx 0;
+			color: var(--subjectColor);
+			border-radius: 10upx;
+			width: 200upx;
+			font-size: 28upx;
+			margin: 0;
+			margin-right: 10upx;
+		}
+	}
+
+	// 控件
+	.control {
+		background: #fff;
+		padding: 10upx 0;
+	}
+
+	.uni-table-scroll {
+		zoom: 0.9;
+	}
+
+	.uni-table-td,
+	.uni-table-th {
+		--borderColor: var(--subjectColor);
+		color: var(--borderColor);
+		padding: 10upx;
+
+		font-size: 28upx;
+	}
+
+	.table--border {
+		--borderColor: var(--subjectColor);
+		border-color: var(--borderColor);
+	}
+
+	:deep(.checkbox.tr-table--border) {
+		--borderColor: var(--subjectColor);
+		border-color: var(--borderColor);
+
+		.checkbox__inner {
+			border-color: var(--borderColor);
+		}
+	}
+</style>

pagesTask/pages/dynamicCheckDetails/dynamicCheckDetails.vue

@@ -90,7 +90,7 @@
 				<scroll-view class="scvmabx" scroll-y="true">
 					<!-- 有数据 -->
 					<block v-for="item in details.renderList" :key="item">
-						<!-- 订制品 -->
+						<!-- 定制品 -->
 						<view :class="{
 							'main_render': true,
 							'active': false, 
@@ -108,7 +108,7 @@
 							<view class="main_render_container">
 								<!-- 有数据 -->
 								<template v-if="tabBarCode === 1">
-									<view class="main_render_item">
+									<view class="main_render_item" @click="handleShowDetails(item)">
 										<view>
 											包条码: {{item.orderPackageCode || '暂无数据'}}
 										</view>
@@ -367,6 +367,73 @@
 		</view>
 	</PopUp>
 
+	<!-- 弹出层 -- 详情 -->
+	<PopUp ref="popUp_Details">
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>订单号:</text> <text>{{details.detailsInfo.orderCode}}</text>
+			</view>
+		</view>
+
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>包条码:</text> <text>{{details.detailsInfo.orderPackageCode}}</text>
+			</view>
+		</view>
+
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>批次号:</text> <text>{{details.detailsInfo.incomingBatch}}</text>
+			</view>
+		</view>
+
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>库位:</text> <text>{{details.detailsInfo.allocation}}</text>
+			</view>
+		</view>
+
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>托盘名称:</text> <text>{{details.detailsInfo.trayName}}</text>
+			</view>
+
+			<view class="">
+				<text>托盘码:</text> <text>{{details.detailsInfo.trayCode}}</text>
+			</view>
+		</view>
+
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>商场名称:</text> <text>{{details.detailsInfo.marketName}}</text>
+			</view>
+
+			<view class="">
+				<text>品牌:</text> <text>{{details.detailsInfo.brandName}}</text>
+			</view>
+		</view>
+
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>运单号:</text> <text>{{details.detailsInfo.waybillNumber}}</text>
+			</view>
+
+			<view class="">
+				<text>一级品:</text> <text>{{details.detailsInfo.firsts}}</text>
+			</view>
+		</view>
+
+		<view class="popUpDetails_row">
+			<view class="">
+				<text>二级品:</text> <text>{{details.detailsInfo.second}}</text>
+			</view>
+
+			<view class="">
+				<text>三级品:</text> <text>{{details.detailsInfo.thirdProduct}}</text>
+			</view>
+		</view>
+	</PopUp>
+
 
 	<!-- #ifdef APP -->
 	<saomiao2 :ishidestop="scanState !== 0"></saomiao2>
@@ -538,7 +605,9 @@
 		/** 关闭扫描监听 */
 		stopScan: false,
 		/** 被移动的包条数据 */
-		removeTray: {}
+		removeTray: {},
+		/** 展示详情信息 */
+		detailsInfo: {}
 	})
 
 	// 获取组件实例
@@ -558,6 +627,8 @@
 	const popUp_AddStock = ref(null)
 	/** 弹出层 -- 是否移托 */
 	const popUp_RemoveTary = ref(null)
+	/** 弹出层 -- 详情 */
+	const popUp_Details = ref(null)
 
 	// 页面初始化执行回调
 	onLoad((info) => {
@@ -802,7 +873,7 @@
 
 				return
 			}
-			else if(code === 5001){
+			else if (code === 5001) {
 				return
 			}
 			else if (code !== 4000) {
@@ -967,6 +1038,20 @@
 		})
 	}
 
+	/** 开启详情弹窗 */
+	const handleShowDetails = (item) => {
+		console.log('item :>> ', item);
+		// 获取需要被展示的详情的信息
+		details.detailsInfo = item
+
+		// 开启弹窗
+		popUp_Details.value.setDetails({
+			title: '详情',
+			showPopUp: true,
+			confirmText: '关闭'
+		})
+	}
+
 	/** 开启控件区 */
 	const handleShowControl = (_type : number) => {
 		// 按托盘上架只能整托上架
@@ -2166,4 +2251,15 @@
 		transform: translateX(-50%);
 		font-size: 30upx;
 	}
+
+	// 详情
+	.popUpDetails_row {
+		display: flex;
+		font-size: 28upx;
+		margin-bottom: 10upx;
+
+		&>view {
+			flex: 1;
+		}
+	}
 </style>

store/useStorageStore.js

@@ -24,7 +24,7 @@ const useStorageStore = defineStore('useStorageStore', () => {
 		} = response
 
 		if (code !== 200) return
-		storageArr.value = data
+		storageArr.value = data || []
 	}
 
 	/** 清空库位信息 */

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

@@ -7,8 +7,8 @@
   "id": "__UNI__EB22F37",
   "name": "货无忧",
   "version": {
-    "name": "1.1.07",
+    "name": "1.1.08",
-    "code": 1107
+    "code": 1108
   },
   "description": "",
   "developer": {

unpackage/dist/dev/mp-weixin/compoment/tiplist/tiplist.wxss

@@ -33,7 +33,7 @@
   color: #f00;
 }
 .tpstitl.showTitle::after {
-  content: "最少传入三张图片";
+  content: "最少传入一张图片";
   margin-left: 20rpx;
   color: #f00;
 }

unpackage/dist/dev/mp-weixin/config/host.js

@@ -1,5 +1,5 @@
 "use strict";
-const devhost = "https://h5uapi.huitongys.com/";
+const devhost = "http://192.168.10.48:13000/";
 const imghost = "";
 const host = devhost;
 const APPKEY = "h5u:h5u_secret";

unpackage/dist/dev/mp-weixin/pages/user/user.wxml

@@ -1 +1 @@
-<view class="titles">个人中心</view><image class="usebg" src="/static/userbg.png"></image><view wx:if="{{a}}" class="userviews" bindtap="{{b}}"><image src="/static/userimg.png"></image><view><view>未登录</view></view></view><view wx:if="{{c}}" class="userviews"><image src="/static/userimg.png"></image><view><view>{{d}}</view><view><view></view><view bindtap="{{g}}"><view>{{e}}-{{f}}</view><image src="/static/rigthviewb.png"></image></view></view></view></view><view class="btsview"><view wx:for="{{h}}" wx:for-item="item" bindtap="{{item.c}}"><view><image src="{{item.a}}"></image><view>{{item.b}}</view></view><view><image src="/static/rigthview.png"></image></view></view></view><view class="butout" bindtap="{{i}}"> 退出登录 </view><view wx:if="{{j}}" class="bgmabx" bindtap="{{n}}"><view class="changkus" catchtap="{{m}}"><view class="tis"><image class="bgimgs" src="/static/tpbg.png"></image><image class="ckbgcc" src="/static/changku.png"></image><view class="titlck">选择仓库</view><scroll-view scroll-y="true" class="scvuew"><view class="maboxs"><view wx:for="{{k}}" wx:for-item="item" bindtap="{{item.b}}" class="{{item.c}}">{{item.a}}</view></view></scroll-view><view class="submitcheck" bindtap="{{l}}">确认选择</view></view></view></view><view class="zhanwei"></view><tiplist class="r" u-r="tiplists" u-i="4ed4f5f0-0" bind:__l="__l"></tiplist><tips class="r" u-r="tip" u-i="4ed4f5f0-1" bind:__l="__l"></tips>
+<view class="titles">个人中心</view><image class="usebg" src="/static/userbg.png"></image><view wx:if="{{a}}" class="userviews" bindtap="{{b}}"><image class="profilePhoto" src="/static/appIcon/favicon.png"></image><view><view>未登录</view></view></view><view wx:if="{{c}}" class="userviews"><image class="profilePhoto" src="/static/appIcon/favicon.png"></image><view><view>{{d}}</view><view><view></view><view bindtap="{{g}}"><view>{{e}}-{{f}}</view><image src="/static/rigthviewb.png"></image></view></view></view></view><view class="btsview"><view wx:for="{{h}}" wx:for-item="item" bindtap="{{item.c}}"><view><image src="{{item.a}}"></image><view>{{item.b}}</view></view><view><image src="/static/rigthview.png"></image></view></view></view><view class="butout" bindtap="{{i}}"> 退出登录 </view><view wx:if="{{j}}" class="bgmabx" bindtap="{{n}}"><view class="changkus" catchtap="{{m}}"><view class="tis"><image class="bgimgs" src="/static/tpbg.png"></image><image class="ckbgcc" src="/static/changku.png"></image><view class="titlck">选择仓库</view><scroll-view scroll-y="true" class="scvuew"><view class="maboxs"><view wx:for="{{k}}" wx:for-item="item" bindtap="{{item.b}}" class="{{item.c}}">{{item.a}}</view></view></scroll-view><view class="submitcheck" bindtap="{{l}}">确认选择</view></view></view></view><view class="zhanwei"></view><tiplist class="r" u-r="tiplists" u-i="4ed4f5f0-0" bind:__l="__l"></tiplist><tips class="r" u-r="tip" u-i="4ed4f5f0-1" bind:__l="__l"></tips>

unpackage/dist/dev/mp-weixin/pages/user/user.wxss

@@ -263,3 +263,7 @@
   height: 400rpx;
   background-color: #FA8C16da;
 }
+.profilePhoto {
+  background: #fff;
+  border-radius: 10rpx;
+}

unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.js

@@ -168,6 +168,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       });
     }
     async function initpage() {
+      details.listcheckindex = -1;
       try {
         let data = {
           reservationId: details.items.id,
@@ -289,6 +290,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         reatchBootomStock();
     }
     async function scandata() {
+      let code = 0;
       try {
         let loadingId = common_vendor.index.getStorageSync("checkvehicle").id;
         if (details.orderStatus == 1) {
@@ -300,7 +302,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             barcode: details.scancode
           };
           let res = await api_user.deliveryloadingscan(data);
-          const { code, audio } = res;
+          const { audio } = res;
+          code = res.code;
           if (code === 5e3) {
             utils.ttsspke("不在本次计划, 是否继续装车");
             tiplists.value.setdetails({
@@ -319,6 +322,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
                   barcode: details.scancode
                 };
                 const res2 = await api_user.postAbnormalTruckLoading(data2);
+                if (res2.code !== 200)
+                  return;
+                basicContainer.value.startPullDownRefresh();
                 console.log("res :>> ", res2);
                 tiplists.value.setdetails({ isshow: false });
               },
@@ -483,15 +489,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             o: common_vendor.f(item.distributionAppParcelListVOS, (ite, k1, i1) => {
               return {
                 a: common_vendor.t(ite.orderPackageCode),
-                b: "6197e305-9-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
+                b: ite.orderPackageLoadingStatus !== "20" ? 1 : "",
-                c: common_vendor.t(ite.thirdProduct),
+                c: "6197e305-9-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
-                d: "6197e305-10-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
+                d: common_vendor.t(ite.thirdProduct),
-                e: common_vendor.t(ite.isScan),
+                e: "6197e305-10-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
-                f: "6197e305-11-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
+                f: common_vendor.t(ite.isScan),
-                g: common_vendor.t(ite.isAbnnormalSigningName || ite.isAbnormalLoadingName || "/"),
+                g: "6197e305-11-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
-                h: "6197e305-12-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
+                h: common_vendor.t(ite.isAbnnormalSigningName || ite.isAbnormalLoadingName || "/"),
-                i: Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 ? 1 : "",
+                i: "6197e305-12-" + i0 + "-" + i1 + "," + ("6197e305-8-" + i0 + "-" + i1),
-                j: "6197e305-8-" + i0 + "-" + i1 + "," + ("6197e305-2-" + i0)
+                j: Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 ? 1 : "",
+                k: "6197e305-8-" + i0 + "-" + i1 + "," + ("6197e305-2-" + i0)
               };
             }),
             p: common_vendor.p({

unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.wxss

@@ -275,3 +275,7 @@
 .uni-scroll-view.data-v-6197e305 {
   overflow: hidden;
 }
+.isScan.data-v-6197e305 {
+  background: var(--subjectColor);
+  color: #fff;
+}

unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.js

@@ -53,6 +53,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     details.authbuts = common_vendor.index.getStorageSync("authbuts") || [];
     const tiplists = common_vendor.ref(null);
     common_vendor.onLoad((op) => {
+      console.log("op.item :>> ", op.item);
       details.items = JSON.parse(op.item);
       details.id = JSON.parse(op.item).id;
     });

unpackage/dist/dev/mp-weixin/pagesHome/pages/CustomerSign/CustomerSign.wxml

@@ -1 +1 @@
-<u-navbar wx:if="{{a}}" u-i="1f112ba4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>计划件数</view><view>{{j}}</view></view><view><view>装车数量</view><view>{{k}}</view></view><view><view>签收件数</view><view>{{l}}</view></view></view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabx"><view wx:for="{{m}}" wx:for-item="item" class="its"><view class="title"><view style="{{item.c}}">客户：{{item.a}} {{item.b}}</view><view class="statetype">{{item.d}}</view></view><view class="conxb"><view><view>订单总数</view><view>{{item.e}}</view></view><view><view>配送件数</view><view>{{item.f}}</view></view><view><view>扫描件数</view><view>{{item.g}}</view></view></view><view class="info"><view class=""> 客户电话: {{item.h}}</view><view class=""> 客户地址: {{item.i}}</view></view><view class="remarks"> 备注：{{item.j}}</view><view class="tbck"><view class="buts"><view class="{{item.l}}" bindtap="{{item.m}}">{{item.k}}</view><view bindtap="{{item.n}}">签收扫描</view><view bindtap="{{item.o}}">上传签收图片</view></view><view bindtap="{{item.p}}" class="mabut"> 设置增值服务 </view><view wx:if="{{item.q}}" class="mabut" bindtap="{{item.r}}"> 批量签收 </view></view></view></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="1f112ba4-1" bind:__l="__l"></tiplist>
+<u-navbar wx:if="{{a}}" u-i="1f112ba4-0" bind:__l="__l" u-p="{{a}}"></u-navbar><view class="hedtopt"><view class="typto"><view>配车类型：{{b}}</view><view>配车状态：{{c}}</view></view><view class="typto"><view>车牌号：{{d}}</view><view>司机：{{e}}</view></view><view class="typto"><view>装卸班组：{{f}}</view><view>备货是否完成：{{g}}</view></view><view class="kehupeison"><view><view>配送客户数</view><view>{{h}}</view></view><view><view>订单总数</view><view>{{i}}</view></view><view><view>计划件数</view><view>{{j}}</view></view><view><view>装车数量</view><view>{{k}}</view></view><view><view>签收件数</view><view>{{l}}</view></view></view></view><scroll-view scroll-y="true" class="scvbx"><view class="mabx"><view wx:for="{{m}}" wx:for-item="item" class="its"><view class="title"><view style="{{item.c}}">客户：{{item.a}} {{item.b}}</view><view class="statetype">{{item.d}}</view></view><view class="conxb"><view><view>订单总数</view><view>{{item.e}}</view></view><view><view>计划件数</view><view>{{item.f}}</view></view><view><view>扫描件数</view><view>{{item.g}}</view></view></view><view class="info"><view class=""> 客户电话: {{item.h}}</view><view class=""> 客户地址: {{item.i}}</view></view><view class="remarks"> 备注：{{item.j}}</view><view class="tbck"><view class="buts"><view class="{{item.l}}" bindtap="{{item.m}}">{{item.k}}</view><view bindtap="{{item.n}}">签收扫描</view><view bindtap="{{item.o}}">上传签收图片</view></view><view bindtap="{{item.p}}" class="mabut"> 设置增值服务 </view><view wx:if="{{item.q}}" class="mabut" bindtap="{{item.r}}"> 批量签收 </view></view></view></view></scroll-view><tiplist class="r" u-r="tiplists" u-i="1f112ba4-1" bind:__l="__l"></tiplist>

unpackage/dist/dev/mp-weixin/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan.js

@@ -109,13 +109,37 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }
     }
     function goCustomerOrdersDetails(item) {
+      const data = {
+        isstock: item.isstock,
+        consignee: item.consignee,
+        isload: item.isload,
+        ordNub: item.ordNub,
+        reservationNum: item.reservationNum,
+        signNub: item.signNub,
+        id: item.id
+      };
       common_vendor.index.navigateTo({
-        url: "/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails?item=" + JSON.stringify(item) + "&id=" + details.id
+        url: "/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails?item=" + JSON.stringify(data) + "&id=" + details.id
       });
     }
     function goCustomerTrayDetails(item) {
+      const data = {
+        type_name: item.type_name,
+        deliStatus_name: item.deliStatus_name,
+        vehicleName: item.vehicleName,
+        driverName: item.driverName,
+        loadingTeamName: item.loadingTeamName,
+        isstock: item.isstock,
+        customersNumber: item.customersNumber,
+        orderNumber: item.orderNumber,
+        loadCusNub: item.loadCusNub,
+        loadOrdNub: item.loadOrdNub,
+        signNub: item.signNub,
+        signNubSr: item.signNubSr,
+        id: item.id
+      };
       common_vendor.index.navigateTo({
-        url: "/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails?item=" + JSON.stringify(item) + "&id=" + details.id
+        url: "/pagesHome/pages/CustomerTrayDetails/CustomerTrayDetails?item=" + JSON.stringify(data) + "&id=" + details.id
       });
     }
     const { authbuts, items, datalist } = common_vendor.toRefs(details);

unpackage/dist/dev/mp-weixin/pagesHome/pages/LoadingScan/LoadingScan.js

@@ -212,6 +212,21 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       return null;
     }
     async function goselscan(item) {
+      const jumpData = {
+        type_name: item.type_name,
+        deliStatus_name: item.deliStatus_name,
+        vehicleName: item.vehicleName,
+        driverName: item.driverName,
+        loadingTeamName: item.loadingTeamName,
+        isstock: item.isstock,
+        customersNumber: item.customersNumber,
+        orderNumber: item.orderNumber,
+        loadCusNub: item.loadCusNub,
+        loadOrdNub: item.loadOrdNub,
+        signNub: item.signNub,
+        signNubSr: item.signNubSr,
+        id: item.id
+      };
       let data = {
         deliveryId: item.id
       };
@@ -219,7 +234,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       if (res.data.length == 1) {
         common_vendor.index.setStorageSync("checkvehicle", res.data[0]);
         common_vendor.index.navigateTo({
-          url: "/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan?id=" + item.id + "&item=" + JSON.stringify(item)
+          url: "/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan?id=" + item.id + "&item=" + JSON.stringify(jumpData)
         });
         return;
       }
@@ -254,7 +269,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           tiplists.value.setdetails({ isshow: false });
           common_vendor.index.setStorageSync("checkvehicle", res.data[deta.checklist[0]]);
           common_vendor.index.navigateTo({
-            url: "/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan?id=" + item.id + "&item=" + JSON.stringify(item)
+            url: "/pagesHome/pages/DeliveryCustomerScan/DeliveryCustomerScan?id=" + item.id + "&item=" + JSON.stringify(jumpData)
           });
         },
         cancel: (details2) => {

unpackage/dist/dev/mp-weixin/pagesHome/pages/OrderSortingDetailList/OrderSortingDetailList.js

@@ -59,7 +59,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       if (response.code !== 200)
         return;
       details.list = response.data.parcelList;
-      details.detaobj = response.data;
+      details.detaobj = response.data || [];
       let set = /* @__PURE__ */ new Set();
       response.data.parcelList.map((item) => {
         set.add(item.trayName);

unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplist/StockUplist.js

@@ -126,10 +126,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     }
     async function ckscanningCode(item) {
       let content = "请扫描托盘码";
-      if (!details.goodsStockupAllocationId) {
-        content = "请先扫描库位码";
-        return;
-      }
       details.isscan = item.taryLean;
       details.trayId = item.trayId;
       common_vendor.index.showToast({

unpackage/dist/dev/mp-weixin/pagesHome/pages/StockUplistScandetails/StockUplistScandetails.js

@@ -140,6 +140,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       });
     }
     async function scandata() {
+      if (Number(details.planNum) === Number(details.scanNum))
+        return utils_utils.utils.handleToast("该客户已齐套, 请返回上一级页面");
       if (Number(details.status) !== 0)
         return;
       let data = {

unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.js

@@ -61,32 +61,20 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       orderType: "",
       inputtxt: "",
       listcheckindex: -1,
-      scrollHeight: ""
+      scrollHeight: "",
+      /** 计划件数 */
+      Plannednub: 0,
+      /** 签收数 */
+      signNub: 0
     });
     const tiplists = common_vendor.ref(null);
     const tip = common_vendor.ref(null);
-    const Plannednub = common_vendor.computed(() => {
-      let num = 0;
-      num += details.orderArr.reduce((curr, item) => curr + item.reservationNum, 0);
-      num += details.zeroArr.reduce((curr, item) => curr + item.reservationNum, 0);
-      num += details.stockArr.reduce((curr, item) => curr + item.reservationNum, 0);
-      return num;
-    });
     const ordNub = common_vendor.computed(() => {
       let num = 0;
       num += details.orderArr.length;
       num += details.zeroArr.length;
       return num;
     });
-    const signNub = common_vendor.computed(() => {
-      let num = 0;
-      details.datalist.map((item) => {
-        if (item.signforNub) {
-          num += item.signforNub;
-        }
-      });
-      return num;
-    });
     common_vendor.onLoad(async (op) => {
       details.items = JSON.parse(op.item);
       details.id = JSON.parse(op.item).id;
@@ -100,14 +88,16 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           orderCode: details.inputtxt
         };
         details.datalist = [];
-        let response = null;
+        const promise1 = api_user.signfororder(data, { isShowLoading: false });
-        response = await api_user.signfororder(data);
+        const promise2 = api_user.signforinventory(data, { isShowLoading: false });
+        common_vendor.index.showLoading();
+        const [response, response1] = await Promise.all([promise1, promise2]);
         if (response.code !== 200)
           return;
         details.zeroArr = [];
         details.orderArr = [];
-        if (response.data && response.data.records)
+        if (response.data && response.data)
-          response.data.records.forEach((val) => {
+          response.data.forEach((val) => {
             if (val.isZero === "1")
               return details.zeroArr.push(val);
             val.abnormalSignature = 0;
@@ -120,13 +110,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             });
             details.orderArr.push(val);
           });
-        let response1 = await api_user.signforinventory(data);
         if (response1.code !== 200)
           return;
         if (response1.data)
-          details.stockArr = response1.data.records || [];
+          details.stockArr = response1.data || [];
-        console.log("response :>> ", response);
+        computedNum();
-        console.log("response1 :>> ", response1);
         if (details.orderStatus === 1)
           details.datalist = details.orderArr;
         else if (details.orderStatus === 2)
@@ -135,6 +123,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           details.datalist = details.stockArr;
       } catch (err) {
         console.log("err :>> ", err);
+      } finally {
+        await common_vendor.nextTick$1();
+        common_vendor.index.hideLoading();
       }
     });
     common_vendor.onMounted(async () => {
@@ -149,12 +140,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         url: "/pagesHome/pages/orderDetails/orderDetails?orderCode=" + item.orderCode
       });
     }
-    common_vendor.onPullDownRefresh(() => {
+    function computedNum() {
-      const timer = setTimeout(() => {
+      const _arr = [...details.orderArr, ...details.zeroArr, ...details.stockArr];
-        initpage();
+      details.Plannednub = 0;
-        common_vendor.index.stopPullDownRefresh();
+      details.signNub = 0;
-        clearTimeout(timer);
+      for (let item of _arr) {
-      }, 500);
+        details.Plannednub += item.reservationNum;
+        details.signNub += item.signforNub;
+      }
+    }
+    common_vendor.onPullDownRefresh(async () => {
+      await initpage();
+      common_vendor.index.stopPullDownRefresh();
     });
     async function scandata() {
       let data = {
@@ -185,6 +182,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
                 title: response2.msg,
                 icon: "none"
               });
+              initpage();
               tip.value.setdetails({ isshow: false });
             },
             cancel: () => {
@@ -194,6 +192,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
               tip.value.setdetails({ isshow: false });
             }
           });
+          return;
         } else {
           common_vendor.index.showToast({
             title: response.msg,
@@ -221,6 +220,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
                 title: response2.msg,
                 icon: "none"
               });
+              initpage();
               tip.value.setdetails({ isshow: false });
             },
             cancel: () => {
@@ -230,6 +230,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
               tip.value.setdetails({ isshow: false });
             }
           });
+          return;
         } else {
           common_vendor.index.showToast({
             title: response.msg,
@@ -270,45 +271,53 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       }
     }
     async function initpage() {
-      let data = {
+      try {
-        reservationId: details.id,
+        details.listcheckindex = -1;
-        completecode: details.orderType,
+        let data = {
-        orderCode: details.inputtxt
+          reservationId: details.id,
-      };
+          completecode: details.orderType,
-      details.datalist = [];
+          orderCode: details.inputtxt
-      let response = null;
+        };
-      if (details.orderStatus == 1 || details.orderStatus === 2) {
+        details.datalist = [];
-        response = await api_user.signfororder(data);
+        let response = null;
-        if (response.code !== 200)
+        if (details.orderStatus == 1 || details.orderStatus === 2) {
-          return;
+          response = await api_user.signfororder(data);
-        details.zeroArr = [];
+          if (response.code !== 200)
-        details.orderArr = [];
+            return;
-        response.data.records.forEach((val) => {
+          details.zeroArr = [];
-          if (val.isZero === "1")
+          details.orderArr = [];
-            return details.zeroArr.push(val);
+          response.data.forEach((val) => {
-          val.abnormalSignature = 0;
+            if (val.isZero === "1")
-          val.abnormalLoading = 0;
+              return details.zeroArr.push(val);
-          val.distributionAppParcelListVOS.forEach((value) => {
+            val.abnormalSignature = 0;
-            if (value.isAbnnormalSigning === 1)
+            val.abnormalLoading = 0;
-              val.abnormalSignature += 1;
+            val.distributionAppParcelListVOS.forEach((value) => {
-            if (value.isAbnormalLoading === 1)
+              if (value.isAbnnormalSigning === 1)
-              val.abnormalLoading += 1;
+                val.abnormalSignature += 1;
+              if (value.isAbnormalLoading === 1)
+                val.abnormalLoading += 1;
+            });
+            console.log("val :>> ", val);
+            details.orderArr.push(val);
           });
-          console.log("val :>> ", val);
+        } else if (details.orderStatus == 3) {
-          details.orderArr.push(val);
+          response = await api_user.signforinventory(data);
-        });
+          if (response.code !== 200)
-      } else if (details.orderStatus == 3) {
+            return;
-        response = await api_user.signforinventory(data);
+          details.stockArr = response.data || [];
-        if (response.code !== 200)
+        }
-          return;
+        if (details.orderStatus === 1)
-        details.stockArr = response.data.records || [];
+          details.datalist = details.orderArr;
+        else if (details.orderStatus === 2)
+          details.datalist = details.zeroArr;
+        else
+          details.datalist = details.stockArr;
+      } catch (err) {
+        console.log("err :>> ", err);
+      } finally {
+        computedNum();
+        return null;
       }
-      if (details.orderStatus === 1)
-        details.datalist = details.orderArr;
-      else if (details.orderStatus === 2)
-        details.datalist = details.zeroArr;
-      else
-        details.datalist = details.stockArr;
     }
     function setcheckindex(index) {
       if (details.listcheckindex == index) {
@@ -425,9 +434,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         d: common_vendor.t(common_vendor.unref(items).deliveryPhone),
         e: common_vendor.o(showsdqs),
         f: common_vendor.t(common_vendor.unref(ordNub)),
-        g: common_vendor.t(common_vendor.unref(Plannednub)),
+        g: common_vendor.t(common_vendor.unref(details).Plannednub),
         h: common_vendor.t(common_vendor.unref(items).reservationNum),
-        i: common_vendor.t(common_vendor.unref(signNub)),
+        i: common_vendor.t(common_vendor.unref(details).signNub),
         j: common_vendor.o(checktype),
         k: common_vendor.p({
           data: common_vendor.unref(typearr),
@@ -453,78 +462,78 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
             c: common_vendor.t(item.reservationNum),
             d: common_vendor.t(item.loadingNub),
             e: common_vendor.t(item.signforNub),
-            f: common_vendor.t(item.reservationNum),
+            f: common_vendor.t(item.abnormalLoading),
-            g: common_vendor.t(item.abnormalLoading),
+            g: common_vendor.t(item.abnormalSignature),
-            h: common_vendor.t(item.abnormalSignature),
+            h: common_vendor.unref(listcheckindex) == index
-            i: common_vendor.unref(listcheckindex) == index
           }, common_vendor.unref(listcheckindex) == index ? {
-            j: "fb393026-4-" + i0 + "," + ("fb393026-3-" + i0),
+            i: "fb393026-4-" + i0 + "," + ("fb393026-3-" + i0),
-            k: common_vendor.p({
+            j: common_vendor.p({
               align: "left"
             }),
-            l: "fb393026-5-" + i0 + "," + ("fb393026-3-" + i0),
+            k: "fb393026-5-" + i0 + "," + ("fb393026-3-" + i0),
-            m: common_vendor.p({
+            l: common_vendor.p({
               align: "left"
             }),
-            n: "fb393026-6-" + i0 + "," + ("fb393026-3-" + i0),
+            m: "fb393026-6-" + i0 + "," + ("fb393026-3-" + i0),
-            o: common_vendor.p({
+            n: common_vendor.p({
               align: "left"
             }),
-            p: "fb393026-7-" + i0 + "," + ("fb393026-3-" + i0),
+            o: "fb393026-7-" + i0 + "," + ("fb393026-3-" + i0),
-            q: common_vendor.p({
+            p: common_vendor.p({
               align: "center"
             }),
-            r: "fb393026-3-" + i0 + "," + ("fb393026-2-" + i0),
+            q: "fb393026-3-" + i0 + "," + ("fb393026-2-" + i0),
-            s: common_vendor.f(item.distributionAppParcelListVOS, (ite, k1, i1) => {
+            r: common_vendor.f(item.distributionAppParcelListVOS, (ite, k1, i1) => {
               return {
                 a: common_vendor.t(ite.orderPackageCode),
-                b: "fb393026-9-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
+                b: ite.orderPackageStatus !== "70" ? 1 : "",
-                c: common_vendor.t(ite.thirdProduct),
+                c: "fb393026-9-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
-                d: "fb393026-10-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
+                d: common_vendor.t(ite.thirdProduct),
-                e: common_vendor.t(ite.orderPackageStatus === "70" ? "已扫" : "未扫"),
+                e: "fb393026-10-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
-                f: "fb393026-11-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
+                f: common_vendor.t(ite.orderPackageStatus === "70" ? "已扫" : "未扫"),
-                g: common_vendor.t(ite.isAbnnormalSigningName || ite.isAbnormalLoadingName || "/"),
+                g: "fb393026-11-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
-                h: "fb393026-12-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
+                h: common_vendor.t(ite.isAbnnormalSigningName || ite.isAbnormalLoadingName || "/"),
-                i: Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 ? 1 : "",
+                i: "fb393026-12-" + i0 + "-" + i1 + "," + ("fb393026-8-" + i0 + "-" + i1),
-                j: "fb393026-8-" + i0 + "-" + i1 + "," + ("fb393026-2-" + i0)
+                j: Number(ite.isAbnormalLoading) === 1 || Number(ite.isAbnnormalSigning) === 1 ? 1 : "",
+                k: "fb393026-8-" + i0 + "-" + i1 + "," + ("fb393026-2-" + i0)
               };
             }),
-            t: common_vendor.p({
+            s: common_vendor.p({
               align: "center"
             }),
-            v: common_vendor.sr("uniTable1", "fb393026-2-" + i0, {
+            t: common_vendor.sr("uniTable1", "fb393026-2-" + i0, {
               "f": 1
             }),
-            w: common_vendor.o(() => {
+            v: common_vendor.o(() => {
             }),
-            x: "fb393026-2-" + i0,
+            w: "fb393026-2-" + i0,
-            y: common_vendor.p({
+            x: common_vendor.p({
               border: true,
               emptyText: "暂无更多数据"
             })
           } : {}, {
-            z: common_vendor.t(item.signforNub == 0 ? "未扫" : item.signforNub == item.reservationNum ? "齐套" : "部分扫"),
+            y: common_vendor.t(item.signforNub == 0 ? "未扫" : item.signforNub == item.reservationNum ? "齐套" : "部分扫"),
-            A: common_vendor.n(item.signforNub == 0 ? "tip tp2" : item.signforNub == item.reservationNum ? "tip tp1" : "tip tp3"),
+            z: common_vendor.n(item.signforNub == 0 ? "tip tp2" : item.signforNub == item.reservationNum ? "tip tp1" : "tip tp3"),
-            B: common_vendor.o(($event) => setcheckindex(index))
+            A: common_vendor.o(($event) => setcheckindex(index))
           }) : {}, common_vendor.unref(orderStatus) === 2 ? common_vendor.e({
-            C: common_vendor.o(($event) => goorderdetail(item)),
+            B: common_vendor.o(($event) => goorderdetail(item)),
-            D: common_vendor.t(item.orderCode),
+            C: common_vendor.t(item.orderCode),
-            E: common_vendor.o(($event) => goorderdetail(item)),
+            D: common_vendor.o(($event) => goorderdetail(item)),
-            F: common_vendor.t(item.descriptionGoods),
+            E: common_vendor.t(item.descriptionGoods),
-            G: common_vendor.t(item.reservationNum),
+            F: common_vendor.t(item.reservationNum),
-            H: common_vendor.t(item.loadingNub),
+            G: common_vendor.t(item.loadingNub),
-            I: item.complete
+            H: item.complete
           }, item.complete ? {
-            J: common_vendor.t(item.complete),
+            I: common_vendor.t(item.complete),
-            K: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
+            J: common_vendor.n(item.completecode == 3 ? "tip tp1" : item.completecode == 1 ? "tip tp2" : "tip tp3")
           } : {}, {
-            L: common_vendor.o(($event) => checkphon(item, index))
+            K: common_vendor.o(($event) => checkphon(item, index))
           }) : {}, common_vendor.unref(orderStatus) === 3 ? {
-            M: common_vendor.t(item.sku),
+            L: common_vendor.t(item.sku),
-            N: common_vendor.t(item.descriptionGoods),
+            M: common_vendor.t(item.descriptionGoods),
-            O: common_vendor.t(item.specification),
+            N: common_vendor.t(item.specification),
-            P: common_vendor.t(item.logpmUnit),
+            O: common_vendor.t(item.logpmUnit),
-            Q: common_vendor.o(($event) => setcheckindex(index))
+            P: common_vendor.o(($event) => setcheckindex(index))
           } : {});
         }),
         w: common_vendor.unref(orderStatus) === 1,

unpackage/dist/dev/mp-weixin/pagesHome/pages/signOrderScan/signOrderScan.wxss

@@ -250,6 +250,10 @@
 .active td.data-v-fb393026 {
   color: #fff;
 }
+.isScan.data-v-fb393026 {
+  background: var(--subjectColor);
+  color: #fff;
+}
 .uni-table .active.data-v-fb393026:hover {
   background: #ff4344 !important;
 }

unpackage/dist/dev/mp-weixin/pagesHome/pages/signinScan/signinScan.js

@@ -122,14 +122,41 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       details.show = value;
     }
     function gocustomersign(item) {
+      console.log("item :>> ", item);
+      const data = {
+        type_name: item.type_name,
+        deliStatus_name: item.deliStatus_name,
+        vehicleName: item.vehicleName,
+        driverName: item.driverName,
+        loadingTeamName: item.loadingTeamName,
+        isstock: item.isstock,
+        customersNumber: item.customersNumber,
+        orderNumber: item.orderNumber,
+        id: item.id
+      };
       common_vendor.index.navigateTo({
-        url: "/pagesHome/pages/CustomerSign/CustomerSign?item=" + JSON.stringify(item)
+        url: "/pagesHome/pages/CustomerSign/CustomerSign?item=" + JSON.stringify(data)
       });
     }
     function goSignDetailScan(item) {
       console.log("item :>> ", item);
+      const data = {
+        type_name: item.type_name,
+        deliStatus_name: item.deliStatus_name,
+        vehicleName: item.vehicleName,
+        driverName: item.driverName,
+        loadingTeamName: item.loadingTeamName,
+        isstock: item.isstock,
+        customersNumber: item.customersNumber,
+        orderNumber: item.orderNumber,
+        loadCusNub: item.loadCusNub,
+        loadOrdNub: item.loadOrdNub,
+        signNub: item.signNub,
+        signNubSr: item.signNubSr,
+        id: item.id
+      };
       common_vendor.index.navigateTo({
-        url: "/pagesHome/pages/SignDetailScan/SignDetailScan?item=" + JSON.stringify(item)
+        url: "/pagesHome/pages/SignDetailScan/SignDetailScan?item=" + JSON.stringify(data)
       });
     }
     function cleartime() {

unpackage/dist/dev/mp-weixin/utils/request.js

@@ -192,7 +192,8 @@ const HandleRequest = (params, key, loadingObj) => {
       utils_functions.api.error("请检查是否连接到无线网络");
     }).finally(async (res) => {
       await common_vendor.nextTick$1();
-      common_vendor.index.hideLoading();
+      if (loadingObj.isShowLoading !== false)
+        common_vendor.index.hideLoading();
     });
   });
 };