diff --git a/pages/warehousing/list.vue b/pages/warehousing/list.vue
index c512161..00b979f 100644
--- a/pages/warehousing/list.vue
+++ b/pages/warehousing/list.vue
@@ -2,56 +2,54 @@
 	<tpx-page>
 		<tpx-layout>
 			<template v-slot:header>
-				<view class="search_nav_bar">
+				<view class="customer_nav_bar">
 					<view class="com-jianju pt-30">
 						<!-- 关键字搜索框 -->
-						<tpx-search placeholder="请输入订单号/运单号/进仓单号/姓名/手机" v-model:value="searchParam.searchValue" @change="handleSearch" bgColor="#FFF" :timelyTrigger="false"></tpx-search>
+						<tpx-search placeholder="请输入订单号/运单号/进仓单号/姓名/手机" v-model:value="searchParam.searchValue"
+							@change="handleSearch" bgColor="#FFF" :timelyTrigger="false"></tpx-search>
 					</view>
-					
+
 					<view class="com-jianju" style="padding-top: 30rpx;">
 						<u-row justify="between" align="top">
 							<u-col span="12">
-								<tpx-tabs :list="dicData.emis_wsin_tab" v-model:value="searchParam.params.queryStatusType"
-									v-slot="curOrdTab"
-								>
+								<tpx-tabs :list="dicData.emis_wsin_tab"
+									v-model:value="searchParam.params.queryStatusType" v-slot="curOrdTab">
 									<text slot>
 									</text>
 								</tpx-tabs>
 							</u-col>
 							<u-col v-if="false" span="2">
 								<!-- 更多查询条件 -->
-								<u-button @click="handleDialogClick(moreSearchModel)" :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
+								<u-button @click="handleDialogClick(moreSearchModel)" :hairline="false" shape="circle"
+									size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;">
 									<u-row justify="center">
-										<view :style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
+										<view
+											:style="'padding-right: 4rpx;white-space: nowrap;' + (hasExtSchParam?'color: #B12D29;':'color: #666;')">
 											{{hasExtSchParam?'已':''}}筛选
 										</view>
-										<u-icon :name="moreSearchModel.show?'arrow-up-fill':'arrow-down-fill'" 
-											:color="(hasExtSchParam?'#B12D29':'#666')" size="18" custom-style="margin-top: 2rpx;"
-										></u-icon>
+										<u-icon :name="moreSearchModel.show?'arrow-up-fill':'arrow-down-fill'"
+											:color="(hasExtSchParam?'#B12D29':'#666')" size="18"
+											custom-style="margin-top: 2rpx;"></u-icon>
 									</u-row>
 								</u-button>
 							</u-col>
 						</u-row>
 					</view>
-					
+
 					<!-- 状态搜索 -->
 					<view v-if="moreSearchModel.show" class="search-more-panel">
 						<view class="smp-body slideInDown animated fast">
 							<view class="smp-content">
 								<view class="pos-abt-all" style="overflow-y: auto;">
-									<view style="padding: 0 0 30rpx 0">
-										<view>
-											<u-text text="时间范围" size="28" :bold="true" margin="20rpx 0 20rpx 0"></u-text>
-											<tpx-date-input v-model:value="moreSearchModel.data._date" placeholder="请选择时间"></tpx-date-input>
-										</view>
-									</view>
+									<view style="padding: 0 0 30rpx 0"></view>
 								</view>
 							</view>
 							<view class="smp-foot">
 								<u-row gutter="20" justify="between">
 									<u-button @click="handleResetTempSearch()" shape="circle">重置</u-button>
 									<view style="width: 40rpx;"></view>
-									<u-button @click="handleConfirmTempSearch()" shape="circle" type="primary">确认</u-button>
+									<u-button @click="handleConfirmTempSearch()" shape="circle"
+										type="primary">确认</u-button>
 								</u-row>
 							</view>
 						</view>
@@ -61,39 +59,63 @@
 			<template v-slot:body>
 				<view class="pos-abt-all">
 					<tpx-scroll-view v-model:resObject="resData" :searchParam="searchParam" :getListFun="getListFun"
-						ref="listRef"
-					>
+						ref="listRef">
 						<view class="pgb-cont">
 							<!-- 列表数据 -->
 							<view v-for="(item) in resData.list" class="ord-list-item">
-								<view class="mt-10">
-									<bpd-send-reciever-tmp :value="item" :showInfoBtn="false"></bpd-send-reciever-tmp>
+								<u-row justify="between">
+									<text>进仓单号:{{item.inNo}}</text>
+									<view class="com-tag-grey font-26">
+										<tetx v-if="item.status == 0">未入仓</tetx>
+										<tetx v-if="item.status == 1">已入仓</tetx>
+										<tetx v-if="item.status == 2">部分入仓</tetx>
+										<tetx v-if="item.status == 3">全部入仓</tetx>
+									</view>
+								</u-row>
+								<u-text margin="5rpx 0" :text="item.waybillDetail.goodsInfo"
+									size="26" color="#999"></u-text>
+								<view class="mt-10" @click="handleGoDetail(item)">
+									<u-row justify="between" align="center">
+										<u-row custom-style="flex:1;" justify="between">
+											<u-col span="4">
+												<u-text :text="(item.waybillDetail.sendCountryName + item.waybillDetail.sendProvinceName)||'-'" size="30" :bold="true" align="center"></u-text>
+												<u-text :text="item.waybillDetail.sendName" size="26" color="#999" margin="20rpx 0 0 0"
+													align="center"></u-text>
+											</u-col>
+											<u-col span="4" justify="center" align="center"
+												custom-style="text-align: center;">
+												<image style="width: 70rpx;height: 14rpx;"
+													:src="getCdnUrl('search/toline.png')">
+												</image>
+											</u-col>
+											<u-col span="4">
+												<u-text :text="(item.waybillDetail.receiveCountryName + item.waybillDetail.receiveProvinceName)||'-'" size="30" :bold="true" align="center"></u-text>
+												<u-text :text="item.waybillDetail.receiveName" size="26" color="#999" margin="20rpx 0 0 0"
+													align="center"></u-text>
+											</u-col>
+										</u-row>
+										<!-- <u-row custom-style="margin-left:20rpx;">
+											<u-image shape="square" width="160" height="160" radius="10"></u-image>
+										</u-row> -->
+									</u-row>
 								</view>
+								<u-row custom-style="margin-top:30rpx;" justify="between">
+									<view>
+										<u-text :text="`订单号：${item.orderSn}`" color="#999" size="26"></u-text>
+									</view>
+									<view>
+										<u-text :text="`${item.createTime}`" color="#999" size="26"></u-text>
+									</view>
+								</u-row>
 								<u-line color="#DEDEDE" margin="30rpx 0 0 0"></u-line>
 								<u-row justify="end" custom-style="margin-top:20rpx;">
-									<view style="display: inline-block;white-space: nowrap;">
-										<u-row>
-											<!-- 仓库收货(待揽收): -->
-											<u-button v-if="(item.orderStatus == 1 && item.waybillStatus == 0)"
-												@click="handleDealItem(item, { type: 4 })" shape="circle" type="primary" :plain="true"
-												custom-style="height: 54rpx;margin-left: 12rpx;">进仓确认</u-button>
-												
-											<!-- 待接单 -->
-											<u-button v-if="(item.orderStatus == 0)"
-												@click="handleDealItem(item, { type: 2 })" shape="circle" type="primary"
-												custom-style="height: 54rpx;margin-left: 12rpx;">再来一单</u-button>
-												
-											<!-- 待接单 -->
-											<u-button v-if="(item.orderStatus == 0)"
-												@click="handleDealItem(item, { type: 3 })" shape="circle" type="primary"
-												:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">取消</u-button>
-											
-											<!-- 待付款 -->
-											<u-button v-if="(item.paymentStatus == 0)"
-												@click="handleDealItem(item, { type: 5 })" shape="circle" type="primary" :plain="true"
-												custom-style="height: 54rpx;margin-left: 12rpx;">去付款</u-button>
-										</u-row>
-									</view>
+									<u-row>
+										<u-button shape="circle" type="primary" :plain="true"
+											@click="goto(`warehousing/pdfPreview?id=${112}`)"
+											custom-style="width: 180rpx;box-sizing: content-box;height: 54rpx;margin-left: 12rpx;">下载打印PDF</u-button>
+										<u-button v-if="item.confirmStatus!=1" shape="circle" type="primary" @click="handleGoDetail(item)"
+											custom-style="width: 100rpx;box-sizing: content-box;height: 54rpx;margin-left: 12rpx;">去确认</u-button>
+									</u-row>
 								</u-row>
 							</view>
 						</view>
@@ -101,24 +123,26 @@
 				</view>
 			</template>
 		</tpx-layout>
-	
+
 	</tpx-page>
 </template>
 <script>
 	import * as apiService from "@/common/api"
 	import BpdSendRecieverTmp from "@/components/buns-post-detail-templates/bpd-send-reciever-tmp"
-	import { deepAssign } from "@/common/util"
+	import {
+		deepAssign
+	} from "@/common/util"
 	export default {
 		props: {
-			
+
 		},
 		computed: {
 			dicData() {
-			  return this.$store.getters.dicData
+				return this.$store.getters.dicData
 			},
 			hasExtSchParam() {
 				let hasExt = false
-				if(
+				if (
 					this.searchParam._date.length > 0
 				) {
 					hasExt = true
@@ -126,21 +150,16 @@
 				return hasExt
 			},
 		},
-		components: { BpdSendRecieverTmp },
+		components: {
+			BpdSendRecieverTmp
+		},
 		data() {
 			let { dicData } = this.$store.getters
 			return {
-				showCladar: false,
 				moreSearchModel: {
 					data: {},
 					show: false
 				},
-				cancelModal: {
-					show: false,
-					data: { 
-						orderRemark: ''
-					}
-				},
 				searchParam: {
 					searchValue: '',
 					_date: [],
@@ -148,42 +167,40 @@
 						queryStatusType: dicData.emis_wsin_tab?.[0]?.val,
 					}
 				},
-				queryOption: {
-					
-				},
-				resData: { list: [] }
+				queryOption: {},
+				resData: {
+					list: []
+				}
 			}
 		},
-		onShareAppMessage() {
-		},
-		onShow(){
+		onShareAppMessage() {},
+		onShow() {
 			this.triggerListReload()
 			this.initData()
 		},
 		onLoad(option) {
 			this.queryOption = option
 		},
-		onUnload() {
-		},
-		methods: { 
-			transSearchPm(param){
+		onUnload() {},
+		methods: {
+			transSearchPm(param) {
 				let cpParam = JSON.parse(JSON.stringify(param))
 				cpParam.params.beginDate = cpParam?._date?.[0]
 				cpParam.params.endDate = cpParam?._date?.[1]
 				return cpParam
 			},
-			async getListFun(param){
+			async getListFun(param) {
 				let cpParam = this.transSearchPm(param)
 				let res = await apiService.getWarehouseInList(cpParam)
 				return res
 			},
-			initData(){
-				
+			initData() {
+
 			},
-			async handleDealItem(item, deal = { type: '1' }) {
+			async handleDealItem(item, deal = { type: '1' }){
 				// 下载 exportWarehouseInTpl
 				let itemQuery = `?billCode=${item.billCode || ''}&orderSn=${item.orderSn || ''}`
-				switch (deal.type){
+				switch (deal.type) {
 					case 1: // 运单详情
 						this.goto(`post/detail${itemQuery}`)
 						break;
@@ -191,23 +208,23 @@
 						break;
 				}
 			},
-			handleSearch(){
-				setTimeout(()=> {
+			handleSearch() {
+				setTimeout(() => {
 					this.triggerListReload()
 				}, 300)
 			},
-			triggerListReload(){
+			triggerListReload() {
 				this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
 			},
-			handleDialogClick(curModal){
+			handleDialogClick(curModal) {
 				this.moreSearchModel.data = JSON.parse(JSON.stringify(this.searchParam))
 				this.moreSearchModel.show = !this.moreSearchModel.show
 			},
-			handleResetTempSearch(){
+			handleResetTempSearch() {
 				let data = this.moreSearchModel.data
 				data._date = []
 			},
-			handleConfirmTempSearch(){
+			handleConfirmTempSearch() {
 				deepAssign(this.searchParam, this.moreSearchModel.data)
 				this.moreSearchModel.show = false
 			}
@@ -221,14 +238,15 @@
 		background-color: #F6F6F6;
 		height: 100% !important;
 	}
-	.search_nav_bar {
-		background-color: #fff;
+	.customer_nav_bar {
+		padding-top: 30rpx;
+		background-color: #FFF;
 		position: relative;
 	}
 </style>
 <style scoped lang="scss">
 	.pgb-cont{
-		padding: 30rpx 30rpx 0 30rpx;
+		padding: 30rpx;
 	}
 	
 	.ord-list-item{