diff --git a/common/api/order.js b/common/api/order.js
index 4a40f03..38d243c 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -122,6 +122,16 @@ export const getNextStationList = (data = {})=> {
 	return coreRequest(url.getNextStationList, data, {}, "GET")
 }
 
+// 扫描-获取上一网点
+export const getPreStationList = (data = {})=> {
+	return coreRequest(url.getPreStationList, data, {}, "GET")
+}
+
+// 扫描-获取合包列表
+export const getPackCodeList = (data = {})=> {
+	return coreRequest(url.getPackCodeList, data, {}, "GET")
+}
+
 // 获取打印运单信息-图片
 export const getRealGetWaybillPrintData = (data = {})=> {
 	return coreRequest(url.getRealGetWaybillPrintData, data, {}, "GET")
diff --git a/common/api/url.js b/common/api/url.js
index 06478e8..25b0990 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -40,6 +40,8 @@ export default {
   getRealGetWaybillPrintData: `/emis/emisWaybill/realGetPrintList`, // 运单 打印数据
   queryPrintListSimple: `/emis/emisWaybill/queryPrintListSimple`, // 运单 打印数据-列表
   getNextStationList: `/emis/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
+  getPreStationList: `/emis/emisTmsScanRecord/getPreStationList`, // 获取-扫描上一网点
+  getPackCodeList: `/emis/emisTmsPack/listSimple`, // 获取-合包列表
   getPayeeList: `/emis/emisStaff/getPayeeList`, // 回款人联系列表
   getSalemanList: `/emis/emisStaff/getSalemanList`, // 销售人联系列表
   preCalcWaybillFee: `/emis/emisWaybill/preCalcWaybillFee`, // 报价试算
diff --git a/common/scanUtil.js b/common/scanUtil.js
index 2a6ad2d..794c4c1 100644
--- a/common/scanUtil.js
+++ b/common/scanUtil.js
@@ -10,7 +10,8 @@ export const scanTypeEnum = {
 	
 	liuCang: 70, // 留仓
 	zhuanJian: 80, // 转件
-	
+	heBao: 200, // 合包
+	chaiBao: 201, // 拆包
 	qingGuan: 800, // 清关
 	baoGUan: 700, // 报关
 }
diff --git a/pages/deliveryDeal/qutgoingScanning.vue b/pages/deliveryDeal/qutgoingScanning.vue
index 7c05200..0f84f7e 100644
--- a/pages/deliveryDeal/qutgoingScanning.vue
+++ b/pages/deliveryDeal/qutgoingScanning.vue
@@ -90,7 +90,6 @@
 				pageLoading: true,
 				queryOption: {
 					billCode: '', // 运单id
-					orderSn: '', // 订单id
 				},
 				resData: {
 					list: []
@@ -115,7 +114,7 @@
 		methods: {
 			getNextStationList: apiService.getNextStationList,
 			initData() {
-				this.submitParam.billCode = this.queryOption.billCode || this.queryOption.orderSn
+				this.submitParam.billCode = this.queryOption.billCode
 			},
 			async handleSubmit(val) {
 				let extParam = {}
diff --git a/pages/tms/coPackingScanning.vue b/pages/tms/coPackingScanning.vue
index 79bdedf..0538eb4 100644
--- a/pages/tms/coPackingScanning.vue
+++ b/pages/tms/coPackingScanning.vue
@@ -1,88 +1,77 @@
 <template>
-	<tpx-layout>
-		<template v-slot:body>
-			<view class="blcok-white-noradius" style="margin-top: 0;">
-				<u-row justify="between">
-					<view style="flex:1;">
-						<tpx-scan-input v-model:value="submitParam.yundanhao" placeholder="请输入编号或扫码"
-							iconPos="left"></tpx-scan-input>
-					</view>
-				</u-row>
-				<u-row custom-style="margin-top:20rpx;">
-					<view style="flex: 1;">
-						<tpx-select placeholder="请获取新合包号" :isWhite="true"></tpx-select>
-					</view>
-				</u-row>
-			</view>
-			
-			<view class="blcok-white-noradius">
-				<bo-operator-tmp>
-					<template v-slot:titleRight>
-						<!-- <button size="mini">查看历史到件</button> -->
-					</template>
-				</bo-operator-tmp>
-			</view>
-			
-			<view class="mt-40 pl-20 pr-20">
-				<tpx-tabs :list="tabList" v-model:value="tabType"
-					@tabchange="(val)=> {  }" v-slot="curTab"
-				>
-					<text slot>
-						(<text>{{curTab.item.val}}</text>)
-					</text>
-				</tpx-tabs>
-			</view>
-			<view class="blcok-white-noradius">
-				<view v-for="(item, index) in yundanList" class="yditem">
-					<u-row justify="between" align="top">
-						<view style="flex: 1;">
-							<view class="">
-								<text class="clr-sub lbwth">订单号</text>
-								<text class="">T2919292</text>
-							</view>
-							<view class="mt-10">
-								<text class="clr-sub lbwth">重量</text>
-								<text class="clr-prm">3KG</text>
-							</view>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:body>
+				<view class="blcok-white-noradius" style="margin-top: 0;">
+					<u-row justify="between">
+						<view style="flex:1;">
+							<tpx-scan-input v-model:value="submitParam.billCode" placeholder="请输入或扫码"
+								@change="handleScanValChange" iconPos="left"></tpx-scan-input>
 						</view>
-						<view>
-							<u-icon name="trash" size="30"></u-icon>
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;">
+						<view style="flex: 1;">
+							<tpx-select v-model:resObject="siteRes" :getListFun="getNextStationList" :transKeyVal="{valKey: 'destSite',titleKey: 'destSiteName'}" v-model:value="submitParam.preOrNextStationCode" :isWhite="true" placeholder="请选择下一网点"></tpx-select>
+						</view>
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;">
+						<view style="flex: 1;">
+							<tpx-select v-model:resObject="cpackRes" :getListFun="getPackCodeList" :transKeyVal="{valKey: 'packNo',titleKey: 'packNo'}" v-model:value="submitParam.bagNo" :isWhite="true" placeholder="请选择合包号"></tpx-select>
 						</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"
-						custom-style="width: 500rpx;height:80rpx;font-size: 30rpx;" type="primary">打印合包条码</u-button>
-				</u-row>
-			</view>
-		</template>
-	</tpx-layout>
+				
+				<view class="blcok-white-noradius">
+					<bo-operator-tmp :list="resData.list">
+						<template v-slot:titleRight>
+						</template>
+					</bo-operator-tmp>
+				</view>
+				
+				
+				<view class="blcok-white-noradius">
+					
+					<view v-for="(item, index) in resData.list" class="yditem">
+						<u-row justify="between" align="top">
+							<view style="flex: 1;">
+								<view class="">
+									<text class="clr-sub lbwth">订单号</text>
+									<text class="">{{item.billCode}}</text>
+								</view>
+								<view class="mt-10">
+									<text class="clr-sub lbwth">重量</text>
+									<text class="clr-prm">3KG</text>
+								</view>
+							</view>
+							<view>
+								<u-icon name="trash" size="30"></u-icon>
+							</view>
+						</u-row>
+					</view>
+					<tpx-empty v-if="resData.list.length == 0" size="sm"></tpx-empty>
+				</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"
+							custom-style="width: 500rpx;height:80rpx;font-size: 30rpx;" type="primary">打印合包条码</u-button>
+					</u-row>
+				</view>
+			</template>
+		</tpx-layout>
+	</tpx-page>
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import {
-		ordStaEnum,
-		ordStatusList,
-		payTypeEnum,
-		payTypeList,
-		dlvTypeEnum,
-		dlvTypeList,
-		dateTypeEnum,
-		dateTypeList
-	} from "@/common/enum"
+	import { debounce } from "@/common/util"
+	import dayjs from "dayjs"
 	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
-	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
-	import {
-		goto
-	} from "@/common/untool"
+	import * as apiService from "@/common/api"
+	import { scanTypeEnum, getScanParams, ansScanResponse } from "@/common/scanUtil"
 	export default {
-		components:{ BoOperatorTmp, BpeGoodphotoTmp },
+		components:{ BoOperatorTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -93,41 +82,53 @@
 		},
 		data() {
 			return {
-				submitParam: {
-					date: [],
-					type: 1,
+				queryOption: {
+					billCode: '', // 运单id
+				},
+				resData: { list: [] },
+				siteRes: { list: [] },
+				cpackRes: { list: [] },
+				submitParam: {
+					billCode: '',
+					preOrNextStationCode: '',
 				},
-				tabType: 1,
-				tabList: [
-					{ title: '已扫描', val: 1 }
-				],
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
-		onLoad() {
+		onLoad(option) {
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {
-
+		
 		},
 		methods: {
-			getCdnUrl,
-
+			getNextStationList: apiService.getNextStationList,
+			getPackCodeList: apiService.getPackCodeList,
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				this.submitParam.billCode = this.queryOption.billCode
 			},
-			handleSubmit() {
-
+			async handleSubmit(val) {
+				let extParam = {}
+				val && (extParam.billCode = val);
+				let scnParam = getScanParams(scanTypeEnum.heBao, { ...this.submitParam, ...extParam })
+				let res = await apiService.scanRecord({...scnParam, _loading: true})
+				let { bl, resItem } = ansScanResponse({ res, title: "合包" })
+				if(bl) {
+					this.curScanItem = resItem
+					this.resData.list.unshift({ ...resItem })
+					this.resetForm()
+				}
+			},
+			handleScanValChange: debounce(function(val){
+				val && (this.handleSubmit(val))
+			}),
+			resetForm() {
+				this.submitParam.billCode = ''
+				this.submitParam.preOrNextStationCode = ''
 			}
 		}
 	}
diff --git a/pages/tms/unpackingScanning.vue b/pages/tms/unpackingScanning.vue
index 035dad7..ea1d6af 100644
--- a/pages/tms/unpackingScanning.vue
+++ b/pages/tms/unpackingScanning.vue
@@ -1,75 +1,72 @@
 <template>
-	<tpx-layout>
-		<template v-slot:body>
-			<view class="blcok-white-noradius" style="margin-top: 0;">
-				<u-row justify="between">
-					<view style="flex:1;">
-						<tpx-scan-input v-model:value="submitParam.yundanhao" placeholder="请输入编号或扫码"
-							iconPos="left"></tpx-scan-input>
-					</view>
-				</u-row>
-				<view class="mt-30">
-					<u-button @click="handleSubmit()" type="primary" size="large" shape="square"
-						custom-style="height:80rpx;font-size: 30rpx;border-radius: 14rpx;">确定</u-button>
-				</view>
-			</view>
-			
-			
-			<view class="mt-40 pl-20 pr-20">
-				<tpx-tabs :list="tabList" v-model:value="tabType"
-					@tabchange="(val)=> {  }" v-slot="curTab"
-				>
-					<text slot>
-						(<text>{{curTab.item.val}}</text>)
-					</text>
-				</tpx-tabs>
-			</view>
-			<view class="blcok-white-noradius">
-				<view v-for="(item, index) in yundanList" class="yditem">
-					<u-row justify="between" align="top">
-						<view style="flex: 1;">
-							<view class="">
-								<text class="clr-sub lbwth">订单号</text>
-								<text class="">T2919292</text>
-							</view>
-							<view class="mt-10">
-								<text class="clr-sub lbwth">重量</text>
-								<text class="clr-prm">3KG</text>
-							</view>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:body>
+				<view class="blcok-white-noradius" style="margin-top: 0;">
+					<u-row justify="between">
+						<view style="flex:1;">
+							<tpx-scan-input v-model:value="submitParam.billCode" placeholder="请输入或扫码"
+								@change="handleScanValChange" iconPos="left"></tpx-scan-input>
 						</view>
-						<view>
-							
+					</u-row>
+					<u-row custom-style="margin-top:20rpx;">
+						<view style="flex: 1;">
+							<tpx-select v-model:resObject="siteRes" :getListFun="getPreStationList" :transKeyVal="{valKey: 'destSite',titleKey: 'destSiteName'}" v-model:value="submitParam.preOrNextStationCode" :isWhite="true" placeholder="请选择上一网点"></tpx-select>
 						</view>
 					</u-row>
 				</view>
-			</view>
-			
-		</template>
-		<template v-slot:footer>
-			
-		</template>
-	</tpx-layout>
+				
+				<view class="blcok-white-noradius">
+					<bo-operator-tmp :list="resData.list">
+						<template v-slot:titleRight>
+						</template>
+					</bo-operator-tmp>
+				</view>
+				
+				
+				<view class="blcok-white-noradius">
+					
+					<view v-for="(item, index) in resData.list" class="yditem">
+						<u-row justify="between" align="top">
+							<view style="flex: 1;">
+								<view class="">
+									<text class="clr-sub lbwth">订单号</text>
+									<text class="">{{item.billCode}}</text>
+								</view>
+								<view class="mt-10">
+									<text class="clr-sub lbwth">重量</text>
+									<text class="clr-prm">3KG</text>
+								</view>
+							</view>
+							<view>
+								<u-icon name="trash" size="30"></u-icon>
+							</view>
+						</u-row>
+					</view>
+					<tpx-empty v-if="resData.list.length == 0" size="sm"></tpx-empty>
+				</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"
+							custom-style="width: 500rpx;height:80rpx;font-size: 30rpx;" type="primary">打印合包条码</u-button>
+					</u-row>
+				</view> -->
+			</template>
+		</tpx-layout>
+	</tpx-page>
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import {
-		ordStaEnum,
-		ordStatusList,
-		payTypeEnum,
-		payTypeList,
-		dlvTypeEnum,
-		dlvTypeList,
-		dateTypeEnum,
-		dateTypeList
-	} from "@/common/enum"
-	
-	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
-	import {
-		goto
-	} from "@/common/untool"
+	import { debounce } from "@/common/util"
+	import dayjs from "dayjs"
+	import BoOperatorTmp from "@/components/buns-order-templates/bo-operator-tmp"
+	import * as apiService from "@/common/api"
+	import { scanTypeEnum, getScanParams, ansScanResponse } from "@/common/scanUtil"
 	export default {
-		components:{ BpeGoodphotoTmp },
+		components:{ BoOperatorTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -80,41 +77,51 @@
 		},
 		data() {
 			return {
-				submitParam: {
-					date: [],
-					type: 1,
+				queryOption: {
+					billCode: '', // 运单id
+				},
+				resData: { list: [] },
+				siteRes: { list: [] },
+				submitParam: {
+					billCode: '',
+					preOrNextStationCode: '',
 				},
-				tabType: 1,
-				tabList: [
-					{ title: '已扫描', val: 1 }
-				],
-				yundanList: [
-					{ val: 'T7080304037' },{ val: 'T708012124037' },{ val: 'T7080304092' }
-				]
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
-		onLoad() {
+		onLoad(option) {
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {
-
+		
 		},
 		methods: {
-			getCdnUrl,
-
+			getPreStationList: apiService.getPreStationList,
 			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+				this.submitParam.billCode = this.queryOption.billCode
 			},
-			handleSubmit() {
-
+			async handleSubmit(val) {
+				let extParam = {}
+				val && (extParam.billCode = val);
+				let scnParam = getScanParams(scanTypeEnum.chaiBao, { ...this.submitParam, ...extParam })
+				let res = await apiService.scanRecord({...scnParam, _loading: true})
+				let { bl, resItem } = ansScanResponse({ res, title: "拆包" })
+				if(bl) {
+					this.curScanItem = resItem
+					this.resData.list.unshift({ ...resItem })
+					this.resetForm()
+				}
+			},
+			handleScanValChange: debounce(function(val){
+				val && (this.handleSubmit(val))
+			}),
+			resetForm() {
+				this.submitParam.billCode = ''
+				this.submitParam.preOrNextStationCode = ''
 			}
 		}
 	}