diff --git a/.env.development b/.env.development
index a216fad1..9acfffb3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
+VITE_BASE_URL=http://192.168.0.128:12080/admin-api
 VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
 
 # 租户配置
diff --git a/src/common/style/pdabasic.css b/src/common/style/pdabasic.css
index 0b5d2a83..a6573500 100644
--- a/src/common/style/pdabasic.css
+++ b/src/common/style/pdabasic.css
@@ -480,7 +480,7 @@ export function getItemTypeStyle(val) {
 
 .detail-list {
 	background-color: #fff;
-	padding:5rpx 10rpx;
+	padding: 5rpx 10rpx;
 	/* margin: 20rpx; */
 	/* border-radius: 16rpx; */
 	/* overflow: hidden; */
@@ -729,24 +729,26 @@ page {
 	font-size: 35rpx;
 	padding: 10rpx 20rpx;
 }
+
 .page-header .header-view {
 	display: flex;
 	flex-direction: column;
 	background-color: #fff;
 	font-size: 35rpx;
 	padding: 10rpx 20rpx;
-	border-radius:4px;
+	border-radius: 4px;
 }
 
 .page-header .header-view .header_item {
 	/* padding-left: 10rpx; */
 	padding: 5rpx 10rpx;
-	font-size:32rpx ;
+	font-size: 32rpx;
 }
 
 .page-header .header-view .header_job_top {
-	padding:5rpx 0rpx;
+	padding: 5rpx 0rpx;
 }
+
 .page-main {
 	flex: 1;
 	position: relative;
@@ -768,3 +770,11 @@ page {
 	background: #e0e0e0;
 
 }
+
+.page-footer {
+	/* color: #fff; */
+	line-height: 100rpx;
+	/* 不放大不缩小固定100rpx */
+	flex: 0 0 100rpx;
+	/* background-color: #00AAFF; */
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index c1cf6147..119d76ad 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -82,7 +82,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/query/pack",
 			"style": {
@@ -93,15 +93,15 @@
 					"buttons": [
 						// 右边按钮
 						{
-		
+
 							"float": "right",
 							"fontSize": "58rpx", //按钮上文字的大小
 							"text": "\ue696",
 							"fontSrc": "/static/ali_icon/iconfont.ttf"
-		
+
 						},
 						{
-		
+
 							"float": "right",
 							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
@@ -111,7 +111,7 @@
 				}
 			}
 		},
-		
+
 		{
 			"path": "pages/query/location",
 			"style": {
@@ -1099,7 +1099,6 @@
 				"enablePullDownRefresh": false
 			}
 		},
-
 		{
 			"path": "pages/productReceipt/record/productReceiptRecord",
 			"style": {
@@ -1141,33 +1140,33 @@
 
 			}
 		},
-		// {
-		// 	"path": "pages/productPutaway/record/productPutawayRecord",
-		// 	"style": {
-		// 		"navigationBarTitleText": "制品上架记录",
-		// 		"enablePullDownRefresh": false
+		{
+			"path": "pages/productPutaway/record/productPutawayRecord",
+			"style": {
+				"navigationBarTitleText": "制品上架记录",
+				"enablePullDownRefresh": false
+
+			}
+		},
 
-		// 	}
-		// },
-		
 		{
 			"path": "pages/productPutaway/record/fgDirectPutaway",
 			"style": {
 				"navigationBarTitleText": "装配直接上架",
 				"enablePullDownRefresh": false
-		
+
 			}
 		},
-		
+
 		{
 			"path": "pages/productPutaway/record/semiDirectPutaway",
 			"style": {
 				"navigationBarTitleText": "预生产直接上架",
 				"enablePullDownRefresh": false
-		
+
 			}
 		},
-		
+
 
 		{
 			"path": "pages/productPutaway/request/putawayRequest",
@@ -1936,7 +1935,7 @@
 
 			}
 		},
-		
+
 		{
 			"path": "pages/count/job/fuzzyCountJob",
 			"style": {
@@ -1947,15 +1946,15 @@
 					"buttons": [
 						// 右边按钮
 						{
-		
+
 							"float": "right",
 							"fontSize": "58rpx", //按钮上文字的大小
 							"text": "\ue696",
 							"fontSrc": "/static/ali_icon/iconfont.ttf"
-		
+
 						},
 						{
-		
+
 							"float": "right",
 							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
@@ -1970,7 +1969,7 @@
 			"style": {
 				"navigationBarTitleText": "盲盘明细",
 				"enablePullDownRefresh": false
-		
+
 			}
 		},
 		{
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 37d67fd0..70686a9b 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -7,32 +7,33 @@
 			</view>
 			<view class="" v-if="dataContent">
 				<view class="page-header">
-				<view class="header-view" >
-				<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
-					生产计划：{{dataContent.planNumber}}
-				</view>
-
-				<view class="cell_box uni-flex uni-row">
-					<view class="cell_info">
-						<view class="text_lightblue">完工库位</view>
-						<view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
+					<view class="header-view">
+						<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
+							生产计划：{{dataContent.planNumber}}
 						</view>
 
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">计划数</view>
-						<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">已完工</view>
-						<view>{{ dataContent.goodQty }}{{dataContent.uom}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">未完工</view>
-						<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
+						<view class="cell_box uni-flex uni-row">
+							<view class="cell_info">
+								<view class="text_lightblue">完工库位</view>
+								<view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
+								</view>
+
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">计划数</view>
+								<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">已完工</view>
+								<view>{{ dataContent.goodQty }}{{dataContent.uom}}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">未完工</view>
+								<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
+							</view>
+						</view>
 					</view>
 				</view>
-				</view></view>
 				<view class="" style="padding: 10rpx; margin-left: 10rpx;">
 					<item :dataContent="dataContent"></item>
 				</view>
@@ -61,7 +62,7 @@
 					<uni-swipe-action>
 						<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
 							<view class="uni-flex uni-row "
-								style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;"  >
+								style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;">
 								<light :lightCode='item.content'></light>
 								<!-- 	<view class="auto-wrap" style="font-size: 35rpx;font-weight: bold; width: 100%;">
 									<text style="font-size: 30rpx;color: #B66463;">唯一码 </text>
@@ -112,7 +113,8 @@
 		getRemoveOption,
 		deepCopyData,
 		getCurrDateTime,
-		compare
+		compare,
+		getSwitchInfoByCode
 	} from '@/common/basic.js';
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
@@ -179,14 +181,12 @@
 
 		},
 		methods: {
-
 			openFg() {
 				setTimeout(res => {
 					if (this.$refs.comReceiptPopup) {
 						this.$refs.comReceiptPopup.openRequestPopup();
 					}
 				}, 600)
-
 			},
 			requestConfirm(result) {
 				this.dataContent = {
@@ -257,7 +257,6 @@
 			},
 
 			async commit() {
-
 				try {
 					uni.showLoading({
 						title: "提交中...",
@@ -293,9 +292,14 @@
 						throw new Error("提交失败")
 					}
 
-					createPutawayRequestByPlan(list[0].requestNumber).then(res => {
-						createInspectRequestByPlan(list[0].requestNumber)
-					})
+					//装配收货记录 生成后 创建 制品上架申请
+					let createProductputawaySwitch = getSwitchInfoByCode(
+						"CreateProductputawayRequestAfterProductreceiptRecordCreated")
+					if (createProductputawaySwitch) {
+						createPutawayRequestByPlan(list[0].requestNumber).then(res => {
+							createInspectRequestByPlan(list[0].requestNumber)
+						})
+					}
 
 					var queryParams = {
 						filters: [{
@@ -351,7 +355,6 @@
 					res.outsideSerialNumber = res.order
 				})
 				this.dataContent.subList = this.allList
-
 				return this.dataContent
 			},
 
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index 8fdabbda..0375986d 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -7,20 +7,20 @@
 			</view>
 			<view class="" v-if="dataContent">
 				<view class="page-header">
-				<view class="header-view" >
-				<view class="cell_box uni-flex uni-row">
-					<view class="cell_info">
-						<view class="text_lightblue">完工库位</view>
-						<view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
-						</view>
+					<view class="header-view">
+						<view class="cell_box uni-flex uni-row">
+							<view class="cell_info">
+								<view class="text_lightblue">完工库位</view>
+								<view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
+								</view>
 
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">计划数</view>
+								<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
+							</view>
+						</view>
 					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">计划数</view>
-						<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
-					</view>
-				</view>
-				</view>
 				</view>
 				<view class='split_line'></view>
 
@@ -104,7 +104,8 @@
 		getRemoveOption,
 		deepCopyData,
 		getCurrDateTime,
-		compare
+		compare,
+		getSwitchInfoByCode
 	} from '@/common/basic.js';
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
@@ -169,7 +170,7 @@
 		},
 
 		mounted() {
-		 
+
 		},
 		methods: {
 			openFg() {
@@ -287,25 +288,14 @@
 						throw new Error("提交失败")
 					}
 
-					createPutawayRequestByPlan(list[0].requestNumber).then(res => {
-						createInspectRequestByPlan(list[0].requestNumber)
-					})
-
-					var queryParams = {
-						filters: [{
-								column: "plan_type",
-								action: "==",
-								value: "assemble"
-							},
-							{
-								column: "number",
-								action: "==",
-								value: this.dataContent.planNumber
-							}
-						],
-						pageNo: 1,
-						pageSize: 100,
+					let createProductputawaySwitch = getSwitchInfoByCode(
+						"CreateProductputawayRequestAfterProductreceiptRecordCreated")
+					if (createProductputawaySwitch) {
+						createPutawayRequestByPlan(list[0].requestNumber).then(res => {
+							createInspectRequestByPlan(list[0].requestNumber)
+						})
 					}
+
 					uni.hideLoading()
 					this.showCommitSuccessMessage("提交成功<br>生成装配收货记录<br>" + list[0].requestNumber, list)
 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index bff5bd9a..4248a701 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -178,8 +178,7 @@
 					}
 				})
 			} else {
-				this.timerRefresh();
-				
+				this.timerRefresh();	
 			}
 		},
 		onUnload() {
diff --git a/src/pages/productPutaway/record/fgDirectPutaway.vue b/src/pages/productPutaway/record/fgDirectPutaway.vue
index 77b6ec31..322a3492 100644
--- a/src/pages/productPutaway/record/fgDirectPutaway.vue
+++ b/src/pages/productPutaway/record/fgDirectPutaway.vue
@@ -1,6 +1,6 @@
  <template>
  	<view class="">
- 		<product-putaway-record :title="title" ref="productPutawayRecord" type='assemble'></product-putaway-record>
+ 		<product-putaway-record :title="title" ref="productPutawayRecord" putawayType='assemble'></product-putaway-record>
  	</view>
  </template>
  
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 5dcdfa37..73f4dda6 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -1,11 +1,10 @@
 <template>
-	<view class="page-wraper">
+	<view class="">
 		<view class="">
 			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
-
-		<view class="page-wraper" v-if="detailSource.length>0">
-			<view class="page-main">
+		<view class="uni-flex uni-column" v-if="detailSource.length>0">
+			<view class="">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
@@ -18,12 +17,11 @@
 				</scroll-view>
 			</view>
 
-			<view class="page-footer">
+			<view class="page-footer" v-if="detailSource.length>0">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
-						<!-- <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationAreaTypeList="tolocationTypeList"></requiredLocation> -->
+
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_reject" style="margin-right:5px ;" hover-class="btn_commit_after"
@@ -34,6 +32,7 @@
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
+
 		<win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getToLocationCode'
 			:locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
@@ -101,6 +100,7 @@
 				toLocationCode: "",
 				fromLocationAreaTypeList: [],
 				tolocationTypeList: [],
+				toLocationAreaTypeList: [],
 				inInventoryStatus: "", //目标入库库存状态
 				outInventoryStatus: "", //来源出库库存状态:"",
 				bussinessCode: "ProductPutaway",
@@ -110,17 +110,24 @@
 				editItem: null
 			};
 		},
-		onLoad(option) {
-			uni.setNavigationBarTitle({
-				title: option.title
-			})
-			this.type = option.type
-			// if (this.type == 'predict') {
-			// 	updateTitle('制品上架记录')
-			// } else if (this.type == 'assemble') {
-			// 	updateTitle('装配上架记录')
-			// }
+		// 装配收货：type = 'assemble'
+		// 预生产收货：type = 'predict'
+		props: {
+			putawayType: 'assemble',
+		},
 
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
 			getBusinessType(this.bussinessCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
@@ -132,20 +139,8 @@
 					this.showErrorMessage(res.message)
 				}
 			});
-
 		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {},
-
-		onPullDownRefresh() {},
 
-		mounted() {},
 		methods: {
 			getScanResult(result) {
 				let label = result.label;
@@ -301,7 +296,6 @@
 					// 	if (res.success) {
 					// 		this.managementList = res.list;
 
-
 					var params = this.setParams()
 					console.log("提交" + JSON.stringify(params))
 					productPutawayRecordSubmit(params).then(res => {
@@ -358,9 +352,10 @@
 			},
 
 			setParams() {
+				let that = this;
 				var subList = []
 				var creator = this.$store.state.user.id
-				this.detailSource.forEach(item => {
+				that.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var submitItem = deepCopyData(detail)
@@ -375,16 +370,16 @@
 
 							// submitItem.fromPackingNumber = info.packingNumber;
 							// submitItem.toPackingNumber = info.packingNumber;
-							
+
 							submitItem.fromPackingNumber = detail.packingNumber;
-							submitItem.toPackingNumber = detail.packingNumber;					
+							submitItem.toPackingNumber = detail.packingNumber;
 
 							//submitItem.fromContainerNumber = detail.containerNumber;
 							//submitItem.toContainerNumber = detail.containerNumber
 
 							//submitItem.fromBatch = info.batch;
 							//submitItem.toBatch = info.batch;
-							
+
 							submitItem.fromBatch = detail.package.batch;
 							submitItem.toBatch = detail.package.batch;
 
@@ -397,12 +392,10 @@
 						}
 					})
 				})
-				this.dataContent.subList = subList;
-				if (this.type) {
-					this.dataContent.type = this.type;
-				}
-				this.dataContent.creator = creator;
-				return this.dataContent;
+				that.dataContent.subList = subList;
+				that.dataContent.creator = creator;
+				that.dataContent.type = that.putawayType;
+				return that.dataContent;
 			},
 
 
@@ -463,38 +456,5 @@
 </script>
 
 <style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
 
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
 </style>
\ No newline at end of file
diff --git a/src/pages/productPutaway/record/semiDirectPutaway.vue b/src/pages/productPutaway/record/semiDirectPutaway.vue
index 80676802..376b32cf 100644
--- a/src/pages/productPutaway/record/semiDirectPutaway.vue
+++ b/src/pages/productPutaway/record/semiDirectPutaway.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<product-putaway-record :title="title" ref="productPutawayRecord" type='predict'></product-putaway-record>
+		<product-putaway-record :title="title" ref="productPutawayRecord" putawayType='predict'></product-putaway-record>
 	</view>
 </template>
 
@@ -16,25 +16,26 @@
 				title:''
 			};
 		},
+		
 		onLoad(option){
-			this.title = option.title
+			//this.title = option.title
 		},
 		
 		onShow() {
-			if(this.$refs.productPutawayRecord!=undefined){
-				this.$refs.productPutawayRecord.refresh();
-			}
+			// if(this.$refs.productPutawayRecord!=undefined){
+			// 	this.$refs.productPutawayRecord.refresh();
+			// }
 		},
 
 		onPullDownRefresh() {
-			this.$refs.productPutawayRecord.refresh();
+			// this.$refs.productPutawayRecord.refresh();
 		},
 		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				this.$refs.productPutawayRecord.toHome();
-			} else if (e.index == 1) {
-				this.$refs.productPutawayRecord.openFilter();
-			}
+			// if (e.index === 0) {
+			// 	this.$refs.productPutawayRecord.toHome();
+			// } else if (e.index == 1) {
+			// 	this.$refs.productPutawayRecord.openFilter();
+			// }
 		},
 
 		methods: {
diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue
index ff89a133..2bdda403 100644
--- a/src/pages/productReceipt/record/productReceiptRecord.vue
+++ b/src/pages/productReceipt/record/productReceiptRecord.vue
@@ -336,6 +336,7 @@
 				})
 				this.dataContent.subList = subList;
 				this.dataContent.creator = creator;
+				this.dataContent.type = "predict";//默认预生产直接报工，装配报工使用按计划完工和无计划完工
 				this.dataContent.workshopCode = this.workshopCode;
 				return this.dataContent;
 			},
diff --git a/src/pages/productReceipt/record/semiDirectReceipt.vue b/src/pages/productReceipt/record/semiDirectReceipt.vue
new file mode 100644
index 00000000..21abec7e
--- /dev/null
+++ b/src/pages/productReceipt/record/semiDirectReceipt.vue
@@ -0,0 +1,48 @@
+<template>
+	<view class="">
+		<product-receipt-record :title="title" ref="productPutawayRecord" type='predict'></product-receipt-record>
+	</view>
+</template>
+
+<script>
+	import productReceiptRecord from '@/pages/productReceipt/record/productReceiptRecord.vue'
+
+	export default {
+		components: {
+			productReceiptRecord
+		},
+		data() {
+			return {
+				title:''
+			};
+		},
+		onLoad(option){
+			this.title = option.title
+		},
+		
+		onShow() {
+			if(this.$refs.productReceiptRecord!=undefined){
+				this.$refs.productReceiptRecord.refresh();
+			}
+		},
+
+		onPullDownRefresh() {
+			this.$refs.productReceiptRecord.refresh();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.productReceiptRecord.toHome();
+			} else if (e.index == 1) {
+				this.$refs.productReceiptRecord.openFilter();
+			}
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index f133e82c..5e62d1d4 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -26,6 +26,7 @@
 				:isShowEdit="false"></required-location>
 			<view class='split_line'></view> -->
 		</view>
+		
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -38,7 +39,8 @@
 				</view>
 			</scroll-view>
 		</view>
-<!-- <div style="background: white;" v-if="operation=='receipt'" >
+
+		<!-- <div style="background: white;" v-if="operation=='receipt'" >
 			<uni-collapse>
 				<uni-collapse-item>
 					<template v-slot:title>
@@ -50,6 +52,7 @@
 				</uni-collapse-item>
 			</uni-collapse>
 		</div> -->
+
 		<view class="page-footer">
 			<view style="background-color:ghostwhite; width: 100%; ">
 				<view v-if="operation=='receipt'" class="uni-flex u-col-center space-between padding_10">
@@ -158,8 +161,8 @@
 				switchCode: "",
 				isCheckLocation: 'purchaseReceiptLocationCodeValidate', //校验收货库位
 				reasonText: "",
-				
-				
+
+
 				// printDeafult: {}, //默认打印机
 				// templateDeafult: {} //默认的模板
 			};
@@ -278,7 +281,7 @@
 							if (this.scanMessage) {
 								this.$refs.scanPopup.simulateScan(this.scanMessage);
 							}
-							
+
 
 						} else {
 							that.showMessage('列表数据为0');
@@ -631,14 +634,14 @@
 				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
-// printCode(e) {
-// 				this.jobContent.printerUuid = e.value;
-// 				this.printDeafult = e
-// 			},
-// 			templateCode(e) {
-// 				this.jobContent.modelCode = e.value;
-// 				this.templateDeafult = e
-// 			},
+			// printCode(e) {
+			// 				this.jobContent.printerUuid = e.value;
+			// 				this.printDeafult = e
+			// 			},
+			// 			templateCode(e) {
+			// 				this.jobContent.modelCode = e.value;
+			// 				this.templateDeafult = e
+			// 			},
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {