diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index 5ccb69ac5..b990af015 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -1474,4 +1474,12 @@ export const getThirdLocationDetail = (params) => request(
 	devUrl + "/api/pda/job/third-location/" + params.id, { //
 		data: {},
 		method: "get"
+	});
+	
+//完工转储 注塑type ="Transfer_Injection"
+// 喷涂 Transfer_Coating 装配  Transfer_Assemble
+export const completeTransfer = (params) => request(
+	devUrl + "/api/pda/store/transfer-note/", { //
+		data: params,
+		method: "post"
 	});
\ No newline at end of file
diff --git a/fe/PDA/pages.js b/fe/PDA/pages.js
index 5a5fff6dd..13ff314b2 100644
--- a/fe/PDA/pages.js
+++ b/fe/PDA/pages.js
@@ -577,21 +577,21 @@ module.exports = () => ({
 			}
 		},
 		{
-			"path": "pages/plastics/plasticsInventoryMove",
+			"path": "pages/injection/injectionInventoryMove",
 			"style": {
 				"navigationBarTitleText": "高往低库存转移(注塑)",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/plastics/plasticsInventoryMoveDetail",
+			"path": "pages/injection/injectionInventoryMoveDetail",
 			"style": {
 				"navigationBarTitleText": "高往低库存转移详情",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/plastics/plasticsCompleteReceive",
+			"path": "pages/injection/injectionTransfer",
 			"style": {
 				"navigationBarTitleText": "完工转储(注塑)",
 				"enablePullDownRefresh": true
@@ -645,6 +645,27 @@ module.exports = () => ({
 				"navigationBarTitleText": "三方库收货详情",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/task/thirdLocationDetail",
+			"style": {
+				"navigationBarTitleText": "三方库收货详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/cotaing/coatingTransfer",
+			"style": {
+				"navigationBarTitleText": "完工转储(喷涂)",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/assemble/assembleTransfer",
+			"style": {
+				"navigationBarTitleText": "完工转储(装配)",
+				"enablePullDownRefresh": false
+			}
 		}
 		
 		
diff --git a/fe/PDA/pages.json b/fe/PDA/pages.json
index 7b47a21db..baf9eb27e 100644
--- a/fe/PDA/pages.json
+++ b/fe/PDA/pages.json
@@ -555,21 +555,21 @@
 			}
 		},
 		{
-			"path": "pages/plastics/plasticsInventoryMove",
+			"path": "pages/injection/injectionInventoryMove",
 			"style": {
 				"navigationBarTitleText": "高往低库存转移(注塑)",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/plastics/plasticsInventoryMoveDetail",
+			"path": "pages/injection/injectionInventoryMoveDetail",
 			"style": {
 				"navigationBarTitleText": "高往低库存转移详情",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/plastics/plasticsCompleteReceive",
+			"path": "pages/injection/injectionTransfer",
 			"style": {
 				"navigationBarTitleText": "完工转储(注塑)",
 				"enablePullDownRefresh": true
@@ -623,6 +623,20 @@
 				"navigationBarTitleText": "三方库收货详情",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/cotaing/coatingTransfer",
+			"style": {
+				"navigationBarTitleText": "完工转储(喷涂)",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/assemble/assembleTransfer",
+			"style": {
+				"navigationBarTitleText": "完工转储(装配)",
+				"enablePullDownRefresh": false
+			}
 		}
 		
 	],
diff --git a/fe/PDA/pages/plastics/plasticsCompleteReceive.vue b/fe/PDA/pages/assemble/assembleTransfer.vue
similarity index 77%
rename from fe/PDA/pages/plastics/plasticsCompleteReceive.vue
rename to fe/PDA/pages/assemble/assembleTransfer.vue
index dd4c3462d..defeea144 100644
--- a/fe/PDA/pages/plastics/plasticsCompleteReceive.vue
+++ b/fe/PDA/pages/assemble/assembleTransfer.vue
@@ -13,7 +13,7 @@
 							</view>
 							<comItemCode :itemData="item"></comItemCode>
 						</view>
-			
+
 						<uni-table border stripe style="">
 							<!-- <uni-tr>
 								<uni-td align="center">物品代码</uni-td>
@@ -31,7 +31,7 @@
 								<uni-td align="center">来源库位</uni-td>
 								<uni-td>{{item.fromLocationCode}}</uni-td>
 							</uni-tr>
-			
+
 							<uni-tr>
 								<uni-td align="center">数量</uni-td>
 								<uni-td>
@@ -42,12 +42,12 @@
 													:max="99999" :min="0" @change="qtyChanged($event,item,index)">
 												</com-number-box>
 											</view>
-			
+
 											<view class="">
 												<button type="primary" size="mini" style="margin-left: 30rpx;"
 													@click="remove(item,index)">移除</button>
 											</view>
-			
+
 										</view>
 									</view>
 								</uni-td>
@@ -97,7 +97,7 @@
 	import winScanByProductCode from '@/mycomponents/wincom/winScanByProductCode.vue'
 	import comItemCode from '@/mycomponents/comItem/comItemCode.vue'
 	import comNumberBox from '@/mycomponents/common/comNumberBox.vue';
-	
+
 	export default {
 		name: 'comtransfer',
 		components: {
@@ -116,6 +116,7 @@
 				options: [],
 				itemList: [],
 				fromLocationCode: '',
+				fromLocationInfo: {},
 				toLocationCode: '',
 				scrollTop: 0,
 				old: {
@@ -128,7 +129,8 @@
 				isClearLot: false, //清除批次,
 				locationErpCode: '',
 				toLocationErpCode: '',
-				locationGotFocus: false
+				locationGotFocus: false,
+				transferType:"Transfer_Assemble"
 			};
 		},
 		props: {
@@ -140,19 +142,15 @@
 				type: Boolean,
 				value: false
 			},
-			transferType: {
-				type: String,
-				value: 'Transfer_Inside' //Transfer_Inside:储位内 Transfer_Area:储位间
-			}
 		},
 
 		watch: {},
 		mounted: function() {
 			this.openScanPopup();
 			this.options = getRemoveOption();
-			
+
 		},
-		
+
 
 		methods: {
 			openScanPopup() {
@@ -196,17 +194,20 @@
 						}
 					});
 				} else {
-					var item ={
+					var item = {
 						itemCode: result.itemCode,
 						itemName: result.itemName,
 						itemDesc1: result.itemDesc1,
 						stdPackQty: result.stdPackQty,
 						uom: result.uom,
 						qty: result.stdPackQty,
-						fromLocationCode:"Z1C1"
+						fromLocationCode: "ZPCP1",
+						fromStatus: 2,
+						toStatus:2
 					}
-					
+
 					this.itemList.unshift(item);
+					this.$refs.scanPackPopup.closeScanPopup()
 				}
 			},
 
@@ -217,6 +218,16 @@
 					this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
 				}
 			},
+			getFromLocation(code, callBack) {
+				locations(code).then(res => {
+					if (res) {
+						this.fromLocationInfo = res;
+						callBack(true)
+					}
+				}).catch(err => {
+					callBack(false)
+				})
+			},
 
 			getToLocation(code) {
 				if (code == '') {
@@ -235,41 +246,8 @@
 						this.$refs.location.clearLocation()
 						this.locationGotFocus = true;
 					} else {
-						if (that.transferType == 'Transfer_Inside') //储位内调拨
-						{
-							if (that.locationErpCode != res.erpLocationCode) {
-								that.showMessage('目标库位的ERP储位【' + res.erpLocationCode + '】与【' + this
-									.locationErpCode +
-									'】不是同一ERP储位,请重新扫描目标库位');
-								that.toLocationCode = ''
-								that.$refs.location.clearLocation();
-								this.locationGotFocus = true;
-							} else {
-								that.toLocationCode = code;
-								that.toLocationErpCode = res.erpLocationCode;
-							}
-
-						} else //储位调拨
-						{
-							let items = that.itemList.filter(r => {
-								return r.fromLocationErpCode == res.erpLocationCode;
-							})
-							if (items.length > 0) {
-								let msg = '';
-								for (var i = 0; i < items.length; i++) {
-									let r = items[i];
-									msg += (i == 0 ? '' : ',') + r.fromPackingCode
-								}
-								that.showMessage('【' + msg + '】所在ERP储位与目标库位的ERP储位【' + res
-									.erpLocationCode + '】相同,请重新扫描目标库位');
-								that.toLocationCode = ''
-								that.$refs.location.clearLocation();
-								this.locationGotFocus = true;
-							} else {
-								that.toLocationCode = res.code;
-								that.toLocationErpCode = res.erpLocationCode;
-							}
-						}
+						that.toLocationCode = code;
+						that.toLocationErpCode = res.erpLocationCode;
 					}
 					uni.hideLoading();
 				}).catch(err => {
@@ -295,42 +273,58 @@
 					this.showMessage('请扫描目标库位');
 					return;
 				}
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				let item = {
-					worker: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN,
-					warehouseCode: localStorage.warehouseCode,
-					jobNumber: "",
-					supplierCode: "",
-					company: localStorage.company,
-					number: "",
-					type: this.transferType,
-					details: []
-				}
+				this.getFromLocation(this.itemList[0].fromLocationCode, res => {
+					if (res) {
+						uni.showLoading({
+							title: "提交中....",
+							mask: true
+						});
+						let item = {
+							worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage
+								.userName_CN,
+							warehouseCode: localStorage.warehouseCode,
+							jobNumber: "",
+							supplierCode: "",
+							company: localStorage.company,
+							number: "",
+							type: this.transferType,
+							details: []
+						}
 
-				that.itemList.forEach(r => {
-					r.toLocationCode = that.toLocationCode;
-					r.toLocationErpCode = this.toLocationErpCode
+						this.itemList.forEach(r => {
+							r.toLocationCode = that.toLocationCode;
+							r.toLocationErpCode = this.toLocationErpCode
+							r.fromLot ="";
+							r.fromLocationArea = this.fromLocationInfo.areaCode;
+							r.fromLocationGroup = this.fromLocationInfo.locationGroupCode;
+							r.fromLocationErpCode = this.fromLocationInfo.erpLocationCode;
+							r.fromWarehouseCode = localStorage.warehouseCode;
+							
+							r.toLot ="";
+							r.fromPackingCode="";
+							r.toPackingCode = "";
+							
+							r.toWarehouseCode =localStorage.warehouseCode;
+							r.worker = localStorage.userName_CN == "" ? localStorage.userName :
+								localStorage.userName_CN
+							item.details.push(r);
+						})
 
-					r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN
-					item.details.push(r);
+						let params = JSON.stringify(item);
+						console.log('params', params);
+						completeTransfer(params)
+							.then(res => {
+								that.showCommitSuccess();
+								that.clearInfo();
+								uni.hideLoading();
+							})
+							.catch(err => {
+								that.showMessage(err.message);
+								uni.hideLoading();
+							});
+					}
 				})
 
-
-				let params = JSON.stringify(item);
-				console.log('params', params);
-				completeTransfer(params)
-					.then(res => {
-						that.showCommitSuccess();
-						that.clearInfo();
-						uni.hideLoading();
-					})
-					.catch(err => {
-						that.showMessage(err.message);
-						uni.hideLoading();
-					});
 			},
 
 			cancel() {
@@ -347,6 +341,7 @@
 				that.itemList = [];
 				that.toLocationCode = '';
 				that.inventoryStatus = -1;
+				that.$refs.location.clearLocation()
 			},
 
 			afterCloseMessagg() {
@@ -405,4 +400,4 @@
 		border-bottom-width: 1px;
 		border-bottom-color: #ebeef5;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/fe/PDA/pages/cotaing/coatingTransfer.vue b/fe/PDA/pages/cotaing/coatingTransfer.vue
new file mode 100644
index 000000000..a23f7252e
--- /dev/null
+++ b/fe/PDA/pages/cotaing/coatingTransfer.vue
@@ -0,0 +1,403 @@
+<template>
+	<page-meta root-font-size="18px"></page-meta>
+	<view class="">
+		<win-blank-view @goScan='openScanPopup' v-if="itemList.length==0"></win-blank-view>
+		<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+			@scrolltolower="lower" @scroll="scroll" style="padding-bottom:150px">
+			<view class="detail-list " v-for="(item, index) in itemList" :key="index">
+				<view class="detail-content">
+					<view class="" style="">
+						<view class="uni-flex uni-row u-col-center">
+							<view class="" style="margin-top: 20rpx; margin-left: 10rpx; font-weight: bold;">
+								({{index+1}}).
+							</view>
+							<comItemCode :itemData="item"></comItemCode>
+						</view>
+
+						<uni-table border stripe style="">
+							<!-- <uni-tr>
+								<uni-td align="center">物品代码</uni-td>
+								<uni-td>{{item.itemCode}}</uni-td>
+							</uni-tr> -->
+							<uni-tr>
+								<uni-td align="center">单位</uni-td>
+								<uni-td>{{item.uom}}</uni-td>
+							</uni-tr>
+							<uni-tr>
+								<uni-td align="center">标包数</uni-td>
+								<uni-td>{{item.stdPackQty}}</uni-td>
+							</uni-tr>
+							<uni-tr>
+								<uni-td align="center">来源库位</uni-td>
+								<uni-td>{{item.fromLocationCode}}</uni-td>
+							</uni-tr>
+
+							<uni-tr>
+								<uni-td align="center">数量</uni-td>
+								<uni-td>
+									<view class="uni-flex uni-row">
+										<view class="uni-flex uni-row space-between" style="width: 100%;">
+											<view class="">
+												<com-number-box :ref="'comNumberBox_'+index" v-model="item.qty"
+													:max="99999" :min="0" @change="qtyChanged($event,item,index)">
+												</com-number-box>
+											</view>
+
+											<view class="">
+												<button type="primary" size="mini" style="margin-left: 30rpx;"
+													@click="remove(item,index)">移除</button>
+											</view>
+
+										</view>
+									</view>
+								</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<div class="new_bot_box" v-show="itemList.length>0">
+			<win-collapse-location ref="location" @getLocationCode='getToLocation' @clear='clear'>
+			</win-collapse-location>
+			<view class="new_btn_bot bot_pos uni-flex">
+				<button class="new_clear_btn btn_double" @click="cancel()">清空</button>
+				<button class="new_save_btn btn_double" @click="submit()">提交</button>
+			</view>
+		</div>
+		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
+		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
+		<com-message ref="comMessage" @afterClose='afterCloseMessagg'></com-message>
+	</view>
+	</view>
+</template>
+
+<script>
+	import {
+		locations,
+		getBalancesByFilter,
+		completeTransfer
+	} from '@/api/index.js';
+
+	import {
+		showConfirmMsg,
+		goHome,
+		getRemoveOption
+	} from '@/common/basic.js';
+
+	import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
+	import comBalanceItem from '@/mycomponents/comItem/comBalanceItem.vue'
+	import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
+	import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comBalance from '@/mycomponents/common/comBalance.vue'
+	import winCollapseLocation from '@/mycomponents/wincom/winCollapseLocation.vue'
+	import winScanByProductCode from '@/mycomponents/wincom/winScanByProductCode.vue'
+	import comItemCode from '@/mycomponents/comItem/comItemCode.vue'
+	import comNumberBox from '@/mycomponents/common/comNumberBox.vue';
+
+	export default {
+		name: 'comtransfer',
+		components: {
+			winBlankView,
+			comBalanceItem,
+			comMessage,
+			winScanButton,
+			comBalance,
+			winCollapseLocation,
+			winScanByProductCode,
+			comItemCode,
+			comNumberBox
+		},
+		data() {
+			return {
+				options: [],
+				itemList: [],
+				fromLocationCode: '',
+				fromLocationInfo: {},
+				toLocationCode: '',
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				inventoryStatus: -1,
+				inventoryStatusArray: [],
+				isClearPackCode: false, //清除箱码
+				isClearContainerCode: false, //清除托码
+				isClearLot: false, //清除批次,
+				locationErpCode: '',
+				toLocationErpCode: '',
+				locationGotFocus: false,
+				transferType:"Transfer_Coating"
+			};
+		},
+		props: {
+			// locationTypes: {
+			// 	type: [Array, String, Number],
+			// 	value: ''
+			// },
+			byLocation: {
+				type: Boolean,
+				value: false
+			},
+		},
+
+		watch: {},
+		mounted: function() {
+			this.openScanPopup();
+			this.options = getRemoveOption();
+
+		},
+
+
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPackPopup.openScanPopup()
+			},
+			//提示是否移除选择的行?
+			swipeClick(e, index) {
+				let {
+					content
+				} = e;
+				if (content.text === '移除') {
+					uni.showModal({
+						title: '提示',
+						content: '是否移除选择的行?',
+						success: res => {
+							if (res.confirm) {
+								this.itemList.splice(index, 1);
+							}
+						}
+					});
+				}
+			},
+
+			getScanResult(result) {
+				let that = this;
+				let code = result.itemCode;
+				let datas = that.itemList.filter(r => {
+					return r.itemCode == code
+				})
+
+				if (datas.length > 0) {
+					showConfirmMsg('物料【' + code + '】已经存在,是否要重新扫描?', confirm => {
+						if (confirm) {
+							that.itemList.forEach((r, i) => {
+								if (r.packingCode == code) {
+									that.itemList.splice(i, 1);
+									return;
+								}
+							});
+							// that.getBalance(code);
+						}
+					});
+				} else {
+					var item = {
+						itemCode: result.itemCode,
+						itemName: result.itemName,
+						itemDesc1: result.itemDesc1,
+						stdPackQty: result.stdPackQty,
+						uom: result.uom,
+						qty: result.stdPackQty,
+						fromLocationCode: "ZPCP1",
+						fromStatus: 2,
+						toStatus:2
+					}
+
+					this.itemList.unshift(item);
+					this.$refs.scanPackPopup.closeScanPopup()
+				}
+			},
+
+			qtyChanged(value, item, index) {
+				if (value <= 0) {
+					this.showMessage('退货数量必须大于0')
+					item.handledQty = item.qty
+					this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
+				}
+			},
+			getFromLocation(code, callBack) {
+				locations(code).then(res => {
+					if (res) {
+						this.fromLocationInfo = res;
+						callBack(true)
+					}
+				}).catch(err => {
+					callBack(false)
+				})
+			},
+
+			getToLocation(code) {
+				if (code == '') {
+					this.showMessage('目标库位不能为空');
+					return;
+				}
+				uni.showLoading({
+					title: "扫描中",
+					mask: true
+				});
+				let that = this;
+				locations(code).then(res => {
+					if (res == null) {
+						that.toLocationCode = ''
+						that.showMessage('目标库位【' + code + '】不存在');
+						this.$refs.location.clearLocation()
+						this.locationGotFocus = true;
+					} else {
+						that.toLocationCode = code;
+						that.toLocationErpCode = res.erpLocationCode;
+					}
+					uni.hideLoading();
+				}).catch(err => {
+					that.toLocationCode = ''
+					this.locationGotFocus = true;
+					that.showMessage(err.message);
+					uni.hideLoading();
+				})
+			},
+
+			clear() {
+				this.location = null;
+				this.toLocationCode = "";
+			},
+
+			submit() {
+				let that = this;
+				if (that.itemList.length === 0) {
+					this.showMessage('请选择要提交的零件');
+					return;
+				}
+				if (that.toLocationCode === '') {
+					this.showMessage('请扫描目标库位');
+					return;
+				}
+				this.getFromLocation(this.itemList[0].fromLocationCode, res => {
+					if (res) {
+						uni.showLoading({
+							title: "提交中....",
+							mask: true
+						});
+						let item = {
+							worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage
+								.userName_CN,
+							warehouseCode: localStorage.warehouseCode,
+							jobNumber: "",
+							supplierCode: "",
+							company: localStorage.company,
+							number: "",
+							type: this.transferType,
+							details: []
+						}
+
+						this.itemList.forEach(r => {
+							r.toLocationCode = that.toLocationCode;
+							r.toLocationErpCode = this.toLocationErpCode
+							r.fromLot ="";
+							r.fromLocationArea = this.fromLocationInfo.areaCode;
+							r.fromLocationGroup = this.fromLocationInfo.locationGroupCode;
+							r.fromLocationErpCode = this.fromLocationInfo.erpLocationCode;
+							r.fromWarehouseCode = localStorage.warehouseCode;
+							
+							r.toLot ="";
+							r.fromPackingCode="";
+							r.toPackingCode = "";
+							
+							r.toWarehouseCode =localStorage.warehouseCode;
+							r.worker = localStorage.userName_CN == "" ? localStorage.userName :
+								localStorage.userName_CN
+							item.details.push(r);
+						})
+
+						let params = JSON.stringify(item);
+						console.log('params', params);
+						completeTransfer(params)
+							.then(res => {
+								that.showCommitSuccess();
+								that.clearInfo();
+								uni.hideLoading();
+							})
+							.catch(err => {
+								that.showMessage(err.message);
+								uni.hideLoading();
+							});
+					}
+				})
+
+			},
+
+			cancel() {
+				let that = this;
+				showConfirmMsg('是否要清空已扫描的零件和目标库位信息?', confirm => {
+					if (confirm) {
+						that.clearInfo();
+					}
+				})
+			},
+
+			clearInfo() {
+				let that = this;
+				that.itemList = [];
+				that.toLocationCode = '';
+				that.inventoryStatus = -1;
+				that.$refs.location.clearLocation()
+			},
+
+			afterCloseMessagg() {
+				if (this.locationGotFocus) {
+					this.$refs.location.gotFocus();
+				}
+			},
+
+			clearPackCode() {
+				this.isClearPackCode = !this.isClearPackCode;
+			},
+
+			clearContainerCode() {
+				this.isClearContainerCode = !this.isClearContainerCode;
+			},
+
+			clearLot() {
+				this.isClearLot = !this.isClearLot;
+			},
+
+			upper: function(e) {
+				// console.log(e)
+			},
+			lower: function(e) {
+				// console.log(e)
+			},
+			scroll: function(e) {
+				// console.log(e)
+				this.old.scrollTop = e.detail.scrollTop;
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message);
+			},
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	/deep/ .input-value {
+		font-size: 16px;
+	}
+
+	/deep/ .uni-collapse-item__title-text {
+		font-size: 16px;
+	}
+
+	/deep/ .uni-collapse-item--border {
+		border-bottom-width: 0px;
+		border-bottom-color: #ebeef5;
+	}
+
+	/deep/ .uni-collapse-item--border {
+		border-bottom-width: 1px;
+		border-bottom-color: #ebeef5;
+	}
+</style>
\ No newline at end of file
diff --git a/fe/PDA/pages/plastics/plasticsInventoryMove.vue b/fe/PDA/pages/injection/injectionInventoryMove.vue
similarity index 100%
rename from fe/PDA/pages/plastics/plasticsInventoryMove.vue
rename to fe/PDA/pages/injection/injectionInventoryMove.vue
diff --git a/fe/PDA/pages/plastics/plasticsInventoryMoveDetail.vue b/fe/PDA/pages/injection/injectionInventoryMoveDetail.vue
similarity index 100%
rename from fe/PDA/pages/plastics/plasticsInventoryMoveDetail.vue
rename to fe/PDA/pages/injection/injectionInventoryMoveDetail.vue
diff --git a/fe/PDA/pages/injection/injectionTransfer.vue b/fe/PDA/pages/injection/injectionTransfer.vue
new file mode 100644
index 000000000..195414e71
--- /dev/null
+++ b/fe/PDA/pages/injection/injectionTransfer.vue
@@ -0,0 +1,403 @@
+<template>
+	<page-meta root-font-size="18px"></page-meta>
+	<view class="">
+		<win-blank-view @goScan='openScanPopup' v-if="itemList.length==0"></win-blank-view>
+		<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+			@scrolltolower="lower" @scroll="scroll" style="padding-bottom:150px">
+			<view class="detail-list " v-for="(item, index) in itemList" :key="index">
+				<view class="detail-content">
+					<view class="" style="">
+						<view class="uni-flex uni-row u-col-center">
+							<view class="" style="margin-top: 20rpx; margin-left: 10rpx; font-weight: bold;">
+								({{index+1}}).
+							</view>
+							<comItemCode :itemData="item"></comItemCode>
+						</view>
+
+						<uni-table border stripe style="">
+							<!-- <uni-tr>
+								<uni-td align="center">物品代码</uni-td>
+								<uni-td>{{item.itemCode}}</uni-td>
+							</uni-tr> -->
+							<uni-tr>
+								<uni-td align="center">单位</uni-td>
+								<uni-td>{{item.uom}}</uni-td>
+							</uni-tr>
+							<uni-tr>
+								<uni-td align="center">标包数</uni-td>
+								<uni-td>{{item.stdPackQty}}</uni-td>
+							</uni-tr>
+							<uni-tr>
+								<uni-td align="center">来源库位</uni-td>
+								<uni-td>{{item.fromLocationCode}}</uni-td>
+							</uni-tr>
+
+							<uni-tr>
+								<uni-td align="center">数量</uni-td>
+								<uni-td>
+									<view class="uni-flex uni-row">
+										<view class="uni-flex uni-row space-between" style="width: 100%;">
+											<view class="">
+												<com-number-box :ref="'comNumberBox_'+index" v-model="item.qty"
+													:max="99999" :min="0" @change="qtyChanged($event,item,index)">
+												</com-number-box>
+											</view>
+
+											<view class="">
+												<button type="primary" size="mini" style="margin-left: 30rpx;"
+													@click="remove(item,index)">移除</button>
+											</view>
+
+										</view>
+									</view>
+								</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<div class="new_bot_box" v-show="itemList.length>0">
+			<win-collapse-location ref="location" @getLocationCode='getToLocation' @clear='clear'>
+			</win-collapse-location>
+			<view class="new_btn_bot bot_pos uni-flex">
+				<button class="new_clear_btn btn_double" @click="cancel()">清空</button>
+				<button class="new_save_btn btn_double" @click="submit()">提交</button>
+			</view>
+		</div>
+		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
+		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
+		<com-message ref="comMessage" @afterClose='afterCloseMessagg'></com-message>
+	</view>
+	</view>
+</template>
+
+<script>
+	import {
+		locations,
+		getBalancesByFilter,
+		completeTransfer
+	} from '@/api/index.js';
+
+	import {
+		showConfirmMsg,
+		goHome,
+		getRemoveOption
+	} from '@/common/basic.js';
+
+	import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
+	import comBalanceItem from '@/mycomponents/comItem/comBalanceItem.vue'
+	import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
+	import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comBalance from '@/mycomponents/common/comBalance.vue'
+	import winCollapseLocation from '@/mycomponents/wincom/winCollapseLocation.vue'
+	import winScanByProductCode from '@/mycomponents/wincom/winScanByProductCode.vue'
+	import comItemCode from '@/mycomponents/comItem/comItemCode.vue'
+	import comNumberBox from '@/mycomponents/common/comNumberBox.vue';
+
+	export default {
+		name: 'comtransfer',
+		components: {
+			winBlankView,
+			comBalanceItem,
+			comMessage,
+			winScanButton,
+			comBalance,
+			winCollapseLocation,
+			winScanByProductCode,
+			comItemCode,
+			comNumberBox
+		},
+		data() {
+			return {
+				options: [],
+				itemList: [],
+				fromLocationCode: '',
+				fromLocationInfo: {},
+				toLocationCode: '',
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				inventoryStatus: -1,
+				inventoryStatusArray: [],
+				isClearPackCode: false, //清除箱码
+				isClearContainerCode: false, //清除托码
+				isClearLot: false, //清除批次,
+				locationErpCode: '',
+				toLocationErpCode: '',
+				locationGotFocus: false,
+				transferType:"Transfer_Injection"
+			};
+		},
+		props: {
+			// locationTypes: {
+			// 	type: [Array, String, Number],
+			// 	value: ''
+			// },
+			byLocation: {
+				type: Boolean,
+				value: false
+			},
+		},
+
+		watch: {},
+		mounted: function() {
+			this.openScanPopup();
+			this.options = getRemoveOption();
+
+		},
+
+
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPackPopup.openScanPopup()
+			},
+			//提示是否移除选择的行?
+			swipeClick(e, index) {
+				let {
+					content
+				} = e;
+				if (content.text === '移除') {
+					uni.showModal({
+						title: '提示',
+						content: '是否移除选择的行?',
+						success: res => {
+							if (res.confirm) {
+								this.itemList.splice(index, 1);
+							}
+						}
+					});
+				}
+			},
+
+			getScanResult(result) {
+				let that = this;
+				let code = result.itemCode;
+				let datas = that.itemList.filter(r => {
+					return r.itemCode == code
+				})
+
+				if (datas.length > 0) {
+					showConfirmMsg('物料【' + code + '】已经存在,是否要重新扫描?', confirm => {
+						if (confirm) {
+							that.itemList.forEach((r, i) => {
+								if (r.packingCode == code) {
+									that.itemList.splice(i, 1);
+									return;
+								}
+							});
+							// that.getBalance(code);
+						}
+					});
+				} else {
+					var item = {
+						itemCode: result.itemCode,
+						itemName: result.itemName,
+						itemDesc1: result.itemDesc1,
+						stdPackQty: result.stdPackQty,
+						uom: result.uom,
+						qty: result.stdPackQty,
+						fromLocationCode: "ZPCP1",
+						fromStatus: 2,
+						toStatus:2
+					}
+
+					this.itemList.unshift(item);
+					this.$refs.scanPackPopup.closeScanPopup()
+				}
+			},
+
+			qtyChanged(value, item, index) {
+				if (value <= 0) {
+					this.showMessage('退货数量必须大于0')
+					item.handledQty = item.qty
+					this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
+				}
+			},
+			getFromLocation(code, callBack) {
+				locations(code).then(res => {
+					if (res) {
+						this.fromLocationInfo = res;
+						callBack(true)
+					}
+				}).catch(err => {
+					callBack(false)
+				})
+			},
+
+			getToLocation(code) {
+				if (code == '') {
+					this.showMessage('目标库位不能为空');
+					return;
+				}
+				uni.showLoading({
+					title: "扫描中",
+					mask: true
+				});
+				let that = this;
+				locations(code).then(res => {
+					if (res == null) {
+						that.toLocationCode = ''
+						that.showMessage('目标库位【' + code + '】不存在');
+						this.$refs.location.clearLocation()
+						this.locationGotFocus = true;
+					} else {
+						that.toLocationCode = code;
+						that.toLocationErpCode = res.erpLocationCode;
+					}
+					uni.hideLoading();
+				}).catch(err => {
+					that.toLocationCode = ''
+					this.locationGotFocus = true;
+					that.showMessage(err.message);
+					uni.hideLoading();
+				})
+			},
+
+			clear() {
+				this.location = null;
+				this.toLocationCode = "";
+			},
+
+			submit() {
+				let that = this;
+				if (that.itemList.length === 0) {
+					this.showMessage('请选择要提交的零件');
+					return;
+				}
+				if (that.toLocationCode === '') {
+					this.showMessage('请扫描目标库位');
+					return;
+				}
+				this.getFromLocation(this.itemList[0].fromLocationCode, res => {
+					if (res) {
+						uni.showLoading({
+							title: "提交中....",
+							mask: true
+						});
+						let item = {
+							worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage
+								.userName_CN,
+							warehouseCode: localStorage.warehouseCode,
+							jobNumber: "",
+							supplierCode: "",
+							company: localStorage.company,
+							number: "",
+							type: this.transferType,
+							details: []
+						}
+
+						this.itemList.forEach(r => {
+							r.toLocationCode = that.toLocationCode;
+							r.toLocationErpCode = this.toLocationErpCode
+							r.fromLot ="";
+							r.fromLocationArea = this.fromLocationInfo.areaCode;
+							r.fromLocationGroup = this.fromLocationInfo.locationGroupCode;
+							r.fromLocationErpCode = this.fromLocationInfo.erpLocationCode;
+							r.fromWarehouseCode = localStorage.warehouseCode;
+							
+							r.toLot ="";
+							r.fromPackingCode="";
+							r.toPackingCode = "";
+							
+							r.toWarehouseCode =localStorage.warehouseCode;
+							r.worker = localStorage.userName_CN == "" ? localStorage.userName :
+								localStorage.userName_CN
+							item.details.push(r);
+						})
+
+						let params = JSON.stringify(item);
+						console.log('params', params);
+						completeTransfer(params)
+							.then(res => {
+								that.showCommitSuccess();
+								that.clearInfo();
+								uni.hideLoading();
+							})
+							.catch(err => {
+								that.showMessage(err.message);
+								uni.hideLoading();
+							});
+					}
+				})
+
+			},
+
+			cancel() {
+				let that = this;
+				showConfirmMsg('是否要清空已扫描的零件和目标库位信息?', confirm => {
+					if (confirm) {
+						that.clearInfo();
+					}
+				})
+			},
+
+			clearInfo() {
+				let that = this;
+				that.itemList = [];
+				that.toLocationCode = '';
+				that.inventoryStatus = -1;
+				that.$refs.location.clearLocation()
+			},
+
+			afterCloseMessagg() {
+				if (this.locationGotFocus) {
+					this.$refs.location.gotFocus();
+				}
+			},
+
+			clearPackCode() {
+				this.isClearPackCode = !this.isClearPackCode;
+			},
+
+			clearContainerCode() {
+				this.isClearContainerCode = !this.isClearContainerCode;
+			},
+
+			clearLot() {
+				this.isClearLot = !this.isClearLot;
+			},
+
+			upper: function(e) {
+				// console.log(e)
+			},
+			lower: function(e) {
+				// console.log(e)
+			},
+			scroll: function(e) {
+				// console.log(e)
+				this.old.scrollTop = e.detail.scrollTop;
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message);
+			},
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	/deep/ .input-value {
+		font-size: 16px;
+	}
+
+	/deep/ .uni-collapse-item__title-text {
+		font-size: 16px;
+	}
+
+	/deep/ .uni-collapse-item--border {
+		border-bottom-width: 0px;
+		border-bottom-color: #ebeef5;
+	}
+
+	/deep/ .uni-collapse-item--border {
+		border-bottom-width: 1px;
+		border-bottom-color: #ebeef5;
+	}
+</style>
\ No newline at end of file
diff --git a/fe/PDA/pages/spray/sprayCompleteReceive.vue b/fe/PDA/pages/spray/sprayCompleteReceive.vue
new file mode 100644
index 000000000..195414e71
--- /dev/null
+++ b/fe/PDA/pages/spray/sprayCompleteReceive.vue
@@ -0,0 +1,403 @@
+<template>
+	<page-meta root-font-size="18px"></page-meta>
+	<view class="">
+		<win-blank-view @goScan='openScanPopup' v-if="itemList.length==0"></win-blank-view>
+		<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltoupper="upper"
+			@scrolltolower="lower" @scroll="scroll" style="padding-bottom:150px">
+			<view class="detail-list " v-for="(item, index) in itemList" :key="index">
+				<view class="detail-content">
+					<view class="" style="">
+						<view class="uni-flex uni-row u-col-center">
+							<view class="" style="margin-top: 20rpx; margin-left: 10rpx; font-weight: bold;">
+								({{index+1}}).
+							</view>
+							<comItemCode :itemData="item"></comItemCode>
+						</view>
+
+						<uni-table border stripe style="">
+							<!-- <uni-tr>
+								<uni-td align="center">物品代码</uni-td>
+								<uni-td>{{item.itemCode}}</uni-td>
+							</uni-tr> -->
+							<uni-tr>
+								<uni-td align="center">单位</uni-td>
+								<uni-td>{{item.uom}}</uni-td>
+							</uni-tr>
+							<uni-tr>
+								<uni-td align="center">标包数</uni-td>
+								<uni-td>{{item.stdPackQty}}</uni-td>
+							</uni-tr>
+							<uni-tr>
+								<uni-td align="center">来源库位</uni-td>
+								<uni-td>{{item.fromLocationCode}}</uni-td>
+							</uni-tr>
+
+							<uni-tr>
+								<uni-td align="center">数量</uni-td>
+								<uni-td>
+									<view class="uni-flex uni-row">
+										<view class="uni-flex uni-row space-between" style="width: 100%;">
+											<view class="">
+												<com-number-box :ref="'comNumberBox_'+index" v-model="item.qty"
+													:max="99999" :min="0" @change="qtyChanged($event,item,index)">
+												</com-number-box>
+											</view>
+
+											<view class="">
+												<button type="primary" size="mini" style="margin-left: 30rpx;"
+													@click="remove(item,index)">移除</button>
+											</view>
+
+										</view>
+									</view>
+								</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<div class="new_bot_box" v-show="itemList.length>0">
+			<win-collapse-location ref="location" @getLocationCode='getToLocation' @clear='clear'>
+			</win-collapse-location>
+			<view class="new_btn_bot bot_pos uni-flex">
+				<button class="new_clear_btn btn_double" @click="cancel()">清空</button>
+				<button class="new_save_btn btn_double" @click="submit()">提交</button>
+			</view>
+		</div>
+		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
+		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
+		<com-message ref="comMessage" @afterClose='afterCloseMessagg'></com-message>
+	</view>
+	</view>
+</template>
+
+<script>
+	import {
+		locations,
+		getBalancesByFilter,
+		completeTransfer
+	} from '@/api/index.js';
+
+	import {
+		showConfirmMsg,
+		goHome,
+		getRemoveOption
+	} from '@/common/basic.js';
+
+	import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
+	import comBalanceItem from '@/mycomponents/comItem/comBalanceItem.vue'
+	import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
+	import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comBalance from '@/mycomponents/common/comBalance.vue'
+	import winCollapseLocation from '@/mycomponents/wincom/winCollapseLocation.vue'
+	import winScanByProductCode from '@/mycomponents/wincom/winScanByProductCode.vue'
+	import comItemCode from '@/mycomponents/comItem/comItemCode.vue'
+	import comNumberBox from '@/mycomponents/common/comNumberBox.vue';
+
+	export default {
+		name: 'comtransfer',
+		components: {
+			winBlankView,
+			comBalanceItem,
+			comMessage,
+			winScanButton,
+			comBalance,
+			winCollapseLocation,
+			winScanByProductCode,
+			comItemCode,
+			comNumberBox
+		},
+		data() {
+			return {
+				options: [],
+				itemList: [],
+				fromLocationCode: '',
+				fromLocationInfo: {},
+				toLocationCode: '',
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				inventoryStatus: -1,
+				inventoryStatusArray: [],
+				isClearPackCode: false, //清除箱码
+				isClearContainerCode: false, //清除托码
+				isClearLot: false, //清除批次,
+				locationErpCode: '',
+				toLocationErpCode: '',
+				locationGotFocus: false,
+				transferType:"Transfer_Injection"
+			};
+		},
+		props: {
+			// locationTypes: {
+			// 	type: [Array, String, Number],
+			// 	value: ''
+			// },
+			byLocation: {
+				type: Boolean,
+				value: false
+			},
+		},
+
+		watch: {},
+		mounted: function() {
+			this.openScanPopup();
+			this.options = getRemoveOption();
+
+		},
+
+
+		methods: {
+			openScanPopup() {
+				this.$refs.scanPackPopup.openScanPopup()
+			},
+			//提示是否移除选择的行?
+			swipeClick(e, index) {
+				let {
+					content
+				} = e;
+				if (content.text === '移除') {
+					uni.showModal({
+						title: '提示',
+						content: '是否移除选择的行?',
+						success: res => {
+							if (res.confirm) {
+								this.itemList.splice(index, 1);
+							}
+						}
+					});
+				}
+			},
+
+			getScanResult(result) {
+				let that = this;
+				let code = result.itemCode;
+				let datas = that.itemList.filter(r => {
+					return r.itemCode == code
+				})
+
+				if (datas.length > 0) {
+					showConfirmMsg('物料【' + code + '】已经存在,是否要重新扫描?', confirm => {
+						if (confirm) {
+							that.itemList.forEach((r, i) => {
+								if (r.packingCode == code) {
+									that.itemList.splice(i, 1);
+									return;
+								}
+							});
+							// that.getBalance(code);
+						}
+					});
+				} else {
+					var item = {
+						itemCode: result.itemCode,
+						itemName: result.itemName,
+						itemDesc1: result.itemDesc1,
+						stdPackQty: result.stdPackQty,
+						uom: result.uom,
+						qty: result.stdPackQty,
+						fromLocationCode: "ZPCP1",
+						fromStatus: 2,
+						toStatus:2
+					}
+
+					this.itemList.unshift(item);
+					this.$refs.scanPackPopup.closeScanPopup()
+				}
+			},
+
+			qtyChanged(value, item, index) {
+				if (value <= 0) {
+					this.showMessage('退货数量必须大于0')
+					item.handledQty = item.qty
+					this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
+				}
+			},
+			getFromLocation(code, callBack) {
+				locations(code).then(res => {
+					if (res) {
+						this.fromLocationInfo = res;
+						callBack(true)
+					}
+				}).catch(err => {
+					callBack(false)
+				})
+			},
+
+			getToLocation(code) {
+				if (code == '') {
+					this.showMessage('目标库位不能为空');
+					return;
+				}
+				uni.showLoading({
+					title: "扫描中",
+					mask: true
+				});
+				let that = this;
+				locations(code).then(res => {
+					if (res == null) {
+						that.toLocationCode = ''
+						that.showMessage('目标库位【' + code + '】不存在');
+						this.$refs.location.clearLocation()
+						this.locationGotFocus = true;
+					} else {
+						that.toLocationCode = code;
+						that.toLocationErpCode = res.erpLocationCode;
+					}
+					uni.hideLoading();
+				}).catch(err => {
+					that.toLocationCode = ''
+					this.locationGotFocus = true;
+					that.showMessage(err.message);
+					uni.hideLoading();
+				})
+			},
+
+			clear() {
+				this.location = null;
+				this.toLocationCode = "";
+			},
+
+			submit() {
+				let that = this;
+				if (that.itemList.length === 0) {
+					this.showMessage('请选择要提交的零件');
+					return;
+				}
+				if (that.toLocationCode === '') {
+					this.showMessage('请扫描目标库位');
+					return;
+				}
+				this.getFromLocation(this.itemList[0].fromLocationCode, res => {
+					if (res) {
+						uni.showLoading({
+							title: "提交中....",
+							mask: true
+						});
+						let item = {
+							worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage
+								.userName_CN,
+							warehouseCode: localStorage.warehouseCode,
+							jobNumber: "",
+							supplierCode: "",
+							company: localStorage.company,
+							number: "",
+							type: this.transferType,
+							details: []
+						}
+
+						this.itemList.forEach(r => {
+							r.toLocationCode = that.toLocationCode;
+							r.toLocationErpCode = this.toLocationErpCode
+							r.fromLot ="";
+							r.fromLocationArea = this.fromLocationInfo.areaCode;
+							r.fromLocationGroup = this.fromLocationInfo.locationGroupCode;
+							r.fromLocationErpCode = this.fromLocationInfo.erpLocationCode;
+							r.fromWarehouseCode = localStorage.warehouseCode;
+							
+							r.toLot ="";
+							r.fromPackingCode="";
+							r.toPackingCode = "";
+							
+							r.toWarehouseCode =localStorage.warehouseCode;
+							r.worker = localStorage.userName_CN == "" ? localStorage.userName :
+								localStorage.userName_CN
+							item.details.push(r);
+						})
+
+						let params = JSON.stringify(item);
+						console.log('params', params);
+						completeTransfer(params)
+							.then(res => {
+								that.showCommitSuccess();
+								that.clearInfo();
+								uni.hideLoading();
+							})
+							.catch(err => {
+								that.showMessage(err.message);
+								uni.hideLoading();
+							});
+					}
+				})
+
+			},
+
+			cancel() {
+				let that = this;
+				showConfirmMsg('是否要清空已扫描的零件和目标库位信息?', confirm => {
+					if (confirm) {
+						that.clearInfo();
+					}
+				})
+			},
+
+			clearInfo() {
+				let that = this;
+				that.itemList = [];
+				that.toLocationCode = '';
+				that.inventoryStatus = -1;
+				that.$refs.location.clearLocation()
+			},
+
+			afterCloseMessagg() {
+				if (this.locationGotFocus) {
+					this.$refs.location.gotFocus();
+				}
+			},
+
+			clearPackCode() {
+				this.isClearPackCode = !this.isClearPackCode;
+			},
+
+			clearContainerCode() {
+				this.isClearContainerCode = !this.isClearContainerCode;
+			},
+
+			clearLot() {
+				this.isClearLot = !this.isClearLot;
+			},
+
+			upper: function(e) {
+				// console.log(e)
+			},
+			lower: function(e) {
+				// console.log(e)
+			},
+			scroll: function(e) {
+				// console.log(e)
+				this.old.scrollTop = e.detail.scrollTop;
+			},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message);
+			},
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	/deep/ .input-value {
+		font-size: 16px;
+	}
+
+	/deep/ .uni-collapse-item__title-text {
+		font-size: 16px;
+	}
+
+	/deep/ .uni-collapse-item--border {
+		border-bottom-width: 0px;
+		border-bottom-color: #ebeef5;
+	}
+
+	/deep/ .uni-collapse-item--border {
+		border-bottom-width: 1px;
+		border-bottom-color: #ebeef5;
+	}
+</style>
\ No newline at end of file
diff --git a/fe/PDA/pages/task/thirdLocationDetail.vue b/fe/PDA/pages/task/thirdLocationDetail.vue
index c2a9578e3..6c2692b10 100644
--- a/fe/PDA/pages/task/thirdLocationDetail.vue
+++ b/fe/PDA/pages/task/thirdLocationDetail.vue
@@ -362,7 +362,7 @@
 			setParams() {
 				this.datacontent.details.forEach(res => {
 					// res.handledFromLocationCode = res.recommendFromLocationCode;
-					// res.handledFromLocationArea = res.recommendFromLocationArea;
+					// res.handledFromLocationA rea = res.recommendFromLocationArea;
 					// res.handledFromLocationGroup = res.recommendFromLocationGroup;
 					// res.handledFromLocationErpCode = res.recommendFromLocationErpCode
 					// res.handledFromWarehouseCode = res.recommendFromWarehouseCode;