diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index 616bfc3..357b139 100644
--- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -79,7 +79,7 @@
 
 <style scoped lang="scss">
 	.shet-cont{
-		padding: 10rpx 0 30rpx 0;
+		padding: 0;
 	}
 	.jsfm-item{
 		margin-top: 30rpx;
diff --git a/pages.json b/pages.json
index 6771ae7..8690d23 100644
--- a/pages.json
+++ b/pages.json
@@ -146,6 +146,25 @@
 			"style": {
 				"navigationBarTitleText": "揽收扫描"
 			}
+		},
+		{
+			"path": "pages/deliveryDeal/storage",
+			"style": {
+				"navigationBarTitleText": "入库"
+			}
+		},
+		
+		{
+			"path": "pages/warehousing/detail",
+			"style": {
+				"navigationBarTitleText": "进仓单详情"
+			}
+		},
+		{
+			"path": "pages/warehousing/pdfPreview",
+			"style": {
+				"navigationBarTitleText": "进仓单预览"
+			}
 		}
 	],
 	"subPackages": [{
diff --git a/pages/deliveryDeal/pickUp.vue b/pages/deliveryDeal/pickUp.vue
index bebbb14..d382f6f 100644
--- a/pages/deliveryDeal/pickUp.vue
+++ b/pages/deliveryDeal/pickUp.vue
@@ -15,10 +15,12 @@
 					</u-row>
 				</view>
 				
-				<view class="com-section mt-30" @click="handleDialogClick(orderDetailModal)">
+				<view class="mt-30" @click="handleDialogClick(orderDetailModal)">
 					<u-row justify="space-between">
-						<text>订单号：TWO291929</text>
-						<u-icon name="bag" size="42"></u-icon>
+						<view class="com-section">订单号：TWO291929</view>
+						<view>
+							<button size="mini">订单详情</button>
+						</view>
 					</u-row>
 				</view>
 				<view class="blcok-white">
diff --git a/pages/deliveryDeal/storage.vue b/pages/deliveryDeal/storage.vue
new file mode 100644
index 0000000..e5751c0
--- /dev/null
+++ b/pages/deliveryDeal/storage.vue
@@ -0,0 +1,193 @@
+<template>
+	<tpx-layout>
+		<template v-slot:body>
+			<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
+				<view class="blcok-white">
+					<u-row justify="between">
+						<view style="flex:1;">
+							<tpx-scan-input v-model:value="submitParam.yundanhao"></tpx-scan-input>
+						</view>
+						<view class="pl-10">
+							<u-button custom-style="height: 74rpx;">确定</u-button>
+						</view>
+						
+					</u-row>
+				</view>
+				
+				<view class="mt-30" @click="handleDialogClick(orderDetailModal)">
+					<u-row justify="space-between">
+						<view class="com-section">进仓单号：TWO291929</view>
+						<view>
+							<button size="mini">订单详情</button>
+						</view>
+					</u-row>
+				</view>
+				
+				<view class="blcok-white">
+					<u-row justify="between">
+						<view class="font-30 font-weight">缅甸</view>
+						<view class="font-30 font-weight">缅甸特快</view>
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;" justify="between">
+						<view >
+							<text class="clr-sub">寄件人：</text>
+							<text>李先生</text>
+						</view>
+						<view >
+							<text class="clr-sub">手机号：</text>
+							<text>18627068352</text>
+						</view>
+					</u-row>
+				</view>
+			
+				
+				<view class="com-section mt-30">托寄货物描述</view>
+				<view class="blcok-white">
+					<tpx-input placeholder="进仓后缀" :isWhite="true"></tpx-input>
+					<view class="mt-30">
+						<bpe-gooditem-edit-tmp :value="submitParam"></bpe-gooditem-edit-tmp>
+					</view>
+				</view>
+				
+				<view class="blcok-white">
+					<bpe-goodphoto-tmp title="货物照片" :value="submitParam" filedName="phName"></bpe-goodphoto-tmp>
+				</view>
+				
+				<view class="blcok-white">
+					<bpe-good-kuaidi-tmp :value="submitParam"></bpe-good-kuaidi-tmp>
+				</view>
+				
+				<view class="blcok-white">
+					<bpe-goodsize-tmp :value="submitParam"></bpe-goodsize-tmp>
+					<u-row justify="space-between" align="top" custom-style="margin-top:20rpx;">
+						<view >备注</view>
+						<view style="width: 70%;">
+							<u-textarea v-model="submitParam.otherDes" border="surround" height="120" placeholder="备注"
+								maxlength="50" count></u-textarea>
+						</view>
+					</u-row>
+				</view>
+				
+			</view>
+		</template>
+		<template v-slot:footer>
+			<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
+				<u-row>
+					<u-button size="large" shape="circle" @click="goto(`warehousing/detail`)"
+						custom-style="width: 260rpx;height:80rpx;font-size: 30rpx;" :plain="true" type="primary">进仓登记</u-button>
+						
+					<u-button size="large" shape="circle"
+						custom-style="width: 400rpx;height:80rpx;font-size: 30rpx;" type="primary">货齐开单</u-button>
+				</u-row>
+			</view>
+		</template>
+	</tpx-layout>
+	
+	<tpx-dialog v-model:show="orderDetailModal.show" title="订单详情" contentStyle="padding:0;">
+		<bo-detail-tmp v-model:value="submitParam"></bo-detail-tmp>
+	</tpx-dialog>
+	
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import { sendTypeEnum, sendTypeList, qingguanList, baoguanList, } from "@/common/enum"
+	import { goto } from "@/common/untool"
+	import BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp"
+	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
+	import BoDetailTmp from "@/components/buns-order-templates/bo-detail-tmp"
+	import BpeGoodKuaidiTmp from "@/components/buns-post-edit-templates/bpe-good-kuaidi-tmp"
+	import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp"
+	
+	export default {
+		components: { BpeGooditemEditTmp, BpeGoodphotoTmp, BoDetailTmp, BpeGoodKuaidiTmp, BpeGoodsizeTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+
+		},
+		data() {
+			return {
+				kehuList: [{title: '李先生', val: '11'}],
+				...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
+				tipsList: [
+					
+				],
+				orderDetailModal: {
+					show: false
+				},
+				submitParam: {
+					yundanhao: '',
+					stockRoomId: '',
+					countryId: '',
+					wayId: '',
+					type: sendTypeList[0].val,
+					paytype: '',
+					otherDes: '',
+					prodId: 1,
+					tips: [],
+					revtime: '',
+					gdList: [{},{}]
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+			goto,
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			
+			handleAgree() {
+				this.agreePrivateRule = !this.agreePrivateRule
+			},
+			handleDialogClick(curModal){
+				curModal.show = true
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.yunf-item {
+		margin-bottom: 20rpx;
+		padding: 30rpx;
+		background: #F6F6F6;
+		border-radius: 20rpx;
+		border: 2rpx solid transparent;
+		&.active {
+			border-color: $uni-color-primary;
+		}
+	}
+	
+	.yunf-input-item{
+		padding: 26rpx 0;
+		border-bottom: 2rpx solid #F6F6F6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabBar/deal/deal.vue b/pages/tabBar/deal/deal.vue
index a7d604d..da6bec4 100644
--- a/pages/tabBar/deal/deal.vue
+++ b/pages/tabBar/deal/deal.vue
@@ -63,7 +63,7 @@
 					{  title: '发件扫描', subTitle: "", icon: getCdnUrl(`home/fajiansm.png`), url: '' },
 					{  title: '合包扫描', subTitle: "", icon: getCdnUrl(`home/hebaosm.png`), url: '' },
 					{  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: '' },
-					{  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: '' },
+					{  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
 					{  title: '发件清单', subTitle: "", icon: getCdnUrl(`home/fjqingdan.png`), url: 'deliveryDeal/sendList' },
 					{  title: '拆包扫描', subTitle: "", icon: getCdnUrl(`home/chaibsm.png`), url: '' },
 					{  title: '报关扫描', subTitle: "", icon: getCdnUrl(`home/baogsm.png`), url: '' },
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 05da32d..f56dbc2 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -122,7 +122,7 @@
 					{  title: '到货扫描', subTitle: "", icon: getCdnUrl(`home/daohsm.png`), url: '' },
 					{  title: '快件查询', subTitle: "", icon: getCdnUrl(`home/kdchxun.png`), url: '' },
 					{  title: '面单补打', subTitle: "", icon: getCdnUrl(`home/mdbuda.png`), url: 'print/courierNote' },
-					{  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: '' },
+					{  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
 					{  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: 'post/post' }
 				]
 			}
diff --git a/pages/warehousing/detail.vue b/pages/warehousing/detail.vue
new file mode 100644
index 0000000..fda03bd
--- /dev/null
+++ b/pages/warehousing/detail.vue
@@ -0,0 +1,332 @@
+<template>
+	<tpx-layout>
+		<template v-slot:header></template>
+		<template v-slot:body>
+			<view class="dt-block">
+				<view class="dt-tle">
+					<view class="t1">订单号: Tw891823727001</view>
+					<view class="t2">
+						<text class="clr-prm">{{'待遗收'}}</text>
+					</view>
+				</view>
+				<u-line margin="20rpx 0 20rpx"></u-line>
+				<view>
+					<bpe-addressjiami-tmp v-model:value="submitParam"></bpe-addressjiami-tmp>
+				</view>
+				
+			</view>
+			
+			<view class="dt-block">
+				<view class="dt-tle" @click="setClipboardData('xxxxxxx')">
+					<view class="t1">柯桥仓库联系信息</view>
+					<view class="t2">
+						<u-icon name="file-text" size="38" custom-style=""></u-icon>
+					</view>
+				</view>
+				<u-line margin="20rpx 0 20rpx"></u-line>
+				<view>
+					<view>
+						<text class="font-weight font-28 pr-20">李先生</text>
+						<text class="clr-sub font-28">18627068352</text>
+					</view>
+					<u-text :text="'上海市大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界大世界'"
+						size="24" margin="20rpx 0 0 0" color="#999" 
+					></u-text>
+				</view>
+			</view>
+			
+			<view class="dt-block">
+				<view class="dt-tle">
+					<view class="t1">进仓货物总览</view>
+					<view class="t2">
+						<text class="clr-prm">{{'部分入仓'}}</text>
+					</view>
+				</view>
+				<u-line margin="20rpx 0 20rpx"></u-line>
+				<view class="dt-item font-28">
+					<view>
+						<text class="pr-20 clr-sub">总重量:</text>
+						<text class="">30 kg</text>
+					</view>
+					<view>
+						<text class="pr-20 clr-sub">总体积:</text>
+						<text class="">30m</text>
+					</view>
+					<view>
+						<text class="pr-20 clr-sub">总件数:</text>
+						<text class="">10</text>
+					</view>
+				</view>
+				<view v-for="(item) in ydList" class="yditem">
+					<view class="ydi-lab">
+						<text class="font-weight">女士针织棉上衣</text>
+						<text>预报: 300</text>
+					</view>
+					<view class="ydi-lab mt-10">
+						<text class="clr-sub">无 12L 中国内地</text>
+						<text>实入仓: 0</text>
+					</view>
+					<view class="ydi-lab mt-10">
+						<text class="clr-prm">12 CNY</text>
+					</view>
+				</view>
+				
+				
+				<!-- <u-row justify="end">
+					<view style="display: inline-block;white-space: nowrap;" class="mt-10">
+						<u-row>
+							<u-button shape="circle" type="primary"
+								custom-style="height: 54rpx;margin-left: 20rpx;">进仓单</u-button>
+							<u-button shape="circle" type="primary" :plain="true"
+								custom-style="height: 54rpx;margin-left: 20rpx;">补单证资料</u-button>
+						</u-row>					
+					</view>
+				</u-row> -->
+				
+			</view>
+			
+			<view v-for="(item) in jcList" class="dt-block" style="padding-bottom: 2rpx;">
+				<view class="dt-tle">
+					<view class="t1">进仓单号:TAN-102032138002</view>
+					<view class="t2">
+						<!-- <text class="clr-prm">{{'部分入仓'}}</text> -->
+					</view>
+				</view>
+				<u-line margin="20rpx 0 20rpx"></u-line>
+				
+				<view class="dt-item font-28">
+					<view>
+						<text class="pr-20 clr-sub">进仓时间:</text>
+						<text class="font-weight">2023-77-20 09:25</text>
+					</view>
+					<view>
+						<text class="pr-20 clr-sub">操作员:</text>
+						<text class="font-weight">王小明</text>
+					</view>
+				</view>
+				
+				<view v-for="(clItem) in [{}, {}, {}]" class="yditem">
+					<view class="ydi-lab">
+						<text class="font-weight">塑料拉链</text>
+						<text>破损:1</text>
+					</view>
+					<view class="ydi-lab mt-10">
+						<text class="clr-sub">品牌 规格 原产地</text>
+						<text class="clr-prm">实入:10</text>
+					</view>
+				</view>
+				
+				<view class="yditem" style="padding-bottom: 5rpx;">
+					<view class="dt-item font-28">
+						<view>
+							<text class="pr-20 clr-sub">重量:</text>
+							<text class="">30 kg</text>
+						</view>
+						<view>
+							<text class="pr-20 clr-sub">体积:</text>
+							<text class="">30m</text>
+						</view>
+						<view>
+							<text class="pr-20 clr-sub">件数:</text>
+							<text class="">10</text>
+						</view>
+					</view>
+					
+					<view class="dt-item font-28">
+						<view>
+							<text class="pr-20 clr-sub">包装类型:</text>
+							<text class="">纸箱</text>
+						</view>
+						<view>
+							<text class="pr-20 clr-sub">供应商:</text>
+							<text class="">南京制衣有限公司</text>
+						</view>
+					</view>
+					<view class="dt-item font-28">
+						<view>
+							<text class="pr-20 clr-sub">同行快:</text>
+							<text class="">顺丰</text>
+						</view>
+						<view>
+							<text class="pr-20 clr-sub">快递单号:</text>
+							<text class="">SF01023293239</text>
+						</view>
+					</view>
+					<view class="dt-item font-28">
+						<view>
+							<text class="pr-20 clr-sub">代垫运费:</text>
+							<text class="font-weight clr-prm">￥30</text>
+						</view>
+					</view>
+					
+					<view class="dt-item font-28">
+						<view>
+							<text class="pr-20 clr-sub">发货备注:</text>
+							<text class=" ">需要检查下产品规格型号是否一致，请拍照</text>
+						</view>
+					</view>
+					
+					<view class="dt-item font-28" style="margin-bottom: 10rpx;">
+						<view>
+							<text class="pr-20 clr-sub">仓库收货备注:</text>
+							<text class=" ">发现有异常，见拍照图片</text>
+						</view>
+					</view>
+					<view class="mb-20">
+						<u-row>
+							<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
+								custom-style="margin: 20rpx 20rpx 0 0;"
+							></u-image>
+							<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
+								custom-style="margin: 20rpx 20rpx 0 0;"
+							></u-image>
+						</u-row>
+					</view>
+				</view>
+				<u-row justify="end">
+					<view style="display: inline-block;white-space: nowrap;" class="mt-10 pb-30">
+						<u-row>
+							<u-button @click="handleFeedSwitch" shape="circle" :plain="true"
+								custom-style="height: 54rpx;margin-left: 20rpx;">反馈异常</u-button>
+							<u-button shape="circle" type="primary" 
+								custom-style="height: 54rpx;margin-left: 20rpx;">进仓确认</u-button>
+						</u-row>					
+					</view>
+				</u-row>
+				
+			</view>
+		</template>
+		<template v-slot:footer>
+			<view class="blcok-white-noradius">
+				<u-row justify="space-around">
+					<u-button @click="goto(`warehousing/pdfPreview?id=${112}`)" :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+					>下载PDF
+					</u-button>
+					<u-button @click="goto(`post/post?id=${222}`)" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+					>已确认可发货
+					</u-button>
+				</u-row>
+			</view>
+		</template>
+	</tpx-layout>
+	
+	
+	<tpx-com-dialog v-model:show="feedModal.show" title="反馈内容" @onSure="handleSubmitFeed">
+		<template v-slot:body>
+			<u-input placeholder="请输入" custom-style="height: 56rpx;font-size: 28rpx;"></u-input>
+		</template>
+	</tpx-com-dialog>
+	
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import { goto, goBack, setClipboardData, confirmModal, showLoading } from "@/common/untool"
+	import BpeAddressjiamiTmp from "@/components/buns-post-edit-templates/bpe-addressjiami-tmp"
+	
+	export default {
+		components: { BpeAddressjiamiTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+		},
+		data() {
+			return {
+				submitParam: {},
+				ydList: [
+					{}
+				],
+				jcList: [
+					{},{},{}
+				],
+				feedModal: {
+					show: false
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad(queryOption) {
+			this.queryOption = queryOption
+			this.initData();
+		},
+		onUnload() {
+		},
+		methods: {
+			setClipboardData,
+			goto,
+			getCdnUrl,
+			initData(){
+				// showLoading()
+			},
+			handleFeedSwitch() {
+				this.feedModal.show = true
+			},
+			handleSubmitFeed() {
+				this.feedModal.show = false
+			},
+			handlePreviewDiDan() {
+				uni.previewImage({
+					urls: [
+						this.getCdnUrl(`mine/kjcha.png`)
+					]
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+	
+</style>
+<style scoped lang="scss">
+	.dt-block {
+		margin-top: 30rpx;
+		padding: 30rpx;
+		background-color: #FFF;
+		position: relative;
+	}
+	.dt-tle {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		.t1 {
+			font-size: 30rpx;
+			font-weight: 600;
+		}
+		.t2{
+			font-size: 30rpx;
+		}
+	}
+	.dt-item {
+		display: flex;
+		flex-direction: row;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+	}
+	
+	.yditem{
+		padding: 20rpx 20rpx;
+		background-color: #F6F6F6;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+	}
+	.ydi-lab{
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/warehousing/pdfPreview.vue b/pages/warehousing/pdfPreview.vue
new file mode 100644
index 0000000..5ee9b06
--- /dev/null
+++ b/pages/warehousing/pdfPreview.vue
@@ -0,0 +1,76 @@
+<template>
+	<tpx-layout>
+		<template v-slot:header></template>
+		<template v-slot:body>
+			<view class="dt-block">
+				
+			</view>
+		</template>
+		<template v-slot:footer>
+			<view class="blcok-white-noradius">
+				<u-row justify="space-around">
+					<u-button  @click="downloadFile(``)" :plain="true" size="large" shape="circle" type="primary" custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+					>下载PDF到本地
+					</u-button>
+					<u-button @click="setClipboardData(`dasdasd`)" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+					>复制分享链接
+					</u-button>
+				</u-row>
+			</view>
+		</template>
+	</tpx-layout>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import { goto, goBack, setClipboardData, confirmModal, showLoading, downloadFile } from "@/common/untool"
+
+	export default {
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad(queryOption) {
+			this.queryOption = queryOption
+			this.initData();
+		},
+		onUnload() {
+		},
+		methods: {
+			setClipboardData,
+			goto,
+			downloadFile,
+			getCdnUrl,
+			initData(){
+				// showLoading()
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+	
+</style>
+<style scoped lang="scss">
+	
+</style>
\ No newline at end of file