diff --git a/common/api/order.js b/common/api/order.js
index bac080e..dfbce6e 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -95,11 +95,6 @@ export const calcVolumeWeight = (data = {})=> {
 	return coreRequest(url.calcVolumeWeight, data, {})
 }
 
-
-// 下单-进仓列表
-export const warehouseInList = (data = {})=> {
-	return coreRequest(url.warehouseInList, data, {}, "GET")
-}
  
 // 订单列表
 export const getOrderList = (data = {})=> {
@@ -209,11 +204,16 @@ export const registerWarehouseInInfo = (data = {})=> {
 }
 
 // 进仓单列表
-export const queryWarehouseList = (data = {})=> {
-	return coreRequest(url.queryWarehouseList, data, {}, "GET")
+export const getWarehouseInList = (data = {})=> {
+	return coreRequest(url.getWarehouseInList, data, {}, "GET")
 }
 
 // 进仓单登记-列表
 export const getWarehouseBatchInList = (data = {})=> {
 	return coreRequest(url.getWarehouseBatchInList, data, {}, "GET")
-}
\ No newline at end of file
+}
+
+// 进仓单PDF下载连接
+export const exportWarehouseInTpl = (data = {})=> {
+	return coreRequest(url.exportWarehouseInTpl, data, {})
+} 
\ No newline at end of file
diff --git a/common/api/url.js b/common/api/url.js
index bd95cbb..a019235 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -36,7 +36,7 @@ export default {
   calcWaybillFee: `/emis/emisWaybill/calcWaybillFee`, // 计算运费
   calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量
   calcVolumeWeight: `/emis/emisWaybill/calcVolumeWeight`, // 体积重量计算 
-  warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表
+  
   getOrderList: `/emis/emisWaybill/listSimple`, // 订单列表
   getWaybillStatMap: `/emis/emisWaybill/getWaybillStatMap`, // 运单统计数据
   getOrderDetail: `/emis/emisWaybill/getWaybillDetail`, // 订单详情
@@ -63,8 +63,8 @@ export default {
   
   getWarehouseInInfo: `/emis/emisWarehouseIn/getWarehouseInInfo`, // 获取进仓单详情
   registerWarehouseInInfo: `/emis/emisWarehouseInBatch/registerWarehouseInInfo`, // 收货入仓登记
-  queryWarehouseList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
+  getWarehouseInList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
   getWarehouseBatchInList: `/emis/emisWarehouseIn/getWarehouseBatchInList`, // 进仓单登记-列表
-  
+  exportWarehouseInTpl: `/emis/emisWarehouseIn/exportWarehouseInTpl`, // 进仓单PDF下载连接
 }
 
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 450fef7..5ed876e 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -398,7 +398,7 @@
 			getRSDStaffList: apiService.getRSDStaffList,
 			getMonthpayAccountList: apiService.getMonthpayAccountList,
 			getDestPositionList: apiService.getDestPositionList,
-			getWarehouseInList: apiService.warehouseInList,
+			getWarehouseInList: apiService.getWarehouseInList,
 			getPayeeList: apiService.getPayeeList,
 			getSalemanList: apiService.getSalemanList,
 			async initData() { // 初始化
diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue
index e6a4cc2..57e6a8a 100644
--- a/pages/tabBar/order/order.vue
+++ b/pages/tabBar/order/order.vue
@@ -72,7 +72,7 @@
 										<u-row>
 											<u-button v-if="item.pickupMethod == 1 && item.intoWarehouseBillCode"
 												@click="handleDealItem(item, { type: 6 })" shape="circle" type="primary"
-												:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">入仓扫描</u-button>
+												:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">进仓单</u-button>
 
 											<template v-if="item.orderStatus == 0">
 												<u-button @click="handleDealItem(item, { type: 1 })" shape="circle"
@@ -285,8 +285,8 @@
 					case 5: // 签收扫描
 						this.goto(`deliveryDeal/signedScanning${itemQuery}`)
 						break;
-					case 6: // 入仓扫描
-						this.goto(`deliveryDeal/storage${itemQuery}&inNo=${item.intoWarehouseBillCode}`)
+					case 6: // 进仓单详情
+						this.goto(`warehousing/detail${itemQuery}&inNo=${item.intoWarehouseBillCode}`)
 						break;
 
 					default:
diff --git a/pages/warehousing/detail.vue b/pages/warehousing/detail.vue
index a7beb50..321f600 100644
--- a/pages/warehousing/detail.vue
+++ b/pages/warehousing/detail.vue
@@ -1,231 +1,237 @@
 <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>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:header></template>
+			<template v-slot:body>
+				<view class="dt-block">
+					<view class="dt-tle">
+						<view class="t1">订单号: {{postInfo.billCode}}</view>
+						<view class="t2">
+							<text class="clr-prm"></text>
+						</view>
 					</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>
+					<u-line margin="20rpx 0 20rpx"></u-line>
 					<view>
-						<text class="font-weight font-28 pr-20">李先生</text>
-						<text class="clr-sub font-28">18627068352</text>
+						<bpe-addressjiami-tmp v-model:value="postInfo"></bpe-addressjiami-tmp>
 					</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 class="dt-block">
+					<view class="dt-tle" @click="setClipboardData(postInfo.intoWarehousePhone)">
+						<view class="t1">{{postInfo.intoWarehouseName}}联系信息</view>
+						<view class="t2">
+							<u-icon name="file-text" size="38" custom-style=""></u-icon>
+						</view>
 					</view>
-				</view>
-				<u-line margin="20rpx 0 20rpx"></u-line>
-				<view class="dt-item font-28">
+					<u-line margin="20rpx 0 20rpx"></u-line>
 					<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>
+							<text class="font-weight font-28 pr-20">{{postInfo.intoWarehouseContact}}</text>
+							<text class="clr-sub font-28">{{postInfo.intoWarehousePhone}}</text>
+						</view>
+						<u-text :text="postInfo.intoWarehouseAddress"
+							size="24" margin="20rpx 0 0 0" color="#999" 
+						></u-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 class="dt-block">
+					<view class="dt-tle">
+						<view class="t1">进仓货物总览</view>
+						<view class="t2">
+							<tetx v-if="billInfo.status == 0">未入仓</tetx>
+							<tetx v-if="billInfo.status == 1">已入仓</tetx>
+							<tetx v-if="billInfo.status == 2">部分入仓</tetx>
+							<tetx v-if="billInfo.status == 3">全部入仓</tetx>
+						</view>
 					</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;">
+					<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>
+							<text class="pr-20 clr-sub">总重量:</text>
+							<text class="">{{billInfo.billWeight}} kg</text>
 						</view>
 						<view>
-							<text class="pr-20 clr-sub">体积:</text>
-							<text class="">30m</text>
+							<text class="pr-20 clr-sub">总体积:</text>
+							<text class="">{{billInfo.totalVolume}}m³</text>
 						</view>
 						<view>
-							<text class="pr-20 clr-sub">件数:</text>
-							<text class="">10</text>
+							<text class="pr-20 clr-sub">总件数:</text>
+							<text class="">{{billInfo.parcelQty}}</text>
+						</view>
+					</view>
+					<!-- <bpe-goodstatic-tmp v-model:value="postInfo"></bpe-goodstatic-tmp> -->
+					<view v-for="(item) in billInfo.cargoSumList" 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>
 					
-					<view class="dt-item font-28">
-						<view>
-							<text class="pr-20 clr-sub">包装类型:</text>
-							<text class="">纸箱</text>
+					<!-- <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>
-						<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>
+					</u-row> -->
 					
-					<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 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>
-	
+				<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="handleDialogClick(feedModal)" 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="handleDownloadPdf()" :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						>下载PDF
+						</u-button>
+						<u-button 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>
+	</tpx-page>
 </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"
+	import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp"
+	import * as apiService from "@/common/api"
 	
 	export default {
-		components: { BpeAddressjiamiTmp },
+		components: { BpeAddressjiamiTmp, BpeGoodstaticTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -235,13 +241,12 @@
 		},
 		data() {
 			return {
-				submitParam: {},
-				ydList: [
-					{}
-				],
-				jcList: [
-					{},{},{}
-				],
+				pageLoading: true,
+				queryOption: {
+					inNo: '', // 进仓单号
+				},
+				billInfo: {},
+				postInfo: {},
 				feedModal: {
 					show: false
 				}
@@ -253,24 +258,35 @@
 				// path: 'TODO'
 			}
 		},
-		onLoad(queryOption) {
-			this.queryOption = queryOption
+		onLoad(option) {
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {
+		
 		},
 		methods: {
-			setClipboardData,
-			goto,
-			getCdnUrl,
-			initData(){
-				// showLoading()
+			initData() {
+				this.inNo = this.queryOption.inNo
+				this.inNo && (this.queryOrderDetail(this.queryOption))
 			},
-			handleFeedSwitch() {
-				this.feedModal.show = true
+			async queryOrderDetail(params) {
+				let res = await apiService.getWarehouseInInfo({...params, _loading: true})
+				if(!res.data) {
+					this.showToast("进仓单号数据不存在")
+				}
+				let data = res.data || {}
+				this.billInfo = data
+				if(data.billCode) {
+					let ores = await apiService.getOrderDetail({ billCode: data.billCode })
+					this.postInfo = ores.data
+					let baListRes = await apiService.getWarehouseBatchInList({...params})
+					debugger
+				}
+				this.pageLoading = false
 			},
-			handleSubmitFeed() {
-				this.feedModal.show = false
+			handleDialogClick(curModal){
+				curModal.show = !curModal.show
 			},
 			handlePreviewDiDan() {
 				uni.previewImage({
@@ -279,6 +295,10 @@
 					]
 				})
 			},
+			async handleDownloadPdf(){
+				let res = await apiService.exportWarehouseInTpl({ orderSn: this.postInfo.orderSn })
+				debugger
+			},
 		}
 	}
 </script>