diff --git a/common/calc.js b/common/calc.js
index 358252ee..2b48e481 100644
--- a/common/calc.js
+++ b/common/calc.js
@@ -2,16 +2,16 @@
 import { Decimal } from 'decimal.js';//引入
 class Calc {
     add(num1,num2) {
-        return new Decimal(num1).add(new Decimal(num2))
+        return new Decimal(num1).add(new Decimal(num2)).toNumber()
     }
     sub(num1,num2) {
-        return new Decimal(num1).sub(new Decimal(num2))
+        return new Decimal(num1).sub(new Decimal(num2)).toNumber()
     }
     mul(num1,num2) {
-        return new Decimal(num1).mul(new Decimal(num2))
+        return new Decimal(num1).mul(new Decimal(num2)).toNumber()
     }
     div(num1,num2) {
-        return new Decimal(num1).div(new Decimal(num2))
+        return new Decimal(num1).div(new Decimal(num2)).toNumber()
     }
 }
 export const calc = new Calc();
\ No newline at end of file
diff --git a/common/record.js b/common/record.js
index 2e457395..db2b1110 100644
--- a/common/record.js
+++ b/common/record.js
@@ -6,6 +6,10 @@ import {
 	getDirectoryItemArray,
 } from '@/common/directory.js';
 import { calc } from '@/common/calc'
+import { Decimal } from 'decimal.js';//引入
+	import {
+		deepCopyData
+	} from '@/common/basic.js';
 
 export function createItemInfo(balance, pack) {
 	let item = {
@@ -13,25 +17,24 @@ export function createItemInfo(balance, pack) {
 		itemName: pack.itemName,
 		stdPackQty: pack.stdPackQty,
 		stdPackUnit: pack.stdPackUnit,
-		qty: Number(balance.qty),
-		handleQty: 0,
+		qty: new Decimal(balance.qty).toNumber(),
+		handleQty:new Decimal(0).toNumber(),
 		uom: pack.uom,
 		subList: []
 	}
 	return item;
 }
 
-export function createDetailInfo(data, pack) {
-	data.scaned = true;
+export function createDetailInfo(balance, pack) {
+	balance.scaned = true;
 	// data.toInventoryStatus = this.toInventoryStatus == "" ? data.inventoryStatus : this.toInventoryStatus;
 	// data.inventoryStatus = data.inventoryStatus;
-	let detail = {};
-	Object.assign(detail, data)
-	detail.balanceQty = Number(detail.qty)
-	detail.qty = Number(detail.qty);
-	detail.stdPackQty = Number(pack.stdPackQty)
+	let detail = deepCopyData(balance);
+	detail.balanceQty = new Decimal(detail.qty).toNumber()
+	detail.qty = new Decimal(detail.qty).toNumber();
+	detail.stdPackQty = new Decimal(pack.stdPackQty).toNumber()
 	detail.stdPackUnit = pack.stdPackUnit
-	detail.handleQty =0;
+	detail.handleQty =  new Decimal(detail.qty).toNumber() ;
 	detail.package = pack;
 
 	return detail;
@@ -40,10 +43,10 @@ export function createDetailInfo(data, pack) {
 //计算实际数量
 export function calcHandleQty(detailSource) {
 	for (let item of detailSource) {
-		item.qty = 0;
+		item.handleQty = new Decimal(0).toNumber();
 		for (let detail of item.subList) {
 			if (detail != undefined && detail.scaned) {
-				item.qty = calc.add(item.qty,detail.qty);
+				item.handleQty = calc.add(item.handleQty,detail.handleQty);
 			}
 		}
 	}
diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue
index 7eb84b5d..12da2d8a 100644
--- a/mycomponents/item/itemQty.vue
+++ b/mycomponents/item/itemQty.vue
@@ -4,9 +4,9 @@
 			<item :dataContent="dataContent"></item>
 		</view>
 		<view>
-			<balance-qty v-if="showBalanceQty" :dataContent="dataContent"></balance-qty>
+			<balanceQty v-if="showItemQty" :dataContent="dataContent"></balanceQty>
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
-				:isShowRecommendQty='showRecommendQty' :handleQty="Number(handleQty)" :isShowStdPack="showStdPack" :isShowStatus="false">
+				:handleQty="dataContent.handleQty" :isShowStatus="false">
 			</compare-qty>
 		</view>
 		<!-- 	<view v-else>
@@ -18,6 +18,7 @@
 	</view>
 </template>
 <script>
+	
 	import item from '@/mycomponents/item/item.vue'
 	import balanceQty from '@/mycomponents/qty/balanceQty.vue'
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
@@ -43,19 +44,7 @@
 				type: Number,
 				default: 0
 			},
-			// showItemQty: {
-			// 	type: Boolean,
-			// 	default: true
-			// },
-			showBalanceQty: {
-				type: Boolean,
-				default: true
-			},
-			showRecommendQty: {
-				type: Boolean,
-				default: true
-			},
-			showStdPack: {
+			showItemQty: {
 				type: Boolean,
 				default: true
 			}
diff --git a/mycomponents/qty/balanceQtyEdit.vue b/mycomponents/qty/balanceQtyEdit.vue
index 632b1eb0..048afa71 100644
--- a/mycomponents/qty/balanceQtyEdit.vue
+++ b/mycomponents/qty/balanceQtyEdit.vue
@@ -77,7 +77,7 @@
 	import StdUom from '@/mycomponents/qty/StdUom.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-
+	
 	export default {
 		components: {
 			uom,
@@ -141,8 +141,9 @@
 			openEditPopup(item, handleQty) {
 				this.dataContent = item
 				this.inventoryStatus = this.dataContent.inventoryStatus
+				this.originalInventoryStatus =this.dataContent.inventoryStatus;
 				this.toInventoryStatus = this.dataContent.toInventoryStatus
-				this.allQty = Number(handleQty)
+				this.allQty = handleQty
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')
 				}, 500)
diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index c9a7c1e0..9631545a 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -88,7 +88,7 @@
 
 			isShowItemQty: {
 				type: Boolean,
-				default: true
+				default: false
 			},
 		},
 		watch: {
@@ -150,7 +150,7 @@
 
 			edit(item) {
 				this.editItem = item;
-				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.qty);
+				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.handleQty);
 			},
 
 			detail(item) {
diff --git a/mycomponents/scan/winScanItem.vue b/mycomponents/scan/winScanItem.vue
index 11f26ce8..65917059 100644
--- a/mycomponents/scan/winScanItem.vue
+++ b/mycomponents/scan/winScanItem.vue
@@ -13,7 +13,10 @@
 				</view>
 				<view class="">
 					<view class="">
-						<win-com-scan ref="scan" @getResult="getScanResult" :placeholder='title' :clearResult="false">
+						<win-com-scan ref="scan" @getResult="getScanResult"
+						 :placeholder='title'
+						  :clearResult="false"
+						  headerType="HMQ,HPQ">
 						</win-com-scan>
 					</view>
 				</view>
@@ -32,7 +35,7 @@
 		components: {
 			winComScan
 		},
-		emits: ["getScanCode"],
+		emits: ["getScanCode",'getScanResult'],
 		props: {
 			title: {
 				type: String,
diff --git a/mycomponents/scan/winScanPackAndPosition.vue b/mycomponents/scan/winScanPackAndPosition.vue
index 5c06e934..a33bc574 100644
--- a/mycomponents/scan/winScanPackAndPosition.vue
+++ b/mycomponents/scan/winScanPackAndPosition.vue
@@ -94,7 +94,6 @@
 		},
 		methods: {
 			openScanPopup() {
-
 				if (this.positionList.length == 0) {
 					uni.showLoading({
 						title: "数据加载中....",
@@ -111,6 +110,21 @@
 
 				this.$refs.popup.open('bottom');
 			},
+			
+			initData(){
+				this.positionInfo= "请选择位置";
+				this.positionList = [];
+				this.productionLineCode = '';
+				this.rawLocationCode = "";
+				this.fgLocationCode = "";
+				this.workshopCode = "";
+				this.workStationCode ="";
+				this.workShopName = "";
+				this.productionLineName="";
+				this.workStationName="";
+				this.show = false;
+				this.isEditPosition = true
+			},
 
 			closeScanPopup() {
 				this.$refs.popup.close();
diff --git a/mycomponents/status/balanceStatus.vue b/mycomponents/status/balanceStatus.vue
index 1cca06d4..786c4ff9 100644
--- a/mycomponents/status/balanceStatus.vue
+++ b/mycomponents/status/balanceStatus.vue
@@ -4,7 +4,7 @@
 		<text :class="statusStyle(status)" style='font-size: 38rpx;margin-right: 15rpx;'>
 			{{statusDesc(status) }}</text>
 			 <!-- v-show="allowEdit" -->
-		<image style="width: 40rpx; height:40rpx" src="/static/icons/icons_edit.svg" @click="open">
+		<image v-if="allowEdit" style="width: 40rpx; height:40rpx" src="/static/icons/icons_edit.svg" @click="open">
 		</image>
 	</view>
 	<status-edit :status='status' ref="statusEdit" @updateStatus="updateStatus"></status-edit>
diff --git a/pages/container/record/containerUnBindRecord.vue b/pages/container/record/containerUnBindRecord.vue
index cad024aa..881a7fe6 100644
--- a/pages/container/record/containerUnBindRecord.vue
+++ b/pages/container/record/containerUnBindRecord.vue
@@ -301,7 +301,7 @@
 							detail.itemCode = detail.itemCode;
 							detail.batch = detail.batch;
 							detail.inventoryStatus = detail.inventoryStatus;
-
+							detail.qty =detail.handleQty;
 							detail.package = null;
 							subList.push(detail)
 						}
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index bd732f71..38fd4f7b 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -106,7 +106,6 @@
 			return {
 				id: '',
 				receiptJob: {},
-				received: false,
 				fromLocationCode: '',
 				isShowPackingCode: true,
 				scanCount: 0,
@@ -117,7 +116,8 @@
 				editInventoryStatus: false,
 				package: {}, //包装
 				label: {}, //标签
-				currentEditItem: {}
+				currentEditItem: {},
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -126,7 +126,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -144,7 +143,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from === 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeCountJob(this.id).then(res => {
 						uni.navigateBack();
@@ -190,6 +189,7 @@
 						that.showMessage('未获取到详情');
 					} else {
 						that.jobContent = res.data;
+						that.jobStatus = res.data.status;
 						that.fromLocationCode = that.jobContent.locationCode;
 						that.subList = res.data.subList;
 						that.detailSource = that.getDataSource(that.subList)
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index 2c6f06c9..3b282218 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -82,7 +82,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -92,6 +91,7 @@
 				toLocationCode: "",
 				toLocationInfo: {},
 				tolocationTypeList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -100,7 +100,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -118,7 +117,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeCustomerReturnJob(this.id).then(res => {
 						uni.navigateBack();
@@ -167,8 +166,9 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
+							
 							that.detailSource = getDataSource(that.subList)
-
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue
index bfe6611a..aac1152a 100644
--- a/pages/customerReturn/record/returnRecord.vue
+++ b/pages/customerReturn/record/returnRecord.vue
@@ -149,8 +149,10 @@
 					}
 				})
 				if (item == undefined) {
+					
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
+					
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -316,7 +318,6 @@
 			},
 
 			setParams() {
-
 				var subList = []
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
@@ -346,7 +347,7 @@
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
 							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package ="";
 							subList.push(submitItem)
 							
diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue
index c91ed6dc..01f1c890 100644
--- a/pages/customerReturn/request/customerReturnRequestCreate.vue
+++ b/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -56,6 +56,7 @@
 </template>
 
 <script>
+	import { calc } from '@/common/calc'
 	import {
 		customerReturnRequestSubmit,
 		getBasicCustomerList
@@ -210,7 +211,7 @@
 				});
 			},
 			calcHandleQty() {
-				calcHandleQty(this.detailSource)
+				calcHandleQty(this.detailSource);
 				this.$forceUpdate();
 			},
 
diff --git a/pages/deliver/coms/comDeliverRequestPopup.vue b/pages/deliver/coms/comDeliverRequestPopup.vue
index f1d4db60..9aa7b43f 100644
--- a/pages/deliver/coms/comDeliverRequestPopup.vue
+++ b/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -42,10 +42,13 @@
 								<text>数量 : </text>
 								<view class="uni-flex uni-row uni-center"
 									style="align-items: center;margin-left: 20rpx;">
-									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
-										:focus="numberFocus" @blur='numberFocus = false'>
-									</uni-number-box>
+									<input style="text-align: center;" class="qty_input" v-model="qty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
 									<uom :uom="uom"></uom>
+									<!-- <view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view> -->
 					
 								</view>
 							</view>
@@ -109,7 +112,9 @@
 				isModifiedPosition: true,
 				customerList: [],
 				customerName: "请选择客户",
-				customerCode:""
+				customerCode:"",
+				maxlength:10,
+				stdPackInfo:undefined
 			}
 		},
 		props: {
@@ -119,6 +124,21 @@
 			},
 		},
 		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
 			openRequestPopup(editPosition) {
 				if (this.customerList.length == 0) {
 					getBasicCustomerList().then(res => {
@@ -142,6 +162,7 @@
 					this.itemCode = "";
 					this.uom = ""
 					this.qty = 0
+					this.counQty =0;
 					this.itemCodeGetFocus();
 				}
 
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index 4781ae03..3bd38488 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -104,8 +104,8 @@
 				detailOptions: [],
 				scanOptions: [],
 				status: "",
-				received: false,
-				toLocationCode: ""
+				toLocationCode: "",
+				jobStatus:""
 			};
 		},
 
@@ -119,7 +119,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -138,7 +137,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeDeliverJob(this.id).then(res => {
 						uni.navigateBack();
@@ -179,6 +178,8 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status;
+							
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
 							that.toLocationCode = that.subList[0].toLocationCode
diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue
index fa16f8c0..4fbe7262 100644
--- a/pages/deliver/record/deliverRecord.vue
+++ b/pages/deliver/record/deliverRecord.vue
@@ -172,9 +172,8 @@
 					}
 				})
 				if (item == undefined) {
-					var itemp = createItemInfo(balance.qty, pack);
+					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
-					if(labelQty)
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -380,7 +379,7 @@
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
 							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package ="";
 							
 							subList.push(submitItem)
diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue
index 53b517b8..896e6b7c 100644
--- a/pages/inspect/job/inspectFullDetail.vue
+++ b/pages/inspect/job/inspectFullDetail.vue
@@ -91,7 +91,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -100,6 +99,7 @@
 				fromInventoryStatuses: "",
 				managementList: [],
 				selectedItem: {},
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -108,7 +108,6 @@
 				// 	//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -127,7 +126,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeInspectJob(this.id).then(res => {
 						uni.navigateBack();
@@ -204,6 +203,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							this.jobContent.failedQty = 0;
 							this.jobContent.crackQty = 0;
 							this.jobContent.notPassedQty = 0;
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index 7469fd3e..6b2c3548 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -173,7 +173,6 @@
 				failedReasonArray: [],
 				nextStep: '',
 				submitting: false,
-				received: false,
 				locations: [],
 				value: ['0'],
 				jobContent: {}, //任务内容
@@ -181,6 +180,7 @@
 				detailSource: [], //绑定在页面上的数据源
 				nextActionList: [],
 				nextAction: null,
+				jobStatus:""
 
 			}
 		},
@@ -199,7 +199,6 @@
 				// 	//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -210,7 +209,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeInspectJob(this.id).then(res => {
 						uni.navigateBack();
@@ -257,6 +256,7 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.detailList = res.data.subList;
+							that.jobStatus = res.data.status
 							that.inspectType = that.jobContent.inspectType;
 							that.jobContent.goodQty = null, //合格数量
 								that.jobContent.failedQty = null, //不合格数量
diff --git a/pages/inventoryMove/coms/comMoveRecord.vue b/pages/inventoryMove/coms/comMoveRecord.vue
index d9681136..4a51ef04 100644
--- a/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/pages/inventoryMove/coms/comMoveRecord.vue
@@ -421,7 +421,7 @@
 							submitItem.package = null;
 							submitItem.Records = null;
 							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 
 							subList.push(submitItem)
 						}
diff --git a/pages/inventoryMove/coms/comMoveRecordCard.vue b/pages/inventoryMove/coms/comMoveRecordCard.vue
index c8545a41..33f75af0 100644
--- a/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -5,7 +5,8 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+							<item-qty :dataContent="dataContent" 
+								:showItemQty="false"
 								:isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue
index 56d94ad4..cffccecc 100644
--- a/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -92,7 +92,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -103,7 +102,8 @@
 				managementList: [],
 				businessTypeCode: '',
 				toLocationCode: '',
-				toInventoryStatus: ''
+				toInventoryStatus: '',
+				jobStatus:""
 			};
 		},
 		props: {
@@ -116,7 +116,6 @@
 				// 	//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -135,7 +134,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeInventoryMoveJob(this.id).then(res => {
 						uni.navigateBack();
@@ -223,6 +222,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 						} else {
diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index 7d6d3800..7d1d5cce 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -37,22 +37,19 @@
 								</view>
 							</view>
 							<u-line />
-
+							
 							<view class="uni-flex uni-row  padding title u-col-center">
 								<text>数量： </text>
 								<view class="uni-flex uni-row uni-center"
-									style="align-items: center;margin-left: 20rpx;">
-									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
-										:focus="numberFocus" @blur='numberFocus = false'>
-									</uni-number-box>
-
-									<view class="std_pack" v-if="itemCode!='请扫描物料信息'">
-										<text>
-											/{{stdQty}}
-											<!-- {{Number(dataContent.stdPackQty)}}•{{getStdPackUnit(dataContent.uom)}} -->
-										</text>
-									</view>
+									style="display: flex; align-items: center;margin-left: 20rpx;justify-content: center;">
+									
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
 									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
 								</view>
 							</view>
 							<u-line />
@@ -84,6 +81,7 @@
 		checkDirectoryItemExist
 	} from '@/common/directory.js';
 	import uom from '@/mycomponents/qty/uom.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
@@ -94,7 +92,8 @@
 			uom,
 			balanceStatus,
 			comMessage,
-			winScanItem
+			winScanItem,
+			stdPackQty
 		},
 		data() {
 			return {
@@ -114,7 +113,7 @@
 				requestInfo: null,
 				itemCodeList: [],
 				isCheckItemCode: false,
-				counQty: 0,
+				counQty: undefined,
 				editPosition: true,
 				numberFocus: false,
 				uom: "",
@@ -123,6 +122,8 @@
 				isModifiedPosition: true,
 				positionList: [],
 				stdQty: 0, //标包
+				maxlength:10,
+				stdPackInfo:undefined
 			}
 		},
 		props: {
@@ -132,6 +133,21 @@
 			},
 		},
 		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
 			openRequestPopup(editPosition) {
 				if (this.positionList.length == 0) {
 					getWorkShopLineStation().then(res => {
@@ -147,7 +163,9 @@
 				} else {
 					this.itemCode = "";
 					this.uom = ""
-					this.qty = 0
+					this.qty = 0;
+					this.counQty = undefined;
+					this.numberFocus = false
 					this.itemCodeGetFocus();
 				}
 
@@ -180,6 +198,11 @@
 					this.showErrorMessage("请输入物料", "itemCode")
 					return
 				}
+				if (this.counQty == undefined) {
+					this.showErrorMessage("请输入数量")
+					return
+				}
+				
 				if (this.qty == 0) {
 					this.showErrorMessage("数量必须大于0")
 					return
@@ -298,7 +321,7 @@
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
-				this.stdQty = scanResult.package.stdPackQty;
+				this.stdPackInfo = scanResult.package;
 			}
 		}
 	}
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index a03df905..b0b0c302 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -95,7 +95,7 @@
 				detailSource: [], //绑定在页面上的数据源
 				detailOptions: [],
 				scanOptions: [],
-				received:false
+				jobStatus:""
 			};
 		},
 
@@ -109,7 +109,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -128,7 +127,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from === 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeIssueJob(this.id).then(res => {
 						uni.navigateBack();
@@ -192,6 +191,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
 
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index dc916f1a..eb5268f7 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -109,6 +109,11 @@
 		},
 		mounted() {
 
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
 		},
 		onLoad(option) {
 			var typeCode = "Issue"
diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue
index 29d09175..4644a651 100644
--- a/pages/package/record/mergePackageRecord.vue
+++ b/pages/package/record/mergePackageRecord.vue
@@ -271,7 +271,7 @@
 
 							detail.fromInventoryStatus = detail.inventoryStatus;
 							detail.toInventoryStatus = detail.inventoryStatus;
-							detail.fromQty = detail.qty
+							detail.fromQty = detail.handleQty
 							detail.fromPackingNumber = detail.packingNumber;
 							detail.toPackingNumber = this.toPackingNumber;
 
diff --git a/pages/package/record/overPackageRecord.vue b/pages/package/record/overPackageRecord.vue
index 4dde0730..61f167f5 100644
--- a/pages/package/record/overPackageRecord.vue
+++ b/pages/package/record/overPackageRecord.vue
@@ -262,7 +262,7 @@
 							subItem.itemDesc2 = detail.package.itemDesc2;
 
 							subItem.fromInventoryStatus = detail.inventoryStatus;
-							subItem.fromQty = detail.qty
+							subItem.fromQty = detail.handleQty
 							subItem.fromPackingNumber = detail.packingNumber;
 							subItem.fromBatch = detail.batch;
 							subItem.fromLocationCode = detail.locationCode;
diff --git a/pages/productPutaway/coms/comProductRecord.vue b/pages/productPutaway/coms/comProductRecord.vue
deleted file mode 100644
index 463f779b..00000000
--- a/pages/productPutaway/coms/comProductRecord.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-	<view class="" style="background-color: #fff;">
-		<uni-collapse ref="collapse1" @change="">
-			<uni-collapse-item :open="true">
-				<template v-slot:title>
-					<uni-swipe-action ref="swipeAction">
-						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
-								:isShowBalance="true"></item-qty>
-						</uni-swipe-action-item>
-					</uni-swipe-action>
-
-				</template>
-				<u-line />
-				<view class="" v-for="(item,index) in dataContent.subList">
-					<uni-swipe-action ref="swipeAction">
-						<uni-swipe-action-item @click="swipeClick($event,item,index)"
-							:right-options="item.scaned?scanOptions:detailOptions">
-							<!-- 	<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true"
-								:isShowLocation="true"></balance> -->
-							<purchase-label :dataContent="item" :packageContent="item.package" :isShowStdPack="false">
-							</purchase-label>
-						</uni-swipe-action-item>
-					</uni-swipe-action>
-					<u-line color="#D8D8D8"></u-line>
-				</view>
-			</uni-collapse-item>
-		</uni-collapse>
-		<balanceQtyEdit ref="balanceQtyEdit" @confirm="confirm"></balanceQtyEdit>
-		<job-detail-popup ref="winHint" :dataContent="showItem"></job-detail-popup>
-		<com-message ref="comMessage"></com-message>
-	</view>
-</template>
-
-<script>
-	import itemQty from '@/mycomponents/item/itemQty.vue'
-	import recommend from '@/mycomponents/recommend/recommend.vue'
-	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
-	import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
-	import record from '@/mycomponents/record/record.vue'
-	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-	import {
-		getDetailOption,
-		getDetailEditRemoveOption,
-		getClearOption
-	} from '@/common/array.js';
-	export default {
-		components: {
-			itemQty,
-			recommend,
-			jobDetailPopup,
-			purchaseLabel,
-			balanceQtyEdit,
-			record,
-			comMessage
-		},
-		props: {
-			dataContent: {
-				type: Object,
-				default: {}
-			},
-			settingParam: {
-				type: Object,
-				default: {}
-			},
-			fromInventoryStatus: {
-				type: String,
-				default: ""
-			},
-			toInventoryStatus: {
-				type: String,
-				default: ""
-			},
-			isShowStatus: {
-				type: Boolean,
-				default: false
-			}
-		},
-		watch: {
-			dataContent: {
-				handler(newName, oldName) {
-					if (this.dataContent.subList.length > 0) {
-						if (this.$refs.collapse1 != undefined) {
-							this.$nextTick(res => {
-								this.$refs.collapse1.resize()
-							})
-						}
-					}
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-
-		data() {
-			return {
-				option: [],
-				title: "推荐详情",
-				showItem: {},
-				editItem: {},
-				detailOptions: [],
-				scanOptions: [],
-				removeOptions: [],
-				dataList: []
-			}
-		},
-
-		mounted() {
-			this.detailOptions = getDetailOption();
-			this.scanOptions = getDetailEditRemoveOption();
-			this.removeOptions = getClearOption();
-		},
-
-		methods: {
-			removeItem(e, dataContent) {
-				if (e.content.text == "清空") {
-					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
-						res => {
-							if (res) {
-								this.$emit('removeItem')
-								// this.$emit('removeItem', this.dataContent)
-							}
-						});
-				}
-			},
-			swipeClick(e, item, index) {
-				if (e.content.text == "详情") {
-					this.detail(item)
-				} else if (e.content.text == "编辑") {
-					this.edit(item)
-				} else if (e.content.text == "移除") {
-					this.remove(item, index)
-				}
-			},
-
-			edit(item) {
-				this.editItem = item;
-				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.qty);
-			},
-
-			remove(item, index) {
-				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
-					res => {
-						if (res) {
-							this.dataContent.subList.splice(index, 1)
-							this.$emit('updateData')
-						}
-					});
-			},
-			confirm(qty) {
-				this.editItem.qty = qty;
-				this.$emit('updateData')
-			},
-			detail(item) {
-				this.showItem = item;
-				this.dataList = [{
-						title: "箱码",
-						content: item.packingNumber
-					},
-					{
-						title: "批次",
-						content: item.batch
-					},
-					{
-						title: "库位",
-						content: item.locationCode
-					},
-					{
-						title: "数量",
-						content: item.qty
-					},
-					{
-						title: "单位",
-						content: item.uom
-					}
-				]
-				this.$refs.winHint.openScanPopup()
-			},
-			remove(item, index) {
-				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
-					res => {
-						if (res) {
-							this.dataContent.subList.splice(index, 1)
-							this.$emit('removePack')
-						}
-					});
-			},
-			confirm(qty) {
-				this.editItem.qty = qty;
-				this.$emit('updateData')
-			}
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index b91b5119..48c2a833 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -102,7 +102,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -112,6 +111,7 @@
 				toLocationCode: "",
 				toLocationInfo: {},
 				tolocationTypeList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -120,7 +120,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -138,7 +137,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeProductPutawayJob(this.id).then(res => {
 						uni.navigateBack();
@@ -183,6 +182,7 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue
index 644abbca..76f30d73 100644
--- a/pages/productPutaway/record/productPutawayRecord.vue
+++ b/pages/productPutaway/record/productPutawayRecord.vue
@@ -335,7 +335,7 @@
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
 							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package ="";
 							subList.push(submitItem)
 						}
diff --git a/pages/productPutaway/request/putawayRequestCreate.vue b/pages/productPutaway/request/putawayRequestCreate.vue
index 414b0561..bc89b7b2 100644
--- a/pages/productPutaway/request/putawayRequestCreate.vue
+++ b/pages/productPutaway/request/putawayRequestCreate.vue
@@ -53,6 +53,7 @@
 	import {
 		goHome,
 		updateTitle,
+		deepCopyData,
 		getCurrDateTime,
 		getPackingNumberAndBatchByList
 	} from '@/common/basic.js';
@@ -210,14 +211,7 @@
 			},
 
 			calcHandleQty() {
-				for (let item of this.detailSource) {
-					item.qty = 0;
-					for (let detail of item.subList) {
-						if (detail != undefined) {
-							item.qty = calc.add(item.qty,detail.qty)
-						}
-					}
-				}
+				calcHandleQty(this.detailSource)
 				this.$forceUpdate();
 			},
 
@@ -283,7 +277,7 @@
 				productPutawayRequestSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成制品上架申请<br>" + res.data, )
+						this.showCommitSuccessMessage("提交成功<br>生成制品上架申请<br>" + res.data)
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
@@ -305,8 +299,7 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							var subItem = {};
-							Object.assign(subItem, detail)
+							var subItem = deepCopyData(detail)
 							subItem.fromLocationCode = detail.locationCode;
 							subItem.qty = detail.handleQty;
 							subItem.package = null;
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index b4e75298..1d413251 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -97,7 +97,6 @@
 			return {
 				id: '',
 				receiptJob: {},
-				received: false,
 				toLocationCode: '',
 				isShowPackingCode: true,
 				scanCount: 0,
@@ -105,7 +104,8 @@
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				toLocationTypeList: [],
-				managementList: []
+				managementList: [],
+				jobStatus:""
 
 			};
 		},
@@ -115,7 +115,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -134,7 +133,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeProductReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -184,6 +183,7 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
+							that.jobStatus = res.data.status
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.subList)
diff --git a/pages/productReceipt/record/productReceiptRecord.vue b/pages/productReceipt/record/productReceiptRecord.vue
index f6495709..e1d9b0c2 100644
--- a/pages/productReceipt/record/productReceiptRecord.vue
+++ b/pages/productReceipt/record/productReceiptRecord.vue
@@ -64,6 +64,8 @@
 	import {
 		calc
 	} from '@/common/calc.js';
+	
+	import { Decimal } from 'decimal.js';//引入
 
 	import {
 		getInventoryStatusDesc,
@@ -186,8 +188,8 @@
 					itemName: pack.itemName,
 					stdPackQty: pack.stdPackQty,
 					stdPackUnit: pack.stdPackUnit,
-					qty: Number(label.qty),
-					handleQty: 0,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
 					uom: pack.uom,
 					subList: []
 				}
@@ -195,11 +197,10 @@
 			},
 
 			createDetailInfo(label, pack) {
-				let detail = {};
-				Object.assign(detail, label)
+				let detail = deepCopyData(label);
 				detail.scaned = true;
-				detail.qty = Number(label.qty);
-				detail.handleQty = 0;
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
 				detail.stdPackQty = pack.stdPackQty;
 				detail.stdPackUnit = pack.stdPackUnit;
@@ -211,10 +212,10 @@
 
 			calcHandleQty() {
 				for (let item of this.detailSource) {
-					item.qty = 0;
+					item.handleQty = new Decimal(0).toNumber();
 					for (let detail of item.subList) {
 						if (detail != undefined) {
-							item.qty = calc.add(item.qty,detail.qty)
+							item.handleQty = calc.add(item.handleQty,detail.handleQty)
 						}
 					}
 				}
@@ -331,7 +332,7 @@
 							submitItem.productionlineCode = this.productionLineCode;
 							submitItem.workStationCode = this.workStationCode;
 
-							submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
 
 							subList.push(submitItem)
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index 2c6bef2f..e724635b 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -100,7 +100,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -109,6 +108,7 @@
 				fromLocationCode: "",
 				toLocationCode: "",
 				tolocationTypeList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -117,7 +117,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -135,7 +134,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务
 					cancleTakeProductionReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -179,6 +178,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.toLocationCode = that.subList[0].toLocationCode
diff --git a/pages/productionReceipt/record/productionReceiptRecord.vue b/pages/productionReceipt/record/productionReceiptRecord.vue
index 6a51526b..593a1b6c 100644
--- a/pages/productionReceipt/record/productionReceiptRecord.vue
+++ b/pages/productionReceipt/record/productionReceiptRecord.vue
@@ -316,6 +316,7 @@
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					this.fromLocationCode = '';
+					this.toLocationCode =""
 
 				})
 			},
diff --git a/pages/productionReturn/coms/comReturnRecord.vue b/pages/productionReturn/coms/comReturnRecord.vue
index b201da49..0f8d156a 100644
--- a/pages/productionReturn/coms/comReturnRecord.vue
+++ b/pages/productionReturn/coms/comReturnRecord.vue
@@ -5,8 +5,7 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
-								:isShowBalance="true"></item-qty>
+							<item-qty :dataContent="dataContent" :showItemQty="false" :isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 
@@ -17,7 +16,7 @@
 						<uni-swipe-action-item @click="swipeClick($event,item,index)"
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<balance :dataContent="item" :isShowStdPack="false" :isShowStatus="true" :isShowPack="true"
-								:isShowFromLocation="true" :isShowToLocation="isShowToLocation"></balance>
+								:isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation"></balance>
 							<!-- <production-label :dataContent="item" :packageContent="item.package"
 								:isShowLocation="false">
 							</production-label> -->
@@ -86,6 +85,10 @@
 			isShowToLocation: {
 				type: Boolean,
 				default: true
+			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
 			}
 		},
 		watch: {
@@ -147,7 +150,7 @@
 
 			edit(item) {
 				this.editItem = item;
-				this.$refs.recommendQtyEdit.openRecordEditPopup(item.qty);
+				this.$refs.recommendQtyEdit.openRecordEditPopup(item.handleQty);
 				// this.$refs.recommendQtyEdit.openEditPopup(item.qty);
 			},
 
@@ -165,7 +168,7 @@
 					});
 			},
 			confirm(qty) {
-				this.editItem.qty = qty;
+				this.editItem.handleQty = qty;
 				this.$emit('updateData')
 			}
 		}
diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
index b5f64d18..344432cd 100644
--- a/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -28,7 +28,7 @@
 
 
 							<view class="title padding" style="display: flex;">
-								<text style=" flex-shrink: 0;">箱码：</text>
+								<text style=" flex-shrink: 0;">物料：</text>
 								<view class="" style="width: 100% ;">
 									{{itemCode}}
 								</view>
@@ -46,10 +46,13 @@
 								<text>数量 : </text>
 								<view class="uni-flex uni-row uni-center"
 									style="align-items: center;margin-left: 20rpx;">
-									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
-										:focus="numberFocus" @blur='numberFocus = false'>
-									</uni-number-box>
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
 									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
 
 								</view>
 							</view>
@@ -63,7 +66,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
 		</win-scan-item>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -82,6 +85,7 @@
 		checkDirectoryItemExist
 	} from '@/common/directory.js';
 	import uom from '@/mycomponents/qty/uom.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
@@ -90,6 +94,7 @@
 	export default {
 		components: {
 			uom,
+			stdPackQty,
 			balanceStatus,
 			comMessage,
 			winScanItem
@@ -120,6 +125,8 @@
 				show: false,
 				isModifiedPosition: true,
 				positionList: [],
+				maxlength:10,
+				stdPackInfo:undefined,
 				list: [{
 						value: 1,
 						label: '车间1',
@@ -193,6 +200,21 @@
 			},
 		},
 		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
 			openRequestPopup(editPosition) {
 				if (this.positionList.length == 0) {
 					getWorkShopLineStation().then(res => {
@@ -352,13 +374,14 @@
 				}
 			},
 
-			getScanCode(code) {
+			getScanCode(code, scanResult) {
 				if (code == "") {
 					this.showErrorMessage('物料号不能为空')
 					return;
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
+				this.stdPackInfo = scanResult.package;
 			},
 
 		}
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 2233601c..5542c093 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -104,7 +104,6 @@
 			return {
 				id: '',
 				jobContent: {},
-				received: false,
 				toLocationCode: '',
 				scanCount: 0,
 				jobContent: {}, //任务内容
@@ -115,7 +114,8 @@
 				toLocationTypeList: [],
 				toLocationInfo: {},
 				businessTypeInfo: {},
-				titleInfo: ""
+				titleInfo: "",
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -124,7 +124,6 @@
 				// //新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -142,7 +141,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务
 					cancleTakeProductionReturnJob(this.id).then(res => {
 						uni.navigateBack();
@@ -190,6 +189,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 
diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue
index e92aff05..838656d2 100644
--- a/pages/productionReturn/record/returnToHold.vue
+++ b/pages/productionReturn/record/returnToHold.vue
@@ -62,11 +62,15 @@
 		getPackingNumberAndBatchByList,
 		deepCopyData
 	} from '@/common/basic.js';
-	
+
 	import {
 		calc
 	} from '@/common/calc.js';
 
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
+
 	import {
 		getDirectoryItemArray
 	} from '@/common/directory.js';
@@ -168,7 +172,7 @@
 				this.$refs.scanPopup.openScanPopup(isEditPosition);
 			},
 
-		async	getScanResult(result, param) {
+			async getScanResult(result, param) {
 				this.positionInfo = param.positionInfo;
 				this.workshopCode = param.workshopCode;
 				this.productionLineCode = param.productionLineCode;
@@ -186,30 +190,30 @@
 
 				if (item == undefined) {
 					var filters = []
-						filters.push({
-							column: "itemCode",
-							action: "==",
-							value: label.itemCode
-						})
-						filters.push({
-							column: "locationCode",
-							action: "==",
-							value: this.rawLocationCode
-						})
-									
-						var params = {
-							filters: filters,
-							pageNo: 1,
-							pageSize: 100,
-						}
-					 var isCheckItemCode =	await getBalanceByFilter(params);
-					if(isCheckItemCode.data==null||isCheckItemCode.data.list==0){
+					filters.push({
+						column: "itemCode",
+						action: "==",
+						value: label.itemCode
+					})
+					filters.push({
+						column: "locationCode",
+						action: "==",
+						value: this.rawLocationCode
+					})
+
+					var params = {
+						filters: filters,
+						pageNo: 1,
+						pageSize: 100,
+					}
+					var isCheckItemCode = await getBalanceByFilter(params);
+					if (isCheckItemCode.data == null || isCheckItemCode.data.list == 0) {
 						this.showErrorMessage("未查询到物料号[" + label.itemCode + "]" +
-						"库位[" + this.rawLocationCode + "]的信息")
-						return 
+							"库位[" + this.rawLocationCode + "]的信息")
+						return
 					}
-					
-					
+
+
 					var itemp = this.createItemInfo(label, pack);
 					let newDetail = this.createDetailInfo(label, pack);
 					newDetail.toLocationCode = "HOLD";
@@ -247,8 +251,8 @@
 					itemName: pack.itemName,
 					stdPackQty: pack.stdPackQty,
 					stdPackUnit: pack.stdPackUnit,
-					qty: Number(label.qty),
-					handleQty: 0,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
 					uom: pack.uom,
 					subList: []
 				}
@@ -256,11 +260,10 @@
 			},
 
 			createDetailInfo(label, pack) {
-				let detail = {};
-				Object.assign(detail, label)
+				let detail = deepCopyData(label);
 				detail.scaned = true;
-				detail.qty = Number(label.qty);
-				detail.handleQty = 0;
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
 				detail.stdPackQty = pack.stdPackQty;
 				detail.stdPackUnit = pack.stdPackUnit;
@@ -273,10 +276,10 @@
 
 			calcHandleQty() {
 				for (let item of this.detailSource) {
-					item.qty = 0;
+					item.handleQty = new Decimal(0).toNumber();
 					for (let detail of item.subList) {
 						if (detail != undefined) {
-							item.qty = calc.add(item.qty,detail.qty)
+							item.handleQty = calc.add(item.handleQty, detail.handleQty)
 						}
 					}
 				}
@@ -361,7 +364,7 @@
 				}
 
 			},
-			
+
 			setFromPrecisionStrategParams() {
 				var itemList = []
 				this.detailSource.forEach(item => {
@@ -381,13 +384,13 @@
 								}
 								itemList.push(result)
 							}
-			
+
 						}
 					})
 				})
 				return itemList;
 			},
-			
+
 			setToPrecisionStrategParams() {
 				var itemList = []
 				this.detailSource.forEach(item => {
@@ -407,7 +410,7 @@
 								}
 								itemList.push(result)
 							}
-			
+
 						}
 					})
 				})
@@ -421,35 +424,37 @@
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var submitItem = deepCopyData(detail)
-							var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
+							var fromInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail
+								.itemCode,
 								detail.packingNumber, detail.fromLocationCode, detail.batch);
-							var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail.itemCode,
+							var toInfo = getPackingNumberAndBatchByList(this.fromManagementList, detail
+								.itemCode,
 								detail.packingNumber, detail.toLocationCode, detail.batch);
-							
+
 							submitItem.itemCode = detail.itemCode;
 							submitItem.itemName = detail.package.itemName;
 							submitItem.itemDesc1 = detail.package.itemDesc1;
 							submitItem.itemDesc2 = detail.package.itemDesc2;
-							
+
 							submitItem.inventoryStatus = detail.inventoryStatus;
-							
+
 							submitItem.fromPackingNumber = fromInfo.packingNumber;
 							submitItem.toPackingNumber = toInfo.packingNumber;
-							
+
 							submitItem.fromContainerNumber = detail.containerNumber;
 							submitItem.toContainerNumber = detail.containerNumber
-							
+
 							submitItem.fromBatch = fromInfo.batch;
 							submitItem.toBatch = toInfo.batch;
-							
+
 							submitItem.fromLocationCode = detail.fromLocationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
-							
+
 							submitItem.productionlineCode = this.productionLineCode;
 							submitItem.workStationCode = this.workStationCode;
-							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
-							
+
+							submitItem.qty = detail.handleQty;
+
 							subList.push(submitItem)
 						}
 					})
diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue
index 98672fb1..70a0c112 100644
--- a/pages/productionReturn/record/returnToStore.vue
+++ b/pages/productionReturn/record/returnToStore.vue
@@ -15,6 +15,7 @@
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								:isShowFromLocation="true"
 								@updateData="updateData" @removePack="removePack">
 							</comReturnRecord>
 						</view>
@@ -61,6 +62,8 @@
 	import {
 		calc
 	} from '@/common/calc.js';
+	
+	import { Decimal } from 'decimal.js';//引入
 
 	import {
 		getBusinessType,
@@ -212,9 +215,11 @@
 						let newDetail = this.createDetailInfo(label, pack);
 						newDetail.toLocationCode = toLocation.code;
 						newDetail.fromLocationCode = this.rawLocationCode;
+						newDetail.locationCode = this.rawLocationCode;
 						newDetail.toWarehouseCode = toLocation.warehouseCode;
 						itemp.subList.push(newDetail);
 						this.detailSource.push(itemp)
+						this.calcHandleQty();
 					})
 
 				} else {
@@ -232,6 +237,7 @@
 							newDetail.fromLocationCode = this.rawLocationCode;
 							newDetail.toWarehouseCode = toLocation.warehouseCode;
 							item.subList.push(newDetail);
+							this.calcHandleQty();
 						});
 
 					} else {
@@ -240,7 +246,6 @@
 						}
 					}
 				}
-				this.calcHandleQty();
 			},
 			createItemInfo(label, pack) {
 				let item = {
@@ -248,8 +253,8 @@
 					itemName: pack.itemName,
 					stdPackQty: pack.stdPackQty,
 					stdPackUnit: pack.stdPackUnit,
-					qty: Number(label.qty),
-					handleQty: 0,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
 					uom: pack.uom,
 					subList: []
 				}
@@ -257,11 +262,10 @@
 			},
 
 			createDetailInfo(label, pack) {
-				let detail = {};
-				Object.assign(detail, label)
+				let detail = deepCopyData(label);
 				detail.scaned = true;
-				detail.qty = Number(label.qty);
-				detail.handleQty =0;
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
 				detail.stdPackQty = pack.stdPackQty;
 				detail.stdPackUnit = pack.stdPackUnit;
@@ -274,10 +278,10 @@
 
 			calcHandleQty() {
 				for (let item of this.detailSource) {
-					item.qty = 0;
+					item.handleQty = new Decimal(0).toNumber();
 					for (let detail of item.subList) {
 						if (detail != undefined) {
-							item.qty = calc.add(item.qty,detail.qty)
+							item.handleQty = calc.add(item.handleQty,detail.handleQty)
 						}
 					}
 				}
@@ -293,6 +297,8 @@
 					var item = this.detailSource[i];
 					if (item.subList.length == 0) {
 						this.detailSource.splice(i, 1)
+						this.clearData();
+						this.$refs.scanPopup.initData();
 					}
 				}
 				this.updateData();
@@ -387,7 +393,6 @@
 					this.showErrorMessage("没有要提交的数据,请先扫描")
 				}
 
-
 			},
 
 			setFromPrecisionStrategParams() {
@@ -477,7 +482,7 @@
 							submitItem.productionlineCode = this.productionLineCode;
 							submitItem.workStationCode = this.workStationCode;
 							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							subList.push(submitItem)
 						}
 					})
@@ -530,6 +535,7 @@
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					this.clearData();
+					this.$refs.scanPopup.initData();
 				})
 			},
 			clearData() {
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index abb8f91c..15acf5c7 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -95,7 +95,6 @@
 			return {
 				id: '',
 				receiptJob: {},
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -104,7 +103,8 @@
 				toLocationCode: '',
 				toLocationInfo: {},
 				businessTypeInfo: {},
-				managementList: []
+				managementList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -113,7 +113,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -131,7 +130,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakePurchaseReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -187,7 +186,8 @@
 							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
 							// that.jobContent.toLocationTypeList = that.toLocationTypeList;
 							that.subList = res.data.subList;
-							this.toLocationCode = that.subList[0].toLocationCode
+							that.jobStatus = res.data.status
+							that.toLocationCode = that.subList[0].toLocationCode
 							that.detailSource = getDataSource(that.subList)
 						} else {
 							that.showMessage('列表数据为0');
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index dd2b8ca1..fbf9651b 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -90,13 +90,13 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				businessTypeInfo: {},
-				managementList: []
+				managementList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -105,7 +105,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -123,7 +122,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakePurchasereturnJob(this.id).then(res => {
 						uni.navigateBack();
@@ -179,6 +178,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.toLocationCode = that.jobContent.toLocationCode
 							that.detailSource = getDataSource(that.subList);
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 96d41864..68f60fce 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -241,7 +241,6 @@
 				});
 
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
-					console.log("提交参数", JSON.stringify(params));
 					//直接创建申请
 
 					//直接创建记录
@@ -254,7 +253,7 @@
 						if (res.data) {
 							this.showCommitSuccessMessage("提交成功<br>生成采购退货记录<br>" + res.data)
 						} else {
-							this.showErrorMessage("提交失败" + res.msg)
+							this.showErrorMessage("提交失败[" + res.msg+"]")
 						}
 					}).catch(error => {
 						uni.hideLoading()
@@ -290,7 +289,7 @@
 							submitItem.fromLocationCode = this.fromLocationCode;
 							submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空
 							
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
 							subList.push(submitItem)
 						}
diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue
index 11f8fde1..3bc74428 100644
--- a/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -45,6 +45,7 @@
 		goHome,
 		updateTitle,
 		navigateBack,
+		deepCopyData,
 		getCurrDateOneMonthsTimes
 	} from '@/common/basic.js';
 
@@ -209,7 +210,6 @@
 
 			commit() {
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
-					console.log("提交参数", JSON.stringify(params));
 						uni.showLoading({
 							title: "提交中....",
 							mask: true
@@ -240,11 +240,13 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
+							var submitItem = deepCopyData(detail)
 							if(supplierCode==""){
 								supplierCode = detail.package.supplierCode
 							}
-							detail.fromLocationCode = detail.locationCode
-							subList.push(detail)
+							submitItem.fromLocationCode = detail.locationCode
+							submitItem.qty =detail.handleQty;
+							subList.push(submitItem)
 						}
 					})
 				})
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 86b9e627..94086972 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -97,7 +97,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -106,6 +105,7 @@
 				fromLocationCode: "",
 				toLocationCode: "",
 				tolocationTypeList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -114,7 +114,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -132,7 +131,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务
 					cancleTakePutawayJob(this.id).then(res => {
 						uni.navigateBack();
@@ -180,6 +179,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 78ccda98..3f50079f 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -386,7 +386,7 @@
 
 							// detail.toInventoryStatus = detail.inventoryStatus
 							// detail.toLocationCode = detail.toLocationCode
-							submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+							submitItem.qty = detail.handleQty ;
 							submitItem.package = "";
 							subList.push(submitItem)
 						}
diff --git a/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
index aa1ca50d..2585a16f 100644
--- a/pages/repleinsh/coms/comRepleinshRequestPopup.vue
+++ b/pages/repleinsh/coms/comRepleinshRequestPopup.vue
@@ -44,10 +44,14 @@
 								<text>数量： </text>
 								<view class="uni-flex uni-row uni-center"
 									style="align-items: center;margin-left: 20rpx;">
-									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
-										:focus="numberFocus" @blur='numberFocus = false'>
-									</uni-number-box>
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
 									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
+									
 								</view>
 							</view>
 							<u-line />
@@ -60,7 +64,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="scanPopup" title='物料代码' @getScanCode='getScanCode'>
+		<win-scan-item ref="scanPopup" title='物料代码' @getScanResult='getScanCode'>
 		</win-scan-item>
 
 		<win-scan-location ref="scanLocationPopup" title='目标库位' @getLocation='getLocationCode'
@@ -89,14 +93,17 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
 	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
 
 	export default {
 		components: {
 			uom,
+			stdPackQty,
 			balanceStatus,
 			comMessage,
 			winScanItem,
 			winScanLocation
+			
 		},
 		data() {
 			return {
@@ -117,6 +124,8 @@
 				show: false,
 				isModifiedPosition: true,
 				positionList: [],
+				maxlength:10,
+				stdPackInfo:undefined
 			}
 		},
 		props: {
@@ -133,6 +142,21 @@
 
 		},
 		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
 			openRequestPopup(editPosition) {
 				// this.editPosition = editPosition;
 				// if (this.isModifiedPosition) {
@@ -237,13 +261,14 @@
 				this.closeRequestPopup();
 			},
 
-			getScanCode(code) {
+			getScanCode(code, scanResult) {
 				if (code == "") {
 					this.showErrorMessage('物料号不能为空')
 					return;
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
+				this.stdPackInfo = scanResult.package;
 			},
 
 			getLocationCode(location, code) {
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index d87aaee3..10d7b1ea 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -100,7 +100,7 @@
 				scanOptions: [],
 				toLocationCode: '',
 				tolocationTypeList: [],
-				received:false,
+				jobStatus:""
 			};
 		},
 
@@ -114,7 +114,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -133,7 +132,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from === 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeRepleinshJob(this.id).then(res => {
 						uni.navigateBack();
@@ -183,6 +182,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
index f2b87b99..5db4e85a 100644
--- a/pages/repleinsh/record/repleinshRecord.vue
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -72,8 +72,6 @@
 
 	import {
 		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
 		calcHandleQty
 	} from '@/common/record.js';
 
diff --git a/pages/scrap/job/scrapJobDetail.vue b/pages/scrap/job/scrapJobDetail.vue
index bedb7caf..f7d26be5 100644
--- a/pages/scrap/job/scrapJobDetail.vue
+++ b/pages/scrap/job/scrapJobDetail.vue
@@ -86,14 +86,14 @@
 			return {
 				id: '',
 				receiptJob: {},
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				toLocationInfo: {},
 				businessTypeInfo: {},
-				managementList: []
+				managementList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -102,7 +102,6 @@
 				//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -120,7 +119,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeScrapJob(this.id).then(res => {
 						uni.navigateBack();
@@ -173,6 +172,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 						} else {
diff --git a/pages/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue
index 827a5728..70b0ffb0 100644
--- a/pages/scrap/record/scrapRecord.vue
+++ b/pages/scrap/record/scrapRecord.vue
@@ -18,7 +18,7 @@
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
-								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								:isShowFromLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
 								:isShowToLocation="false"
 								@removePack="removePack">
 							</record-com-detail-card>
@@ -176,20 +176,6 @@
 
 			},
 
-			createItemInfo(balance, pack) {
-				let item = {
-					itemCode: balance.itemCode,
-					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
-					stdPackUnit: pack.stdPackUnit,
-					qty: Number(balance.qty),
-					handleQty: 0,
-					uom: pack.uom,
-					subList: []
-				}
-				return item;
-			},
-
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
@@ -297,7 +283,7 @@
 							submitItem.toLocationCode = "";
 							
 							submitItem.reason = this.reasonCode;
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package ="";
 							subList.push(submitItem)
 						}
diff --git a/pages/scrap/request/scrapRequestCreate.vue b/pages/scrap/request/scrapRequestCreate.vue
index 8d55339b..0192e97f 100644
--- a/pages/scrap/request/scrapRequestCreate.vue
+++ b/pages/scrap/request/scrapRequestCreate.vue
@@ -17,7 +17,9 @@
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
-								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								:isShowFromLocation="true"
+								:isShowToLocation="false"
+								 @removeItem="removeItem(index,item)" @updateData="updateData"
 								@removePack="removePack">
 							</record-com-detail-card>
 						</view>
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
index bd19fe7c..53d1f954 100644
--- a/pages/transfer/job/issueDetail.vue
+++ b/pages/transfer/job/issueDetail.vue
@@ -92,7 +92,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -100,7 +99,8 @@
 				toLocationCode: "",
 				businessTypeInfo: {},
 				managementList: [],
-				tolocationTypeList:[]
+				tolocationTypeList:[],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -109,7 +109,6 @@
 				// 	//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -127,7 +126,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeTransferIssueJob(this.id).then(res => {
 						uni.navigateBack();
@@ -182,6 +181,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList =res.data.subList
 							that.detailSource = getDataSource(that.subList)
 							that.fromLocationCode = that.subList[0].fromLocationCode
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
index c137c692..ce6ac0d1 100644
--- a/pages/transfer/job/receiptDetail.vue
+++ b/pages/transfer/job/receiptDetail.vue
@@ -101,7 +101,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -109,7 +108,8 @@
 				toLocationCode: "",
 				businessTypeInfo: {},
 				managementList: [],
-				toLocationTypeList: []
+				toLocationTypeList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -118,7 +118,6 @@
 				// 	//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -136,7 +135,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeTransferReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -192,6 +191,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 							that.fromLocationCode = that.subList[0].fromLocationCode
diff --git a/pages/transfer/record/deliverRecord.vue b/pages/transfer/record/deliverRecord.vue
index 910d99ce..8baebdd1 100644
--- a/pages/transfer/record/deliverRecord.vue
+++ b/pages/transfer/record/deliverRecord.vue
@@ -334,7 +334,7 @@
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
 
-							submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
 
 							subList.push(submitItem)
diff --git a/pages/transfer/record/receiptRecord.vue b/pages/transfer/record/receiptRecord.vue
index ddd98c2d..601d7952 100644
--- a/pages/transfer/record/receiptRecord.vue
+++ b/pages/transfer/record/receiptRecord.vue
@@ -316,7 +316,7 @@
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
 
-							submitItem.qty = detail.handleQty != 0 ? detail.handleQty : detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
 
 							subList.push(submitItem)
diff --git a/pages/unPlanned/coms/comReceiptRecord.vue b/pages/unPlanned/coms/comReceiptRecord.vue
index fba51210..0397b8c2 100644
--- a/pages/unPlanned/coms/comReceiptRecord.vue
+++ b/pages/unPlanned/coms/comReceiptRecord.vue
@@ -5,7 +5,7 @@
 				<template v-slot:title>
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="removeData($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+							<item-qty :dataContent="dataContent" :showItemQty="false"
 								:isShowBalance="true"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
@@ -16,9 +16,8 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item,index)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<purchase-label :dataContent="item.label" :packageContent="item.package"
-								:isShowLocation="false">
-							</purchase-label>
+							<balance :dataContent="item" :isShowStdPack="false" :isShowStatus="true" :isShowPack="true"
+								:isShowFromLocation="false" :isShowToLocation="false"></balance>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<!-- <u-line color="#D8D8D8"></u-line> -->
@@ -147,7 +146,7 @@
 
 			edit(item) {
 				this.editItem = item;
-				this.$refs.qtyEdit.openRecordEditPopup(item.label.qty);
+				this.$refs.qtyEdit.openRecordEditPopup(item.handleQty);
 			},
 
 			detail(packageInfo) {
@@ -164,7 +163,7 @@
 					});
 			},
 			confirm(qty) {
-				this.editItem.qty = qty;
+				this.editItem.handleQty = qty;
 				this.$emit('updateData')
 			}
 		}
diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue
index aee41088..d523a4de 100644
--- a/pages/unPlanned/coms/comReceiptRequestPopup.vue
+++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -48,10 +48,13 @@
 								<text>数量 : </text>
 								<view class="uni-flex uni-row uni-center"
 									style="align-items: center;margin-left: 20rpx;">
-									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
-										:focus="numberFocus" @blur='numberFocus = false'>
-									</uni-number-box>
+									<input style="text-align: center;" class="qty_input" v-model="counQty" type="number"
+										@confirm="confirm()" :focus="numberFocus"  @input="checkNum" :maxlength="maxlength" />
+									
 									<uom :uom="uom"></uom>
+									<view class="" v-if="stdPackInfo!=undefined" style="display: flex;flex-direction: row;margin-left: 10rpx;">
+										(<stdPackQty :dataContent="stdPackInfo"></stdPackQty>)
+									</view>
 
 								</view>
 							</view>
@@ -65,7 +68,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<win-scan-item ref="itemPopup" title='物料代码' @getScanCode='getItemCode'>
+		<win-scan-item ref="itemPopup" title='物料代码' @getScanResult='getItemCode'>
 		</win-scan-item>
 		<winScanLocation ref="locationPopup" title="库位代码" @getLocation='getLocationCode'></winScanLocation>
 		<comMessage ref="comMessage"></comMessage>
@@ -82,6 +85,7 @@
 		checkDirectoryItemExist
 	} from '@/common/directory.js';
 	import uom from '@/mycomponents/qty/uom.vue'
+	import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
 	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
@@ -90,6 +94,7 @@
 	export default {
 		components: {
 			uom,
+			stdPackQty,
 			balanceStatus,
 			comMessage,
 			winScanItem,
@@ -112,6 +117,8 @@
 				toLocationCode: '请扫描库位信息',
 				isCheckLocationCode: false,
 				editPosition: true,
+				maxlength:10,
+				stdPackInfo:undefined
 			}
 		},
 		props: {
@@ -121,12 +128,28 @@
 			},
 		},
 		methods: {
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //包含小数点
+				let reg = /^[0-9]+$/; //正整数
+				if (dot > -1) {
+					this.maxlength = dot + 7; //长度是小数点后两位
+					if (value.length > dot + 7) {
+			
+					}
+				}
+				if (reg.test(value)) { //如果是正整数不包含小数点
+					this.maxlength = 10;
+				}
+				this.change(value)
+			},
 			openRequestPopup(editPosition) {
 				this.editPosition = editPosition;
 				if (!editPosition) {
 					this.itemCode = "";
 					this.uom = ""
 					this.qty = 0
+					this.count = 0;
 					this.itemCodeGetFocus();
 				}
 				this.$refs.popup.open('bottom')
@@ -231,13 +254,14 @@
 				this.closeRequestPopup();
 			},
 
-			getItemCode(code) {
+			getItemCode(code, scanResult) {
 				if (code == "") {
 					this.showErrorMessage('物料号不能为空')
 					return;
 				}
 				this.itemCode = "";
 				this.checkItemCode(code)
+				this.stdPackInfo = scanResult.package;
 			},
 			getLocationCode(location, code) {
 				this.toLocationCode = code;
diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue
index 1dd2c7a7..5e58f74e 100644
--- a/pages/unPlanned/job/issueJobDetail.vue
+++ b/pages/unPlanned/job/issueJobDetail.vue
@@ -87,13 +87,13 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				businessTypeInfo: {},
-				managementList: []
+				managementList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -102,7 +102,6 @@
 				// 	//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -120,7 +119,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeUnPlannedIssueJob(this.id).then(res => {
 						uni.navigateBack();
@@ -167,6 +166,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 						} else {
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index a6ef8a8f..91d5c1f4 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -88,7 +88,6 @@
 		data() {
 			return {
 				id: '',
-				received: false,
 				scanCount: 0,
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
@@ -97,7 +96,8 @@
 				toLocationCode: '',
 				toLocationInfo: {},
 				businessTypeInfo: {},
-				managementList: []
+				managementList: [],
+				jobStatus:""
 			};
 		},
 		onLoad(option) {
@@ -106,7 +106,6 @@
 				// 	//新建的任务自动接收
 				if (option.status == "1") {
 					this.receive((callback => {
-						this.received = true;
 						this.getDetail();
 					}));
 				} else {
@@ -124,7 +123,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.received) {
+				if (this.jobStatus=="2") {
 					//取消承接任务	
 					cancleTakeUnPlannedReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -167,6 +166,7 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
+							that.jobStatus = res.data.status
 							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
 							that.subList = res.data.subList;
 							this.toLocationCode = that.subList[0].toLocationCode
diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue
index a662bbfa..374f4611 100644
--- a/pages/unPlanned/record/issueRecord.vue
+++ b/pages/unPlanned/record/issueRecord.vue
@@ -255,7 +255,7 @@
 							submitItem.toLocationCode = "";
 							
 							submitItem.reason = this.reasonCode;
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
+							submitItem.qty = detail.handleQty;
 							submitItem.package ="";
 							
 							subList.push(submitItem)
diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue
index ee901736..09e57294 100644
--- a/pages/unPlanned/record/receiptRecord.vue
+++ b/pages/unPlanned/record/receiptRecord.vue
@@ -22,12 +22,12 @@
 					</view>
 				</scroll-view>
 			</view>
-			
+
 			<view class="page-footer">
 				<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'
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
 							:locationTypeList="tolocationTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
@@ -37,7 +37,7 @@
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'箱码'"  headerType="HPQ,HMQ"></win-scan-pack>
+		<win-scan-pack ref="scanPopup" @getResult='getScanResult' :title="'箱码'" headerType="HPQ,HMQ"></win-scan-pack>
 		<com-message ref="comMessage"></com-message>
 	</view>
 </template>
@@ -55,7 +55,7 @@
 	import {
 		unPlannedReceiptRecordbSubmit
 	} from '@/api/request2.js';
-	
+
 	import {
 		getDirectoryItemArray,
 		getUnPlannedReceiptReasonList
@@ -64,17 +64,19 @@
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
-	
+
 	import {
-			calc
-		} from '@/common/calc.js';
+		calc
+	} from '@/common/calc.js';
+	
+	import { Decimal } from 'decimal.js';//引入
 	import {
 		goHome,
 		updateTitle,
 		deepCopyData,
 		getPackingNumberAndBatchByList
 	} from '@/common/basic.js';
-	
+
 	import {
 		getPrecisionStrategyList
 	} from '@/common/balance.js';
@@ -102,10 +104,10 @@
 				detailSource: [], //绑定在页面上的数据源
 				businessTypeCode: "UnplannedReceipt",
 				reasonText: "",
-				reasonCode:"",
+				reasonCode: "",
 				reasonList: [],
-				dataContent:{},
-				managementList:[]
+				dataContent: {},
+				managementList: []
 			}
 		},
 
@@ -123,8 +125,7 @@
 			});
 		},
 
-		onLoad(option) {
-		},
+		onLoad(option) {},
 
 		methods: {
 			openScanPopup() {
@@ -174,8 +175,8 @@
 					itemName: pack.itemName,
 					stdPackQty: pack.stdPackQty,
 					stdPackUnit: pack.stdPackUnit,
-					qty: label.qty,
-					handleQty: 0,
+					qty: new Decimal(label.qty).toNumber(),
+					handleQty: new Decimal(0).toNumber(),
 					uom: label.uom,
 					subList: []
 				}
@@ -183,11 +184,11 @@
 			},
 
 			createDetailInfo(label, pack) {
-				let detail = {};
+				let detail = deepCopyData(label);
 				detail.scaned = true;
 				// Object.assign(detail, label)
-				detail.qty = Number(label.qty)
-				detail.handleQty = 0,
+				detail.qty = new Decimal(label.qty).toNumber();
+				detail.handleQty = new Decimal(label.qty).toNumber();
 				detail.inventoryStatus = "OK"
 				detail.stdPackQty = pack.stdPackQty;
 				detail.stdPackUnit = pack.stdPackUnit;
@@ -200,10 +201,10 @@
 
 			calcHandleQty() {
 				for (let item of this.detailSource) {
-					item.qty = 0;
+					item.handleQty = new Decimal(0).toNumber();
 					for (let detail of item.subList) {
 						if (detail != undefined) {
-							item.qty = calc.add(item.qty,detail.qty)
+							item.handleQty = calc.add(item.handleQty, detail.handleQty)
 						}
 					}
 				}
@@ -242,44 +243,44 @@
 					this.showErrorMessage("请选择入库原因")
 					return;
 				}
-				
-				
+
+
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
-						//查询管理模式
-						uni.showLoading({
-							title: "提交中....",
-							mask: true
-						});
-						this.managementList = [];
-						var precisionStrategParams = this.setPrecisionStrategParams()
-						getPrecisionStrategyList(precisionStrategParams, res => {
-							if (res.success) {
-								this.managementList = res.list;
-								var params = this.setParams()
-								console.log("提交" + JSON.stringify(params))
-									unPlannedReceiptRecordbSubmit(params).then(res => {
-										uni.hideLoading()
-										if (res.data) {
-											this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
-										} else {
-											this.showErrorMessage("提交失败[" + res.msg + "]")
-										}
-									}).catch(error => {
-										uni.hideLoading()
-										this.showErrorMessage(error)
-									})
-						
-							} else {
-								uni.hideLoading();
-								this.showErrorMessage(res.message);
-							}
-						
-						})
-				}else {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = this.setPrecisionStrategParams()
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							unPlannedReceiptRecordbSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成计划外入库记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+				} else {
 					this.showErrorMessage("没有要提交的数据,请先扫描")
 				}
-				
-				
+
+
 			},
 			setPrecisionStrategParams() {
 				var itemList = []
@@ -301,47 +302,48 @@
 								}
 								itemList.push(result)
 							}
-			
+
 						}
 					})
 				})
 				return itemList;
 			},
 			setParams() {
-			
+
 				var subList = []
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var submitItem = deepCopyData(detail)
-							var info = getPackingNumberAndBatchByList(this.managementList, detail.label.itemCode,
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.label
+								.itemCode,
 								detail.label.packingNumber, detail.toLocationCode, detail.label.batch);
-							
+
 							submitItem.itemCode = detail.package.itemCode;
 							submitItem.itemName = detail.package.itemName;
 							submitItem.itemDesc1 = detail.package.itemDesc1;
 							submitItem.itemDesc2 = detail.package.itemDesc2;
-							
+
 							submitItem.inventoryStatus = detail.inventoryStatus;
-			
+
 							submitItem.fromPackingNumber = info.packingNumber;
 							submitItem.toPackingNumber = info.packingNumber;
-			
+
 							// detail.fromContainerNumber = detail.containerNumber;
 							// detail.toContainerNumber = detail.containerNumber
-			
+
 							submitItem.fromBatch = info.batch;
 							submitItem.toBatch = info.batch;
-			
+
 							submitItem.fromLocationCode = "";
 							submitItem.toLocationCode = detail.toLocationCode;
-							
+
 							submitItem.reason = this.reasonCode;
-			
-							submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty;
-							submitItem.package ="";
-			
+
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+
 							subList.push(submitItem)
 						}
 					})
@@ -364,16 +366,16 @@
 					this.clearData();
 				})
 			},
-			clearData(){
+			clearData() {
 				this.reasonCode = ""
 				this.reasonText = "";
 				this.detailSource = [];
-				this.managementList=[];
-				this.dataContent ={}
-				this.toLocationCode =""
+				this.managementList = [];
+				this.dataContent = {}
+				this.toLocationCode = ""
 			}
-			
-			
+
+
 		}
 	}
 </script>
diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue
index 433a0f8f..5ed7d8c9 100644
--- a/pages/unPlanned/request/issueRequestCreate.vue
+++ b/pages/unPlanned/request/issueRequestCreate.vue
@@ -18,7 +18,7 @@
 						<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 							<view class="">
 								<record-com-detail-card :dataContent="item" :index="index"
-									@removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true"
+									@removeItem="removeItem(index,item)" @updateData="updateData" :isShowFromLocation="true" :isShowToLocation="false"
 									@removePack="removePack">
 								</record-com-detail-card>
 							</view>
@@ -78,6 +78,7 @@
 	import {
 		goHome,
 		updateTitle,
+		deepCopyData,
 		getCurrDateTimes,
 		getCurrDateOneMonthsTimes,
 		navigateBack
@@ -255,16 +256,18 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							detail.fromLocationCode = detail.locationCode;
-							detail.reason = this.reasonCode;
-							detail.containerNumber ="";
-							subList.push(detail)
+							var submitItem = deepCopyData(detail)
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.reason = this.reasonCode;
+							submitItem.containerNumber ="";
+							submitItem.qty = detail.handleQty;
+							subList.push(submitItem)
 						}
 					})
 				})
 
 				this.dataContent.subList = subList
-				this.dataContent.status = 1;
+				this.dataContent.status = "1";
 				this.dataContent.requestTime = getCurrDateTimes();
 				this.dataContent.dueTime = getCurrDateOneMonthsTimes();
 				
diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue
index a2f02fc9..1fd5e8d3 100644
--- a/pages/unPlanned/request/receiptRequestCreate.vue
+++ b/pages/unPlanned/request/receiptRequestCreate.vue
@@ -58,6 +58,7 @@
 		getISODateTime,
 		navigateBack,
 		getBatch,
+		deepCopyData,
 		getCurrDateTimes,
 		getCurrDateOneMonthsTimes
 	} from '@/common/basic.js';
@@ -186,16 +187,17 @@
 			setRequestParams() {
 				var subList = []
 				this.detailSource.subList.forEach(detail => {
-					detail.toLocationCode = this.detailSource.toLocationCode;
-					detail.reason = this.reasonCode;
-					detail.containerNumber = "";
-					detail.batch = getBatch();
-					detail.inventoryStatus = "OK";
+					var submitItem = deepCopyData(detail)
+					submitItem.toLocationCode = this.detailSource.toLocationCode;
+					submitItem.reason = this.reasonCode;
+					submitItem.containerNumber = "";
+					submitItem.batch = getBatch();
+					submitItem.inventoryStatus = "OK";
 					console.log("", getBatch())
-					subList.push(detail)
+					subList.push(submitItem)
 				})
 				this.dataContent.subList = subList
-				this.dataContent.status = 1;
+				this.dataContent.status = "1";
 				this.dataContent.requestTime = getCurrDateTimes();
 				this.dataContent.dueTime = getCurrDateOneMonthsTimes();
 
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
index 39bb86a9..6f8393a8 100644
--- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -1,13 +1,14 @@
 <template>
 	<view class="uni-numbox">
 		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
-			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }" :style="{color}">-</text>
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }"
+				:style="{color}">-</text>
 		</view>
 		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value" type="number"
-		:focus="focus"
-			v-model="inputValue" :style="{background, color}" />
+			:focus="focus" v-model="inputValue" :style="{background, color}" @input="checkNum" :maxlength="maxlength" />
 		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
-			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }" :style="{color}">+</text>
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }"
+				:style="{color}">+</text>
 		</view>
 	</view>
 </template>
@@ -27,7 +28,9 @@
 	 * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
 	 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
 	 */
-
+	import {
+		Decimal
+	} from 'decimal.js'; //引入
 	export default {
 		name: "UniNumberBox",
 		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
@@ -71,26 +74,55 @@
 		},
 		data() {
 			return {
-				inputValue: 0
+				inputValue: 0,
+				maxlength: 10
 			};
 		},
 		watch: {
 			value(val) {
-				this.inputValue = +val;
+				this.inputValue = this.add(this.inputValue, val)
 			},
 			modelValue(val) {
-				this.inputValue = +val;
+				this.inputValue = this.add(this.inputValue, val)
 			}
 		},
 		created() {
 			if (this.value === 1) {
-				this.inputValue = +this.modelValue;
+				this.inputValue = this.add(this.inputValue, this.modelValue)
 			}
 			if (this.modelValue === 1) {
-				this.inputValue = +this.value;
+				this.inputValue = this.add(this.inputValue, this.value)
 			}
 		},
 		methods: {
+			add(num1, num2) {
+				return new Decimal(num1).add(new Decimal(num2))
+			},
+
+			sub(num1, num2) {
+				return new Decimal(num1).sub(new Decimal(num2))
+			},
+			
+			mul(num1,num2) {
+			    return new Decimal(num1).mul(new Decimal(num2))
+			},
+			div(num1,num2) {
+			    return new Decimal(num1).div(new Decimal(num2))
+			},
+			checkNum(e) {
+				let value = e.detail.value;
+				let dot = value.indexOf('.'); //鍖呭惈灏忔暟鐐
+				let reg = /^[0-9]+$/; //姝ｆ暣鏁
+				if (dot > -1) {
+					this.maxlength = dot + 7; //闀垮害鏄¯灏忔暟鐐瑰悗涓や綅
+					if (value.length > dot + 7) {
+
+					}
+				}
+				if (reg.test(value)) { //濡傛灉鏄¯姝ｆ暣鏁颁笉鍖呭惈灏忔暟鐐
+					this.maxlength = 10;
+				}
+			},
 			_calcValue(type) {
 				if (this.disabled) {
 					return;
@@ -99,7 +131,7 @@
 				let value = this.inputValue * scale;
 				let step = this.step * scale;
 				if (type === "minus") {
-					value -= step;
+					value = this.sub(value - step)
 					if (value < (this.min * scale)) {
 						return;
 					}
@@ -109,53 +141,54 @@
 				}
 
 				if (type === "plus") {
-					value += step;
-					if (value > (this.max * scale)) {
-						return;
-					}
-					if (value < (this.min * scale)) {
-						value = this.min * scale
-					}
-				}
-
-				this.inputValue = (value / scale).toFixed(String(scale).length - 1);
-				this.$emit("change", +this.inputValue);
-				// TODO vue2 兼容
-				this.$emit("input", +this.inputValue);
-				// TODO vue3 兼容
-				this.$emit("update:modelValue", +this.inputValue);
-			},
-			_getDecimalScale() {
-
-				let scale = 1;
-				// 浮点型
-				if (~~this.step !== this.step) {
-					scale = Math.pow(10, String(this.step).split(".")[1].length);
-				}
-				return scale;
-			},
-			_onBlur(event) {
-				this.$emit('blur', event)
-				let value = event.detail.value;
-				if (!value) {
-					// this.inputValue = 0;
+					value = this.add(value, step)
+			
+				if (value > (this.max * scale)) {
 					return;
 				}
-				value = +value;
-				if (value > this.max) {
-					value = this.max;
-				} else if (value < this.min) {
-					value = this.min;
+				if (value < (this.min * scale)) {
+					value = this.min * scale
 				}
-				const scale = this._getDecimalScale();
-				this.inputValue = value.toFixed(String(scale).length - 1);
-				this.$emit("change", +this.inputValue);
-				this.$emit("input", +this.inputValue);
-			},
-			_onFocus(event) {
-				this.$emit('focus', event)
 			}
+
+			this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+			this.$emit("change", +this.inputValue);
+			// TODO vue2 兼容
+			this.$emit("input", +this.inputValue);
+			// TODO vue3 兼容
+			this.$emit("update:modelValue", +this.inputValue);
+		},
+		_getDecimalScale() {
+
+			let scale = 1;
+			// 浮点型
+			if (~~this.step !== this.step) {
+				scale = Math.pow(10, String(this.step).split(".")[1].length);
+			}
+			return scale;
+		},
+		_onBlur(event) {
+			this.$emit('blur', event)
+			let value = event.detail.value;
+			if (!value) {
+				// this.inputValue = 0;
+				return;
+			}
+			value = +value;
+			if (value > this.max) {
+				value = this.max;
+			} else if (value < this.min) {
+				value = this.min;
+			}
+			const scale = this._getDecimalScale();
+			this.inputValue = value.toFixed(String(scale).length - 1);
+			this.$emit("change", +this.inputValue);
+			this.$emit("input", +this.inputValue);
+		},
+		_onFocus(event) {
+			this.$emit('focus', event)
 		}
+	}
 	};
 </script>
 <style lang="scss" scoped>