diff --git a/.env.development b/.env.development
index faacbb33..4e262404 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
-# VITE_BASE_URL=http://localhost:12080/admin-api
-VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
+VITE_BASE_URL=http://localhost:12080/admin-api
+# VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api
+# VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
 
 # 租户配置
 VITE_TENANT='[{"text":"英泰","value":1},{"text":"长春2379","value":3}]'
diff --git a/.env.hella13 b/.env.hella13
deleted file mode 100644
index 97e83b15..00000000
--- a/.env.hella13
+++ /dev/null
@@ -1,14 +0,0 @@
-VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
-
-# 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
-
-# 是否是测试环境
-VITE_isDevelopment=false
-
-# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'
-
-# 项目管理模式 批次货/包装
-VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.hella14 b/.env.hella14
deleted file mode 100644
index 441178e5..00000000
--- a/.env.hella14
+++ /dev/null
@@ -1,14 +0,0 @@
-VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
-
-# 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
-
-# 是否是测试环境
-VITE_isDevelopment=true
-
-# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'
-
-# 项目管理模式 批次货/包装
-VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.hella15 b/.env.hella15
deleted file mode 100644
index f7c9ff07..00000000
--- a/.env.hella15
+++ /dev/null
@@ -1,14 +0,0 @@
-VITE_BASE_URL=https://scp.faway-hella.com:81/api/admin-api
-VITE_BASE_URL_IMAGE=https://scp.faway-hella.com:81/admin-api
-
-# 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
-
-# 是否是测试环境
-VITE_isDevelopment=true
-
-# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='https://scp.faway-hella.com'
-
-# 项目管理模式 批次货/包装
-VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.hella16 b/.env.hella16
deleted file mode 100644
index c84efd8f..00000000
--- a/.env.hella16
+++ /dev/null
@@ -1,14 +0,0 @@
-VITE_BASE_URL=https://scptest.faway-hella.com:81/api/admin-api
-VITE_BASE_URL_IMAGE=https://scptest.faway-hella.com:81/admin-api
-
-# 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
-
-# 是否是测试环境
-VITE_isDevelopment=true
-
-# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='https://scptest.faway-hella.com'
-
-# 项目管理模式 批次货/包装
-VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.hella8 b/.env.hella8
deleted file mode 100644
index 8851bd7c..00000000
--- a/.env.hella8
+++ /dev/null
@@ -1,15 +0,0 @@
-VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
-
-# 租户配置
-VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
-
-# 是否是测试环境
-VITE_isDevelopment=false
-
-
-# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'
-
-# 项目管理模式 批次货/包装
-VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.hella9 b/.env.hella9
deleted file mode 100644
index 36f3d239..00000000
--- a/.env.hella9
+++ /dev/null
@@ -1,14 +0,0 @@
-VITE_BASE_URL=http://172.22.32.9:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api
-
-# 租户配置
-VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
-
-# 是否是测试环境
-VITE_isDevelopment=true
-
-# 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.22.32.9:90'
-
-# 项目管理模式 批次货/包装
-VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 49336718..a3d9c20b 100644
--- a/.env.production
+++ b/.env.production
@@ -1,15 +1,14 @@
-VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
+VITE_BASE_URL=http://192.168.120.34:81/api/admin-api
+VITE_BASE_URL_IMAGE=http://192.168.120.34:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
+VITE_TENANT='[{"text":"英泰","value":1}]'
 
 # 是否是测试环境
-VITE_isDevelopment=false
-
+VITE_isDevelopment=true
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'
+VITE_JMREPORT_BASE_URL='http://192.168.120.34:81/api'
 
 # 项目管理模式 批次货/包装
 VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 16293197..b3c1ab1b 100644
--- a/.env.test
+++ b/.env.test
@@ -1,12 +1,14 @@
-
-VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
-VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api
+VITE_BASE_URL=http://192.168.120.35:81/api/admin-api
+VITE_BASE_URL_IMAGE=http://192.168.120.35:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
+VITE_TENANT='[{"text":"英泰","value":1}]'
 
 # 是否是测试环境
 VITE_isDevelopment=true
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
+VITE_JMREPORT_BASE_URL='http://192.168.120.35:81/api'
+
+# 项目管理模式 批次货/包装
+VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/.env.test-dev b/.env.test-dev
new file mode 100644
index 00000000..024ae336
--- /dev/null
+++ b/.env.test-dev
@@ -0,0 +1,15 @@
+VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api
+VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:28051/admin-api
+
+# 租户配置
+VITE_TENANT='[{"text":"英泰","value":1}]'
+
+# 是否是测试环境
+VITE_isDevelopment=false
+
+
+# 积木报表请求路径
+VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:28051'
+
+# 项目管理模式 批次货/包装
+VITE_MANAGE_MODEL="BY_BATCH"
\ No newline at end of file
diff --git a/Dockerfile_prod b/Dockerfile_prod
deleted file mode 100644
index 116cbdac..00000000
--- a/Dockerfile_prod
+++ /dev/null
@@ -1,7 +0,0 @@
-# 设置基础镜像
-FROM win-nginx
-
-WORKDIR /opt/sfms3.0-uniapp
-COPY nginx_prod.conf /usr/local/nginx/conf/nginx.conf
-# 将dist/build/h5/文件中的内容复制到 /opt/sfms3.0-uniapp 这个目录下面
-COPY dist/build/h5/ /opt/sfms3.0-uniapp
diff --git a/nginx.conf b/nginx.conf
index 2b8d1e32..02896bfc 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -41,6 +41,27 @@ http {
 			proxy_set_header X-Real-IP  $remote_addr;
 			proxy_set_header X-Forwarded-For $http_x_forwarded_for;
 		}
+		location ^~ /jmreport/ {
+			proxy_pass http://localhost:100/jmreport/;
+			proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
+			proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
+			proxy_set_header X-Real-IP      $remote_addr;
+			proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+		}
+		location ^~ /magic/ {
+			proxy_pass http://localhost:100/magic/;
+			proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
+			proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
+			proxy_set_header X-Real-IP      $remote_addr;
+			proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+		}
+		location /profile/ {
+			proxy_cache my_zone;
+			proxy_cache_valid  200 304 12h;
+			proxy_cache_key $host$uri$is_args$args;
+			alias /opt/profile/;
+			index index.html index.htm;
+		}
 		location / {
 			proxy_cache my_zone;
 			proxy_cache_valid  200 304 12h;
diff --git a/nginx_prod.conf b/nginx_prod.conf
deleted file mode 100644
index 2f9b3691..00000000
--- a/nginx_prod.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-user  root;
-worker_processes  2;
-
-events {
-	worker_connections  1024;
-}
-
-http {
-	include       mime.types;
-	charset utf-8,gbk;
-	default_type  application/octet-stream;
-	log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                     '$status $body_bytes_sent "$http_referer" '
-                     '"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"';
-
-	proxy_cache_path /opt/nginx_cache/ levels=1:2 keys_zone=my_zone:10m inactive=300s max_size=5g;
-	access_log  logs/access.log  main;
-	sendfile        on;
-	#tcp_nopush     on;
-	keepalive_timeout  600s;
-	client_max_body_size 200m;
-	gzip  on;
-	gzip_min_length 10k;
-	gzip_comp_level 9;
-	gzip_buffers 4 16k;
-	gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png;
-	gzip_vary on;
-	gzip_disable "MSIE [1-6]\.";
-	upstream sfms3.0 {
-		server localhost:90 weight=10 max_fails=3 fail_timeout=10s;
-	}
-	server {
-		listen       81;
-		server_name_in_redirect off;
-		server_name    _;
-		location /api/ {
-			proxy_pass http://sfms3.0/;
-			proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
-			proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
-			proxy_set_header Host $http_host;
-			proxy_set_header X-Real-IP  $remote_addr;
-			proxy_set_header X-Forwarded-For $http_x_forwarded_for;
-		}
-		location /profile/ {
-			alias /opt/profile/;
-			index index.html index.htm;
-		}
-		location / {
-			proxy_cache my_zone;
-			proxy_cache_valid  200 304 12h;
-			proxy_cache_key $host$uri$is_args$args;
-			try_files $uri $uri/ /index.html;
-			root /opt/sfms3.0-uniapp;
-			index index.html index.htm;
-		}
-	}
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index 0d932a24..c4d16606 100644
--- a/package.json
+++ b/package.json
@@ -8,19 +8,14 @@
     "dev": "uni",
     "dev:h5:ssr": "uni --ssr",
     "dev:mp-weixin": "uni -p mp-weixin",
-    "hella8:app": "uni build -p app --mode hella8",
-    "hella8:app-android": "uni build -p app-android --mode hella8",
-    "hella8:app-ios": "uni build -p app-ios --mode hella8",
-    "hella8:h5:ssr": "uni build --ssr --mode hella8",
-    "hella8:mp-weixin": "uni build -p mp-weixin --mode hella8",
-	"prod": "uni build --mode production",
+    "test:app": "uni build -p app --mode test",
+    "test:app-android": "uni build -p app-android --mode test",
+    "test:app-ios": "uni build -p app-ios --mode test",
+    "test:h5:ssr": "uni build --ssr --mode test",
+    "test:mp-weixin": "uni build -p mp-weixin --mode test",
+		"prod": "uni build --mode production",
     "test": "uni build --mode test",
-    "hella8": "uni build --mode hella8",
-    "hella9": "uni build --mode hella9",
-    "hella13": "uni build --mode hella13",
-    "hella14": "uni build --mode hella14",
-    "hella15": "uni build --mode hella15",
-    "hella16": "uni build --mode hella16"
+    "test-dev": "uni build --mode test-dev"
   },
   "dependencies": {
     "@dcloudio/uni-app": "3.0.0-3090920231225001",
diff --git a/src/common/balance.js b/src/common/balance.js
index 8ddae8f2..d6f9b4a8 100644
--- a/src/common/balance.js
+++ b/src/common/balance.js
@@ -397,13 +397,13 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback)
 	})
 	filters.push({
 		column: "packingNumber",
-		action: "==",
-		value: null
+		action: "isStr",
+		value: ''
 	})
 	filters.push({
 		column: "batch",
-		action: "==",
-		value: label.batch?label.batch:null
+		action: "isStr",
+		value:''
 	})
 	filters.push({
 		column: "locationCode",
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index 979ae50c..f442f672 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -155,10 +155,11 @@
 				// 	title: '解析中...',
 				// 	mask: true
 				// })
+				console.log(222)
 				let that = this;
 				// if(index==-1){
-				// 	that.scanMsg =that.scanMsg + "\n";
-				// }
+				// 	that.sc
+				console.log(that.scanMsg.includes('\n'))
 				if (that.scanMsg.includes('\n')) {
 					// that.scanMsg = 'HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q50';
 					setTimeout(() => {
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 0f4c0144..a7f363c5 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -38,7 +38,7 @@
 		components: {
 			winComScan,
 		},
-		emits: ["getLocation"],
+		emits: ["getLocation","clearFromLocation"],
 		props: {
 			title: {
 				type: String,
@@ -88,11 +88,11 @@
 				this.$refs.scan.clearScanValue();
 			},
 			getScanResult(result) {
-				
 				uni.showLoading({
 					title: '扫描中...',
 					mask: true
 				});
+				console.log(111,result)
 				let label = result.label;
 				if (label.barType === 'QRCode') {
 					this.code = label.locationCode;
@@ -101,10 +101,10 @@
 				}
 				if(this.code==undefined){
 					uni.hideLoading();
-					this.showErrorMessage("扫描库位[" + this.code + "]为空,请输入正确的库位")
+					this.showErrorMessage("扫描库位为空,请输入正确的库位")
 					return 
 				}
-				
+				console.log(888,this.code)
 				getBasicLocationByCode(this.code).then(res => {
 					
 					uni.hideLoading();
@@ -112,6 +112,7 @@
 						let result = res.data.list[0];
 						if(result.code!=this.code){
 							this.showErrorMessage('未查询到库位[' + this.code + ']')
+							this.$emit('clearFromLocation',this.code)
 							return;
 						}
 						var type = result.type;
@@ -131,6 +132,7 @@
 						}
 					} else {
 						this.showErrorMessage('未查询到库位[' + this.code + ']')
+						this.$emit('clearFromLocation',this.code)
 					}
 					
 				}).catch(error => {
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index aaebd305..2ae6adda 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -236,6 +236,9 @@
 
 
 			scanLocation(scanResult) {
+				if(scanResult.fromLocationCode){
+					this.fromLocationCode = scanResult.fromLocationCode
+				}
 				var isCheck = false;
 				if (this.fromLocationCode == '') {
 					this.showErrorMessage('来源库位不能为空', callback => {
@@ -334,6 +337,11 @@
 										})
 									}
 									this.chooseWhich = '2'
+									if(!result.label.itemCode){
+										this.showErrorMessage('扫描标签不对，请重新扫描')
+										this.$emit('clearItemCode',result.label.code)
+										return
+									}
 									if (res.data && res.data.list && res.data.list.length > 1) {
 										this.showBalanceSelect(res.data.list);
 									} else {
diff --git a/src/pages.json b/src/pages.json
index 32a54c13..9e882972 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2216,7 +2216,7 @@
 		{
 			"path": "pages/inventoryMove/record/okToHoldRecord",
 			"style": {
-				"navigationBarTitleText": "合格转隔离记录",
+				"navigationBarTitleText": "物料隔离记录",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -2577,6 +2577,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/unPlanned/record/receiptRecordByBatch",
+			"style": {
+				"navigationBarTitleText": "计划外入库记录",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/unPlanned/record/issueRecord",
 			"style": {
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 7ca78774..fa45bfd1 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -210,7 +210,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
diff --git a/src/pages/count/job/fuzzyCountJob.vue b/src/pages/count/job/fuzzyCountJob.vue
index e57b4aba..d5199cb3 100644
--- a/src/pages/count/job/fuzzyCountJob.vue
+++ b/src/pages/count/job/fuzzyCountJob.vue
@@ -150,7 +150,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue
index c562ee51..ce074f2f 100644
--- a/src/pages/customerReturn/job/returnJob.vue
+++ b/src/pages/customerReturn/job/returnJob.vue
@@ -133,7 +133,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/customerReturn/record/recordList.vue b/src/pages/customerReturn/record/recordList.vue
index c59f4018..af97d0bd 100644
--- a/src/pages/customerReturn/record/recordList.vue
+++ b/src/pages/customerReturn/record/recordList.vue
@@ -147,7 +147,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 58d58a70..6aeda18c 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -139,7 +139,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue
index 4ac64d4c..0d21bc92 100644
--- a/src/pages/inspect/job/inspectJob.vue
+++ b/src/pages/inspect/job/inspectJob.vue
@@ -126,7 +126,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index 4e77583f..ef029a01 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -170,7 +170,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 47038b41..d4408686 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -1,573 +1,641 @@
-<template>
-	<view class="page-wraper">
-		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
-		</view>
-		<view class="page-wraper" v-if="detailSource.length>0">
-			<view class='split_line'></view>
-			<view class="page-main">
-				<scroll-view scroll-y="true" class="page-main-scroll">
-					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-						<view class="">
-							<com-move-record-card :dataContent="item" :index="index" @removeData="removeData"
-								:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
-								:allowEditQty="true"
-								:allowEditStatus="allowEditStatus">
-							</com-move-record-card>
-						</view>
-					</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="">
-						<!-- :isShowEdit="isShowEditLocation" -->
-						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
-							:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true'></requiredLocation>
-					</view>
-					<view class=" uni-flex uni-row">
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
-					</view>
-				</view>
-			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		</view>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
-		</win-scan-pack-and-location>
-		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-
-<script>
-	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comMoveRecordCard from '@/pages/inventoryMove/coms/comMoveRecordCard.vue'
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-
-	import {
-		getInventoryStatusName
-	} from '@/common/directory.js';
-	import {
-		inventoryMoveRecordSubmit,
-		getBasicLocationByCode,
-	} from '@/api/request2.js';
-
-	import {
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-
-	import {
-		getPrecisionStrategyList
-	} from '@/common/balance.js';
-
-	import {
-		getPackingNumberAndBatchByList,
-		deepCopyData
-	} from '@/common/basic.js';
-
-	import {
-		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
-		calcHandleQty,
-	} from '@/common/record.js';
-	
-	import {
-		calc
-	} from '@/common/calc.js';
-
-	export default {
-		components: {
-			comEmptyView,
-			winScanButton,
-			requiredLocation,
-			comMoveRecordCard,
-			comBlankView,
-			winScanLocation,
-			winScanPackAndLocation,
-		},
-		props: {
-			// fromInventoryStatus: {
-			// 	type: String,
-			// 	default: ""
-			// },
-			// toInventoryStatus: {
-			// 	type: String,
-			// 	default: ""
-			// },
-			isShowStatus: {
-				type: Boolean,
-				default: true
-			},
-			allowEditStatus: {
-				type: Boolean,
-				default: false
-			},
-			businessTypeCode: {
-				type: String,
-				default: "Move"
-			}, //业务类型
-			// toLocationCode: {
-			// 	type: String,
-			// 	default: ""
-			// },
-			myTitle: {
-				type: String,
-				default: ""
-			},
-		},
-		data() {
-			return {
-				fromLocationCode: "",
-				fromLocationInfo: {},
-				toLocationCode: "",
-				toLocationInfo: {},
-				toLocationTypeArray: [],
-				toInventoryStatus: "",
-				businessType: {}, //业务类型
-				detailSource: [], //绑定在页面上的数据源
-				title: "",
-				dataContent: {},
-				fromLocationAreaTypeList: [],
-				toLocationAreaTypeList: [],
-				isShowEditLocation: false
-			}
-		},
-
-		mounted() {
-			getBusinessType(this.businessTypeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
-					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
-					this.showFromLocationPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
-			this.initData();
-			this.getLocationInfo();
-		},
-
-
-		methods: {
-			initData() {
-				if (this.businessTypeCode == "Move") {
-					// this.title = "库存转移记录";
-					this.toInventoryStatus = ""
-					this.toLocationCode = ""
-					this.isShowEditLocation = true;
-				} else if (this.businessTypeCode == "HoldToOk") {
-					// this.title = "隔离转合格记录";
-					this.toInventoryStatus = "OK"
-					this.toLocationCode = ""
-					this.isShowEditLocation = true;
-				} else if (this.businessTypeCode == "HoldToScrap") {
-					// this.title = "隔离转报废记录";
-					this.toInventoryStatus = "SCRAP"
-					this.toLocationCode = ""
-					// this.toLocationCode = "SCRAP"
-				} else if (this.businessTypeCode == "OkToHold") {
-					// this.title = "合格转隔离记录";
-					this.toInventoryStatus = "HOLD"
-					this.toLocationCode = ""
-					// this.toLocationCode = "HOLD"
-				} else if (this.businessTypeCode == "OkToScrap") {
-					// this.title = "合格转报废记录";
-					this.toInventoryStatus = "SCRAP"
-					this.toLocationCode = ""
-					// this.toLocationCode = "SCRAP"
-				} else if (this.businessTypeCode == "ScrapToHold") {
-					// this.title = "报废转隔离记录";
-					this.toInventoryStatus = "HOLD"
-					// this.toLocationCode = "HOLD"
-					this.toLocationCode = ""
-				}
-				this.title = this.myTitle
-				uni.setNavigationBarTitle({
-					title: this.title
-				})
-			},
-			getLocationInfo() {
-				if (this.toLocationCode != "") {
-					getBasicLocationByCode(this.toLocationCode).then(res => {
-						if (res.data.total > 0) {
-							let result = res.data.list[0];
-							if (result.code != this.toLocationCode) {
-								this.showErrorMessage('未查询到库位[' + this.toLocationCode + ']')
-								return;
-							}
-							var type = result.type;
-							var available = result.available;
-							if (available == "TRUE") {
-								this.toLocationInfo = res.data.list[0];
-							} else {
-								this.showErrorMessage("扫描库位[" + this.code + "]不可用")
-							}
-						} else {
-							this.showErrorMessage('库位[' + this.toLocationCode + ']不存在')
-						}
-
-					}).catch(error => {
-						uni.hideLoading();
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			openScanPopup() {
-				if (this.fromLocationCode == "") {
-					this.showFromLocationPopup();
-					return
-				}
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
-			},
-			showFromLocationPopup() {
-				this.$nextTick(() => {
-					this.$refs.scanFromLocationCode.openScanPopup();
-				})
-			},
-			getFromLocation(location) {
-				this.fromLocationCode = location.code;
-				this.fromLocationInfo = location;
-				this.openScanPopup();
-			},
-			getToLocation(location, code) {
-				this.toLocationCode = code;
-				this.toLocationInfo = location;
-			},
-			getScanResult(result,managementType) {
-				if(managementType == "BY_BATCH" ||managementType == "BY_QUANTITY" ){
-					this.getScanResultAfterBatch(result)
-				}else{
-					this.getScanResultAfter(result)
-				}
-			},
-			getScanResultAfter(result){
-				var balance = result.balance;
-				var pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack);
-				
-					if (newDetail.packingNumber == '') {
-						newDetail.packingNumber = pack.number;
-					}
-				
-					if (this.businessTypeCode == "Move") {
-						newDetail.toInventoryStatus = balance.inventoryStatus;
-					} else {
-						newDetail.toInventoryStatus = this.toInventoryStatus;
-					}
-					newDetail.toLocationCode = this.toLocationCode;
-					newDetail.fromLocationCode = result.fromLocationCode
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.subList.find(r => {
-						if (r.packingNumber == pack.number &&
-							r.batch == pack.batch &&
-							r.fromLocationCode == balance.locationCode &&
-							r.toInventoryStatus == balance.inventoryStatus &&
-							r.scaned == true) {
-							return r;
-						}
-					})
-				
-					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						// newDetail.inventoryStatus = balance.inventoryStatus;
-						if (this.businessTypeCode == "Move") {
-							newDetail.toInventoryStatus = balance.inventoryStatus;
-						} else {
-							newDetail.toInventoryStatus = this.toInventoryStatus;
-						}
-				
-						if (newDetail.packingNumber == '') {
-							newDetail.packingNumber = pack.number;
-						}
-						newDetail.toLocationCode = this.toLocationCode;
-						newDetail.fromLocationCode = result.fromLocationCode
-						item.subList.push(newDetail);
-					} else {
-						this.showErrorMessage("包装[" + detail.packingNumber + "]\n" +
-							"批次[" + detail.batch + "]\n" + "库位[" + detail.fromLocationCode + "]\n" +
-							"库存状态[" + getInventoryStatusName(detail.toInventoryStatus) + "]\n" +
-							"重复扫描")
-					}
-				}
-				calcHandleQty(this.detailSource);
-			},
-			getScanResultAfterBatch(result){
-				var balance = result.balance;
-				this.balanceInfo = result.balance;
-				var pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack);
-				
-					if (newDetail.packingNumber == '') {
-						newDetail.packingNumber = pack.number;
-					}
-				
-					if (this.businessTypeCode == "Move") {
-						newDetail.toInventoryStatus = balance.inventoryStatus;
-					} else {
-						newDetail.toInventoryStatus = this.toInventoryStatus;
-					}
-					newDetail.toLocationCode = this.toLocationCode;
-					newDetail.fromLocationCode = result.fromLocationCode
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.subList.find(r => {
-						if (r.batch == pack.batch &&
-							r.fromLocationCode == balance.locationCode &&
-							r.toInventoryStatus == balance.inventoryStatus &&
-							r.scaned == true) {
-							return r;
-						}
-					})
-				
-					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						// newDetail.inventoryStatus = balance.inventoryStatus;
-						if (this.businessTypeCode == "Move") {
-							newDetail.toInventoryStatus = balance.inventoryStatus;
-						} else {
-							newDetail.toInventoryStatus = this.toInventoryStatus;
-						}
-				
-						if (newDetail.packingNumber == '') {
-							newDetail.packingNumber = pack.number;
-						}
-						newDetail.toLocationCode = this.toLocationCode;
-						newDetail.fromLocationCode = result.fromLocationCode
-						item.subList.push(newDetail);
-					} else {
-					   detail.handleQty =calc.add(detail.handleQty, result.label.qty)
-					}
-				}
-				calcHandleQty(this.detailSource);
-			},
-			showErrorMessage(message) {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.packLoseFocus()
-				}
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-						if (this.$refs.scanPopup) {
-							this.$refs.scanPopup.packGetFocus()
-						}
-					}
-				});
-			},
-			updateData() {
-				calcHandleQty(this.detailSource);
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					if (item.qty == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			},
-
-			removePack() {
-				for (var i = 0; i < this.detailSource.length; i++) {
-					var item = this.detailSource[i];
-					if (item.subList.length == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-				this.updateData();
-			},
-
-
-			removeData(item) {
-				for (let i = 0; i < this.detailSource.length; i++) {
-					if (this.detailSource[i].itemCode == item.itemCode) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			},
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clearData()
-				})
-			},
-			clearData() {
-				this.fromLocationCode = '';
-				this.subList = [];
-				this.detailSource = [];
-				this.toLocationCode = '';
-				this.dataContent = {}
-				this.toWarehouseCode = ""
-			},
-			commit() {
-				if (this.toLocationCode == "") {
-					this.showErrorMessage("请先选择目标库位")
-					return;
-				}
-				// if(this.fromLocationCode==this.toLocationCode){
-				// 	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;
-							this.submit()
-						} else {
-							uni.hideLoading();
-							this.showErrorMessage(res.message);
-						}
-
-					})
-
-				} else {
-					this.showErrorMessage("没有要提交的数据,请先扫描")
-				}
-
-			},
-
-			submit() {
-				//目标库位和状态都一致时不可以提交
-				var params = this.setParams()
-				let hint = ""
-				this.dataContent.subList.forEach(res => {
-					if (res.fromLocationCode == res.toLocationCode) {
-						if (res.fromInventoryStatus == res.toInventoryStatus) {
-							var resultHint = res.fromPackingNumber ? `包装号【${res.fromPackingNumber}】` : ""
-							hint += resultHint + `来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
-						}
-					}
-				})
-				if (hint) {
-					uni.hideLoading()
-					this.$refs.comMessage.showQuestionMessage1(hint, 'red', res => {
-						if (res) {}
-					});
-					return;
-				}
-				// if(this.balanceInfo)
-				console.log("提交" ,params)
-
-				inventoryMoveRecordSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" +
-							res.data)
-					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			setPrecisionStrategParams() {
-				var itemList = []
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							detail.toLocationCode = this.toLocationCode;
-							var filterResult = itemList.filter(res => {
-								if (res.itemCode == item.itemCode &&
-									detail.toLocationCode == res.locationCode) {
-									return res
-								}
-							})
-							//去掉重复元素
-							if (filterResult.length == 0) {
-								var result = {
-									itemCode: item.itemCode,
-									locationCode: detail.toLocationCode
-								}
-								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 info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.toLocationCode, detail.batch);
-							var submitItem = deepCopyData(detail)
-							console.log(233,submitItem)
-							console.log(244,info)
-							submitItem.itemCode = detail.itemCode;
-							submitItem.itemName = detail.package.itemName;
-							submitItem.itemDesc1 = detail.package.itemDesc1;
-							submitItem.itemDesc2 = detail.package.itemDesc2;
-
-							submitItem.fromInventoryStatus = detail.inventoryStatus;
-							submitItem.toInventoryStatus = detail.toInventoryStatus;
-
-							submitItem.fromPackingNumber = info.packingNumber;
-							submitItem.toPackingNumber = info.packingNumber;
-							submitItem.packingNumber = info.packingNumber;
-							submitItem.fromContainerNumber = detail.containerNumber;
-							submitItem.toContainerNumber = detail.containerNumber
-
-							submitItem.fromBatch = info.batch;
-							submitItem.toBatch = info.batch;
-
-							submitItem.fromLocationCode = detail.fromLocationCode;
-							submitItem.toLocationCode = detail.toLocationCode;
-
-							submitItem.package = null;
-							submitItem.Records = null;
-
-							submitItem.qty = detail.handleQty;
-
-							subList.push(submitItem)
-						}
-					})
-				})
-				this.dataContent.subList = subList;
-				this.dataContent.creator = creator;
-				this.dataContent.fromWarehouseCode = this.fromLocationInfo.warehouseCode;
-				this.dataContent.toWarehouseCode = this.toLocationInfo.warehouseCode;
-				this.dataContent.businessType = this.businessTypeCode;
-				return this.dataContent;
-			}
-		}
-	}
-</script>
-
-<style>
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class='split_line'></view>
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<com-move-record-card :dataContent="item" :index="index" @removeData="removeData"
+								:isShowStatus="isShowStatus" @updateData="updateData" @removePack='removePack'
+								:allowEditQty="true"
+								:allowEditStatus="allowEditStatus">
+							</com-move-record-card>
+						</view>
+					</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="">
+						<!-- :isShowEdit="isShowEditLocation" -->
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
+							:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true'></requiredLocation>
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<!-- 合格转隔离单独的弹窗-->
+		<okToHoldRecordPack ref="okToHoldRecordPackRef" :fromLocationCodeProps='fromLocationCode' :itemCodeProps='itemCode' :batchProps='batch' :showOnePop='showOnePop'  :isClearFromLocationCode='isClearFromLocationCode' :isClearItemCode='isClearItemCode' @showFromLocationPopup='showFromLocationPopup'  @itemCodeClick='openScanPopup' @confirm='okToHoldRecordPackConfirm'   @getInputMsgResult="getInputMsgResult" @itemCodeScanMsg='itemCodeScanMsg'></okToHoldRecordPack>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' @clearItemCode='clearItemCode' :title="'箱码'" >
+		</win-scan-pack-and-location>
+		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList" @clearFromLocation='clearFromLocation'></win-scan-location>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comMoveRecordCard from '@/pages/inventoryMove/coms/comMoveRecordCard.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import okToHoldRecordPack from '@/pages/inventoryMove/coms/okToHoldRecordPack.vue'
+
+	import {
+		getInventoryStatusName
+	} from '@/common/directory.js';
+	import {
+		inventoryMoveRecordSubmit,
+		getBasicLocationByCode,
+	} from '@/api/request2.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty,
+	} from '@/common/record.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	export default {
+		components: {
+			comEmptyView,
+			winScanButton,
+			requiredLocation,
+			comMoveRecordCard,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			okToHoldRecordPack
+		},
+		props: {
+			// fromInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			// toInventoryStatus: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+			allowEditStatus: {
+				type: Boolean,
+				default: false
+			},
+			businessTypeCode: {
+				type: String,
+				default: "Move"
+			}, //业务类型
+			// toLocationCode: {
+			// 	type: String,
+			// 	default: ""
+			// },
+			myTitle: {
+				type: String,
+				default: ""
+			},
+			// 是否显示第一层弹窗
+			showOnePop: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				fromLocationCode: "",
+				fromLocationInfo: {},
+				toLocationCode: "",
+				toLocationInfo: {},
+				toLocationTypeArray: [],
+				toInventoryStatus: "",
+				businessType: {}, //业务类型
+				detailSource: [], //绑定在页面上的数据源
+				title: "",
+				dataContent: {},
+				fromLocationAreaTypeList: [],
+				toLocationAreaTypeList: [],
+				isShowEditLocation: false,
+				itemCode:'',
+				batch:'',
+				isClearFromLocationCode:false,//是否清除输入框的来源库位
+				isClearItemCode:false,//是否清除输入框的零件和批次
+			}
+		},
+
+		mounted() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
+					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
+					if(this.showOnePop){
+						console.log(this.$refs.okToHoldRecordPackRef)
+						this.$refs.okToHoldRecordPackRef.show = true
+					}else{
+						this.showFromLocationPopup();
+					}
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			this.initData();
+			this.getLocationInfo();
+		},
+
+
+		methods: {
+			
+			initData() {
+				if (this.businessTypeCode == "Move") {
+					// this.title = "库存转移记录";
+					this.toInventoryStatus = ""
+					this.toLocationCode = ""
+					this.isShowEditLocation = true;
+				} else if (this.businessTypeCode == "HoldToOk") {
+					// this.title = "隔离转合格记录";
+					this.toInventoryStatus = "OK"
+					this.toLocationCode = ""
+					this.isShowEditLocation = true;
+				} else if (this.businessTypeCode == "HoldToScrap") {
+					// this.title = "隔离转报废记录";
+					this.toInventoryStatus = "SCRAP"
+					this.toLocationCode = ""
+					// this.toLocationCode = "SCRAP"
+				} else if (this.businessTypeCode == "OkToHold") {
+					// this.title = "合格转隔离记录";
+					this.toInventoryStatus = "HOLD"
+					this.toLocationCode = ""
+					// this.toLocationCode = "HOLD"
+				} else if (this.businessTypeCode == "OkToScrap") {
+					// this.title = "合格转报废记录";
+					this.toInventoryStatus = "SCRAP"
+					this.toLocationCode = ""
+					// this.toLocationCode = "SCRAP"
+				} else if (this.businessTypeCode == "ScrapToHold") {
+					// this.title = "报废转隔离记录";
+					this.toInventoryStatus = "HOLD"
+					// this.toLocationCode = "HOLD"
+					this.toLocationCode = ""
+				}
+				this.title = this.myTitle
+				uni.setNavigationBarTitle({
+					title: this.title
+				})
+			},
+			getLocationInfo() {
+				if (this.toLocationCode != "") {
+					getBasicLocationByCode(this.toLocationCode).then(res => {
+						if (res.data.total > 0) {
+							let result = res.data.list[0];
+							if (result.code != this.toLocationCode) {
+								this.showErrorMessage('未查询到库位[' + this.toLocationCode + ']')
+								return;
+							}
+							var type = result.type;
+							var available = result.available;
+							if (available == "TRUE") {
+								this.toLocationInfo = res.data.list[0];
+							} else {
+								this.showErrorMessage("扫描库位[" + this.code + "]不可用")
+							}
+						} else {
+							this.showErrorMessage('库位[' + this.toLocationCode + ']不存在')
+						}
+
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+			
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanFromLocationCode.openScanPopup();
+				})
+			},
+			getFromLocation(location) {
+				this.fromLocationCode = location.code;
+				this.fromLocationInfo = location;
+				if(!this.showOnePop){
+						this.openScanPopup();
+				}
+			},
+			getToLocation(location, code) {
+				this.toLocationCode = code;
+				this.toLocationInfo = location;
+			},
+			getScanResult(result,managementType) {
+				console.log(356,result)
+				if(this.showOnePop){
+					this.itemCode= result.balance.itemCode
+					this.batch =  result.balance.batch
+				console.log(357,this.itemCode)
+				console.log(358,this.batch )
+					this.getResult = result//存储接受的结果
+					this.$refs.scanPopup.closeScanPopup()
+					
+				}else{
+					if(managementType == "BY_BATCH" ||managementType == "BY_QUANTITY" ){
+						this.getScanResultAfterBatch(result)
+					}else{
+						this.getScanResultAfter(result)
+					}
+				}
+				
+			},
+			okToHoldRecordPackConfirm(obj){
+				// this.getResult. = result//存储接受的结果
+				if(!obj.fromLocationCode){
+					this.$refs.comMessage.showErrorMessage('请选择来源库位');
+					return;
+				}
+				if(!obj.itemCode){
+					this.$refs.comMessage.showErrorMessage('请选择零件');
+					return;
+				}
+				if(!obj.handleQty){
+					this.$refs.comMessage.showErrorMessage('请输入数量');
+					return;
+				}
+				// this.getResult.fromLocationCode = obj.fromLocationCode
+				this.getResult.label.batch = obj.handleQty
+				this.getResult.label.qty = obj.handleQty
+				this.getScanResultAfterBatch(this.getResult)
+			},
+			getScanResultAfter(result){
+				var balance = result.balance;
+				var pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack);
+				
+					if (newDetail.packingNumber == '') {
+						newDetail.packingNumber = pack.number;
+					}
+				
+					if (this.businessTypeCode == "Move") {
+						newDetail.toInventoryStatus = balance.inventoryStatus;
+					} else {
+						newDetail.toInventoryStatus = this.toInventoryStatus;
+					}
+					newDetail.toLocationCode = this.toLocationCode;
+					newDetail.fromLocationCode = result.fromLocationCode
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == pack.number &&
+							r.batch == pack.batch &&
+							r.fromLocationCode == balance.locationCode &&
+							r.toInventoryStatus == balance.inventoryStatus &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+				
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						// newDetail.inventoryStatus = balance.inventoryStatus;
+						if (this.businessTypeCode == "Move") {
+							newDetail.toInventoryStatus = balance.inventoryStatus;
+						} else {
+							newDetail.toInventoryStatus = this.toInventoryStatus;
+						}
+				
+						if (newDetail.packingNumber == '') {
+							newDetail.packingNumber = pack.number;
+						}
+						newDetail.toLocationCode = this.toLocationCode;
+						newDetail.fromLocationCode = result.fromLocationCode
+						item.subList.push(newDetail);
+					} else {
+						this.showErrorMessage("包装[" + detail.packingNumber + "]\n" +
+							"批次[" + detail.batch + "]\n" + "库位[" + detail.fromLocationCode + "]\n" +
+							"库存状态[" + getInventoryStatusName(detail.toInventoryStatus) + "]\n" +
+							"重复扫描")
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+			getScanResultAfterBatch(result){
+				var balance = result.balance;
+				this.balanceInfo = result.balance;
+				var pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack);
+				
+					if (newDetail.packingNumber == '') {
+						newDetail.packingNumber = pack.number;
+					}
+				
+					if (this.businessTypeCode == "Move") {
+						newDetail.toInventoryStatus = balance.inventoryStatus;
+					} else {
+						newDetail.toInventoryStatus = this.toInventoryStatus;
+					}
+					newDetail.toLocationCode = this.toLocationCode;
+					newDetail.fromLocationCode = result.fromLocationCode
+					newDetail.handleQty = Number(result.label.qty)
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.batch == pack.batch &&
+							r.fromLocationCode == balance.locationCode &&
+							r.scaned == true) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						// newDetail.inventoryStatus = balance.inventoryStatus;
+						if (this.businessTypeCode == "Move") {
+							newDetail.toInventoryStatus = balance.inventoryStatus;
+						} else {
+							newDetail.toInventoryStatus = this.toInventoryStatus;
+						}
+				
+						if (newDetail.packingNumber == '') {
+							newDetail.packingNumber = pack.number;
+						}
+						newDetail.toLocationCode = this.toLocationCode;
+						newDetail.fromLocationCode = result.fromLocationCode
+						item.subList.push(newDetail);
+					} else {
+					   detail.handleQty =calc.add(detail.handleQty, result.label.qty)
+					}
+				}
+				calcHandleQty(this.detailSource);
+			},
+			getInputMsgResult(result,fromWitch){
+				console.log('pooo',result)
+				if(fromWitch == 'fromLocationScanMsg'){
+					this.isClearFromLocationCode = false
					this.$refs.scanFromLocationCode.getScanResult(result)
				}else if(fromWitch == 'itemCodeScanMsg'){
+				console.log(7878,this.fromLocationCode)
					result.fromLocationCode = this.fromLocationCode
					this.$refs.scanPopup.getScanResult(result)
				}
+			},
+			// 清除来源库位
+			clearFromLocation(fromLocationCodeParams){
+				this.fromLocationCode = fromLocationCodeParams
+				console.log('rwyrwey',this.fromLocationCode)
+				this.isClearFromLocationCode = true
+			},
+			// 清除零件
+			clearItemCode(itemCodeParams){
+				this.itemCode = itemCodeParams
+				this.isClearItemCode = true
+			},
+			showErrorMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.packLoseFocus()
+				}
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.packGetFocus()
+						}
+					}
+				});
+			},
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData()
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showErrorMessage("请先选择目标库位")
+					return;
+				}
+				// if(this.fromLocationCode==this.toLocationCode){
+				// 	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;
+							this.submit()
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+
+					})
+
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+			},
+
+			submit() {
+				//目标库位和状态都一致时不可以提交
+				var params = this.setParams()
+				let hint = ""
+				this.dataContent.subList.forEach(res => {
+					if (res.fromLocationCode == res.toLocationCode) {
+						if (res.fromInventoryStatus == res.toInventoryStatus) {
+							var resultHint = res.fromPackingNumber ? `包装号【${res.fromPackingNumber}】` : ""
+							hint += resultHint + `来源库位与目标库位 来源状态与目标状态一致,不可以提交\n`
+						}
+					}
+				})
+				if (hint) {
+					uni.hideLoading()
+					this.$refs.comMessage.showQuestionMessage1(hint, 'red', res => {
+						if (res) {}
+					});
+					return;
+				}
+				// if(this.balanceInfo)
+				console.log("提交" ,params)
+
+				inventoryMoveRecordSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功\n生成" + this.title + "\n" +
+							res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								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 info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							console.log(233,submitItem)
+							console.log(244,info)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.fromInventoryStatus = detail.inventoryStatus;
+							submitItem.toInventoryStatus = detail.toInventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.packingNumber = info.packingNumber;
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.fromLocationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							submitItem.package = null;
+							submitItem.Records = null;
+
+							submitItem.qty = detail.handleQty;
+
+							subList.push(submitItem)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromLocationInfo.warehouseCode;
+				this.dataContent.toWarehouseCode = this.toLocationInfo.warehouseCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				return this.dataContent;
+			}
+		}
+	}
+</script>
+
+<style>
 </style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
new file mode 100644
index 00000000..d30b9cfb
--- /dev/null
+++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
@@ -0,0 +1,297 @@
+<template>
+	<view class="">
+		<u-popup v-model="showOne"  mode="bottom" border-radius="14" z-index='12'>
+			<view class="title">
+				<view class="title-txt">
+						需求信息
+				</view>
+				<u-icon name="close" color="#4f4f4f" size="28"  @click="showOne = false"></u-icon>
+			</view>
+			<view class="item">
+				<view class="label">来源库位：</view>
+				<view class="value"><u-input v-model="fromLocationCode"  @confirm="fromLocationScanMsg"></u-input></view>
+				<view class="searchIcon">
+					<image src="/static/search.svg" mode=""  @click="fromLocationClick"/>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">零件：</view>
+				<view class="value"><u-input v-model="itemCode"  @confirm="itemCodeScanMsg"></u-input></view>
+				<view class="searchIcon">
+					<image src="/static/search.svg" mode=""  @click="itemCodeClick"/>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">批次：</view>
+				<view class="value">
+					<u-input v-model='batch'></u-input>
+				</view>
+				<view class="searchIcon"></view>
+			</view>
+			<view class="item">
+				<view class="label">数量：</view>
+				<view class="value1">
+					<u-number-box v-model="handleQty" @change="valChange"></u-number-box>
+					<view class="uom">EA</view>
+				</view>
+			</view>
+			<view class="uni-flex uni-row hide_border">
+				<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="showOne = false">取消</button>
+				<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+			</view>
+		</u-popup>
+		
+		<!-- <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location> -->
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import {
+		getBusinessType
+	} from '@/common/record.js';
+	
+	import {
+		getLabelInfo
+	} from '../../../common/label.js';
+	
+
+	export default {
+		components: {
+			winScanLocation
+		},
+		emits: ["showFromLocationPopup",'itemCodeClick','confirm','getInputMsgResult'],
+		data() {
+			return {
+				show:true,
+				handleQty:0,
+				fromLocationCode:'',
+				itemCode:'',
+				batch:'',
+				showOne:true
+			}
+		},
+		props: {
+			fromLocationCodeProps:{
+				type: String,
+				default: ''
+			},
+			// 是否显示第一层弹窗
+			showOnePop: {
+				type: Boolean,
+				default: false
+			},
+			itemCodeProps:{
+				type: String,
+				default: ''
+			},
+			batchProps:{
+				type: String,
+				default: ''
+			},
+			isClearFromLocationCode:{
+				type: Boolean,
+				default: false
+			},
+			isClearItemCode:{
+				type: Boolean,
+				default: false
+			},
+		},
+		mounted() {
+		},
+		methods: {
+			// 打开扫描来源库位组件
+			fromLocationClick(){
+				// this.$refs.scanLocationCode.openScanPopup()
+				this.$emit("showFromLocationPopup");
+			},
+			// 显示箱码
+			itemCodeClick(){
+				// this.$refs.scanLocationCode.openScanPopup()
+				if(!this.fromLocationCode){
+					this.$refs.comMessage.showMessage("请先扫描来源库位")
+					return
+				}
+				this.$emit("itemCodeClick");
+			},
+			confirm(){
+				// this.$refs.scanLocationCode.openScanPopup()
+				
+				let obj = {
+					fromLocationCode:this.fromLocationCode,
+					itemCode:this.itemCode,
+					batch:this.batch,
+					handleQty:this.handleQty,
+				}
+				this.$emit("confirm",obj);
+			},
+			fromLocationScanMsg(){
+				console.log(111,this.fromLocationCode)
+				this.scanMsg = this.fromLocationCode
+				this.fromWitch = 'fromLocationScanMsg'
+				this.handelScanMsg()
+			},
+			itemCodeScanMsg(){
+				if(!this.fromLocationCode){
+					this.$refs.comMessage.showMessage("请先扫描来源库位")
+					return
+				}
+				this.fromWitch = 'itemCodeScanMsg'
+				this.scanMsg = this.itemCode
+				this.handelScanMsg()
+			},
+			handelScanMsg() {
+				//点击了回车
+				// uni.showLoading({
+				// 	title: '解析中...',
+				// 	mask: true
+				// })
+				let that = this;
+				console.log(777,that.scanMsg)
+				// if(index==-1){
+				// 	that.scanMsg =that.scanMsg + "\n";
+				// }
+				console.log(that.scanMsg.includes('\n'))
+				// if (that.scanMsg.includes('\n')) {
+					// that.scanMsg = 'HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q50';
+					setTimeout(() => {
+						that.losefocus();
+						let content = uni.$u.trim(that.scanMsg)
+						if (content == "") {
+							// that.getfocus();
+							this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
+								if (res) {
+									that.scanMsg = ""
+									that.getfocus();
+								}
+							})
+							return;
+						}
+			
+						if (that.isShowHistory) {
+							that.scanList.unshift(content);
+						}
+					
+						getLabelInfo(content, this.headerType, callback => {
+							// uni.hideLoading();
+							let scanResult = callback;
+							scanResult.scanMessage = content
+							if (scanResult.success) {
+								// that.getfocus();//不能自动获取焦点
+								console.log(scanResult)
+								that.$emit("getInputMsgResult", scanResult,this.fromWitch);
+							} else {
+								that.losefocus();
+								this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
+									if (res) {
+										that.getfocus();
+									}
+								})
+							}
+						});
+					}, 200);
+				// }
+			},
+			losefocus() {
+				let that = this;
+				this.$nextTick(r => {
+					that.boxfocus = false;
+				});
+			},
+		},
+		watch: {
+			fromLocationCodeProps:{
+				handler(newVal, oldVal) {
+					console.log('wer',this.isClearFromLocationCode)
+					console.log('wer',newVal)
+					if(this.isClearFromLocationCode){
+						this.fromLocationCode=''
+					}else{
+					this.fromLocationCode  = newVal
+					}
+				},
+				// deep: true,
+				// immediate: true
+			},
+			itemCodeProps: {
+				handler(newVal, oldVal) {
+					if(this.isClearItemCode){
+						this.itemCode=''
+						this.batch=''
+					}else{
+						this.itemCode  = newVal
+					}
+				},
+			},
+			batchProps(newVal) {
+				this.batch  = newVal
+				console.log(999,this.batch)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title{
+		padding:30rpx 20rpx;
+		display: flex;
+		border-bottom:1px solid rgba(230, 230, 230, 1);
+		.title-txt{
+			flex:1;
+			font-weight: bold;
+			font-size: 32rpx;
+		}
+		
+	}
+	.select{
+		display: flex;
+	}
+	.border{
+		border:1px  solid rgba(230, 230, 230, 1)
+	}
+	::v-deep .u-input__right-icon__clear{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #a7a7a7;
+	}
+	.item{
+		display: flex;
+		align-items: center;
+		padding: 20rpx;
+		border-bottom: 1px solid #dedede;
+		.value{
+			flex:1;
+			width: 0px;
+			height: 80rpx;
+			border: 1px solid #dedede;
+			display: flex;
+			align-items: center;
+			font-size: 32rpx;
+			padding: 0px 20rpx;
+		}
+		.value1{
+			flex:1;
+			width: 0px;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+			font-size: 32rpx;
+		}
+		.searchIcon{
+			width: 40rpx;
+			margin-left: 20rpx;
+			image{
+				width: 40rpx;
+				height:40rpx
+			}
+		}
+		.uom{
+			margin-left: 10rpx;
+		}
+		
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/coms/okToHoldRecordScan.vue b/src/pages/inventoryMove/coms/okToHoldRecordScan.vue
deleted file mode 100644
index 73acab6f..00000000
--- a/src/pages/inventoryMove/coms/okToHoldRecordScan.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<!-- 合格转隔离扫码组件 -->
-<template>
-	<u-popup
-		v-model="show"
-		:mode="mode"
-		:mask='mask'
-		:length='length'
-		:zoom='zoom'
-		:safe-area-inset-bottom='safeAreaInsetBottom'
-		:mask-close-able='maskCloseAble'
-		:custom-style='customStyle'
-		:border-radius='borderBadius'
-		:z-index='zIndex'
-		:closeable='closeable'
-		:close-icon='closeIcon'
-		:close-icon-pos='closeIconPos'
-		:close-icon-color='closeIconColor'
-		:close-icon-size='closeIconSize'
-		:width='width'
-		:height='height'
-		:negative-top='negativeTop'
-		:mask-custom-style='maskCustomStyle'
-		:duration='duration'
-		:blur='blur'
-		@open='open'
-		@close='close'
-	>
-		<view>
-			<view class="title">
-				<view class="title-txt">
-						需求
-				</view>
-				<u-icon name="close" color="#4f4f4f" size="28"></u-icon>
-			</view>
-			<u-form 
-				class="form"
-				:model="allData" 
-				ref="formRef"
-				:rules="rules"
-				:error-type="errorType"
-				:border-bottom="borderBottom"
-				:label-position="labelPosition"
-				:label-width="labelWidth"
-				:label-style="labelStyle"
-				:label-align="labelAlign"
-				@setRules='setRules'
-				@resetFields='resetFields'
-				@validate='validate'
-			>
-				<u-form-item
-					:label="item.label"
-					:prop="item.field"
-					v-for="(item,index) in formField"
-					:key='index'
-					:border-bottom="item.form.formItemBorderBottom == true || item.form.formItemBorderBottom == false ? item.form.formItemBorderBottom : true"
-					:label-position="item.form.formItemLabelPosition || 'left'"
-					:label-width="item.form.formItemLabelWidth || ''"
-					:label-style="item.form.formItemLabelStyle || {}"
-					:label-align="item.form.formItemLabelAlign || ''"
-					:right-icon="item.form.rightIcon || ''"
-					:left-icon="item.form.leftIcon || ''"
-					:left-icon-style="item.form.leftIconStyle || ''"
-					:right-icon-style="item.form.righIconStyle || ''"
-					:required="item.form.required || false"
-				>
-				<view :class="item.form.border ? 'border' : formItemBorder ? 'border' : ''" class="item">
-					
-					<u-input 
-						v-if="item.form.type == 'text'||item.form.type == 'password'||item.form.type == 'textarea'||item.form.type == 'number'"
-						v-model="allData[item.field]" 
-						:type='item.form.type'
-						:clearable='item.form.clearable == true || item.form.clearable == false ? item.form.clearable : true'
-						:input-align="item.form.inputAlign || 'left'"
-						:placeholder="item.form.placeholder || `请输入${[item.label]}`"
-						:disabled='item.form.disabled || false'
-						:maxlength='item.form.maxlength || 140'
-						:placeholder-style='item.form.placeholderStyle || "color: #c0c4cc;"'
-						:confirm-type='item.form.confirmType ||"done"'
-						:custom-style='item.form.customStyle'
-						:focus='item.form.focus || false'
-						:fixed='item.form.fixed || false'
-						:password-icon='item.form.passwordIcon == true || item.form.passwordIcon == false ? item.form.passwordIcon : true'
-						:border-color='item.form.borderColor ? item.form.borderColor : formItemBorderColor ? formItemBorderColor : "#dcdfe6"'
-						:auto-height='item.form.autoHeight == true || item.form.autoHeight == false ? item.form.autoHeight : true'
-						:height='item.form.height'
-						:cursor-spacing='item.form.cursorSpacing'
-						:selection-start='item.form.selectionStart'
-						:selection-end='item.form.selectionEnd'
-						:show-confirmbar='item.form.showConfirmbar'
-						:adjust-position='item.form.adjustPosition'
-					/>
-					<!-- <u-input v-model="allData[item.field]" v-if="item.form.type == 'Select'"/> -->
-					<view class="select" v-if="item.form.type == 'select'">
-						<u-input
-							v-model="allData[item.field]" 
-							type='text'
-							:clearable='item.form.clearable == true || item.form.clearable == false ? item.form.clearable : true'
-							:input-align="item.form.inputAlign || 'left'"
-							:placeholder="item.form.placeholder || `请输入${[item.label]}`"
-							:disabled='item.form.disabled || false'
-							:maxlength='item.form.maxlength || 140'
-							:placeholder-style='item.form.placeholderStyle || "color: #c0c4cc;"'
-							:confirm-type='item.form.confirmType ||"done"'
-							:custom-style='item.form.customStyle'
-							:focus='item.form.focus || false'
-							:fixed='item.form.fixed || false'
-							:password-icon='item.form.passwordIcon == true || item.form.passwordIcon == false ? item.form.passwordIcon : true'
-							:border='false'
-							:border-color='item.form.borderColor ? item.form.borderColor : formItemBorderColor ? formItemBorderColor : "#dcdfe6"'
-							:auto-height='item.form.autoHeight == true || item.form.autoHeight == false ? item.form.autoHeight : true'
-							:height='item.form.height'
-							:cursor-spacing='item.form.cursorSpacing'
-							:selection-start='item.form.selectionStart'
-							:selection-end='item.form.selectionEnd'
-							:show-confirmbar='item.form.showConfirmbar'
-							:adjust-position='item.form.adjustPosition'
-						/>
-						<u-icon name="arrow-down-fill" color="#878787" size="28"></u-icon>
-					</view>
-				</view>
-				</u-form-item>
-			</u-form>
-	</view>
-	</u-popup>
-</template>
-<script>
-	export default {
-		components: {
-		
-		},
-		props: {
-			// 弹窗参数
-			mode:{
-				type: String,
-				default: 'bottom',
-			},
-			mask:{
-				type: Boolean,
-				default: true
-			},
-			length:{
-				type: String,
-				default: 'auto'
-			},
-			zoom:{
-				type: Boolean,
-				default: true
-			},
-			safeAreaInsetBottom:{
-				type: Boolean,
-				default: false
-			},
-			maskCloseAble:{
-				type: Boolean,
-				default: true
-			},
-			customStyle:{
-				type: Number,
-				default: ()=>{}
-			},
-			borderBadius:{
-				type: Number,
-				default: 0
-			},	
-			zIndex:{
-				type: Number,
-				default: 10075
-			},
-			closeable:{
-				type: Boolean,
-				default: false
-			},
-			closeIcon:{
-				type: String,
-				default: 'close'
-			},
-			closeIconPos:{
-				type: String,
-				default: 'top-right'
-			},
-			closeIconColor:{
-				type: String,
-				default: '#909399'
-			},
-			closeIconSize:{
-				type: Number,
-				default: 30
-			},
-			width:{
-				type: String,
-				default: ''
-			},
-			height:{
-				type: String,
-				default: ''
-			},
-			negativeTop:{
-				type: Number,
-				default: 0
-			},
-			maskCustomStyle:{
-				type: Object,
-				default:()=>{}
-			},
-			duration:{
-				type: Number,
-				default: 250
-			},
-			blur:{
-				type: Number,
-				default: 0
-			},
-			
-			// 表单参数
-			//  表单字段
-			formField:{
-				type: Array,
-				default: ()=>[]
-			},
-			// 数据
-			allData:{
-				
-			},
-			rules:{
-				type: Object,
-				default: ()=>{}
-			},
-			errorType:{
-				type: Array,
-				default:()=>['message']
-			},
-			borderBottom:{
-				type: Boolean,
-				default: true
-			},
-			labelPosition:{
-				type: String,
-				default: 'left'
-			},
-			labelWidth:{
-				type: Number,
-				default: 90
-			},
-			labelStyle:{
-				type: Object,
-				default: ()=>{}
-			},
-			labelAlign:{
-				type: String,
-				default: 'left'
-			},
-			formItemBorder :{
-				type: Boolean,
-				default: false
-			},
-			formItemBorderColor :{
-				type: String,
-				default: ''
-			},
-		},
-		data() {
-			return {
-				show:true,
-			
-			}
-		},
-
-		mounted() {
-		// this.$refs.form1.setRules(this.rules);
-		},
-		methods: {
-			// 打开弹窗
-			open(){
-				
-			},
-			// 关闭弹窗
-			close(){
-				
-			},
-			// 设置校验规则
-			setRules(){
-				
-			},
-			// 对整个表单进行重置，将所有字段值重置为初始值并移除校验结果
-			resetFields(){
-				
-			},
-			// 对整个表单进行校验的方法
-			validate(){
-				
-			},
-		}
-	}
-</script>
-
-<style>
-	.form{
-		padding: 0px 20rpx;
-		font-size: 24rpx;
-	}
-	.item{
-		flex:1;padding: 0px 20rpx;
-	}
-	.title{
-		padding:20rpx;
-		display: flex;
-		border-bottom:1px solid rgba(230, 230, 230, 1);
-		.title-txt{
-			flex:1;
-			font-weight: bold;
-			font-size: 32rpx;
-		}
-		
-	}
-	.select{
-		display: flex;
-	}
-	.border{
-		border:1px  solid rgba(230, 230, 230, 1)
-	}
-	::v-deep .u-input__right-icon__clear{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #a7a7a7;
-	}
-</style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 7c91522e..5aafc125 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -314,7 +314,8 @@
 
 
 			getScanResult(result,managementPrecision) {
-				if(managementPrecision == 'BY_BATCH'){
+					this.managementType = managementPrecision
+				if(managementPrecision == 'BY_BATCH' || managementPrecision == 'BY_QUANTITY' ){
 					this.setDataBatch(result,managementPrecision)
 				}else{
 					this.setData(result,managementPrecision)
@@ -322,6 +323,7 @@
 				
 			},
 			setDataBatch(result,managementPrecision){
+				console.log(877,result.balance.qty)
 				try {
 					var packingNumber = result.label.packingNumber;
 					var batch = result.label.batch;
@@ -482,6 +484,7 @@
 					if (res.success) {
 						this.managementList = res.list;
 						this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING'
+						console.log(11,this.managementType)
 					} else {
 						uni.hideLoading();
 						this.showErrorMessage(res.message);
@@ -490,10 +493,10 @@
 				//允许部分提交
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
-					if(this.managementType == 'BY_BATCH'){
-						this.checkCount();
-					}else{
+					if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY'){
 						this.checkCountBatch();
+					}else{
+						this.checkCount();
 					}
 				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
@@ -545,6 +548,7 @@
 			checkCountBatch(){
 				// 提交的数量和任务数量不一致提示
 				let str = ''
+				let str1 = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
 						if (cur.qty != cur.handleQty) {
@@ -555,10 +559,20 @@
 								tempHandleQty = 0
 							}
 							str +=
-								`提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
+								`批次【${cur.batch}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
+							if( cur.handleQty > cur.balance.balanceQty){
+								console.log(2333,cur.handleQty)
+								console.log(2333,cur.balance.balanceQty)
+								str1 +=
+									`批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】`
+							}
 						}
 					})
 				})
+				if(str1){
+					this.$refs.comMessage.showConfirmWarningModal(str1)
+					return
+				}
 				if (str) {
 					str = '任务明细未全部完成,是否提交?\n' + str
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
diff --git a/src/pages/inventoryMove/job/inventoryMoveJob.vue b/src/pages/inventoryMove/job/inventoryMoveJob.vue
index 97ef5176..69619c2a 100644
--- a/src/pages/inventoryMove/job/inventoryMoveJob.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveJob.vue
@@ -119,7 +119,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/inventoryMove/record/okToHoldRecord.vue b/src/pages/inventoryMove/record/okToHoldRecord.vue
index e025da9a..8adb3cec 100644
--- a/src/pages/inventoryMove/record/okToHoldRecord.vue
+++ b/src/pages/inventoryMove/record/okToHoldRecord.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="page-wraper">
-		<comMoveRecord :myTitle="title" businessTypeCode='OkToHold' > </comMoveRecord>
+		<!-- <comMoveRecord :myTitle="title" businessTypeCode='OkToHold' ></comMoveRecord> -->
+		<comMoveRecord :myTitle="title" businessTypeCode='OkToHold' :showOnePop='true'> </comMoveRecord>
 	</view>
 </template>
 
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 346ed891..15272fa9 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -222,13 +222,13 @@
 							that.subList = res.data.subList;
 							that.detailSource = getThreeDataSource(that.jobContent)
 							that.jobContent.detailToLocationCode = res.data.subList[0].toLocationCode
+							that.toLocationCode= res.data.subList[0].toLocationCode
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							//任务中已经扫描，模拟扫描赋值
 							if (this.scanMessage) {
 								this.openScanPopupSimulate(this.scanMessage);
 
 							}
-						
 							setTimeout(r => {
 								that.resizeCollapse();
 							}, 100)
@@ -263,9 +263,7 @@
 				this.managementType = managementTypeParams
 				if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){
 					this.setDataBatch(result)
-				}else{
-					this.setData(result)
-				}	
+				}
 			},
 			setDataBatch(result) {
 				try {
@@ -312,10 +310,10 @@
 								if (isExit == undefined) {
 									// this.showErrorMessage("批次【" + batch + "】库位【" + result
 									// 	.fromLocationCode + "】不在列表中")
-									
 									detail.subList.push({
 										scaned:true,
 										fromLocationCode:this.fromLocationCode,
+										toLocationCode:this.toLocationCode,
 										batch:result.label.batch,
 										handleQty:result.label.qty,
 										qty:result.balance.qty,
@@ -400,7 +398,9 @@
 									itemDetail.balanceQty=result.balance.qty
 									itemDetail.uom=result.balance.uom
 									itemDetail.packQty=result.package.packQty
-									itemDetail.packUnit=result.package.packUnit
+									itemDetail.packUnit=result.package.packUnit
+									itemDetail.fromlocationCode=this.fromLocationCode
+									itemDetail.toLocationCode=this.toLocationCode
 									// itemDetail.toInventoryStatus = "OK"
 									// itemDetail.packList.forEach(pac => {
 									// 	pac.scaned = true
@@ -481,7 +481,6 @@
 				}
 				
 				console.log("提交参数", params);
-				return
 				issueJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 5f2e24a1..9f98eadc 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -289,7 +289,7 @@
 				if (queryParams.creationTime ) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
diff --git a/src/pages/issue/job/issueJob0816.vue b/src/pages/issue/job/issueJob0816.vue
index a3017f95..c714bfc1 100644
--- a/src/pages/issue/job/issueJob0816.vue
+++ b/src/pages/issue/job/issueJob0816.vue
@@ -234,7 +234,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
@@ -333,7 +333,7 @@
 				// if (this.checkedToday) {
 				// 	filters.push({
 				// 		column: "create_time",
-				// 		action: "betweeen",
+				// 		action: "between",
 				// 		value: this.todayTime
 				// 	})
 				// }
diff --git a/src/pages/itemHold/record/recordList.vue b/src/pages/itemHold/record/recordList.vue
index c4558f64..9feae876 100644
--- a/src/pages/itemHold/record/recordList.vue
+++ b/src/pages/itemHold/record/recordList.vue
@@ -146,7 +146,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue
index 7a4cd225..1715c018 100644
--- a/src/pages/package/job/overPackageJob.vue
+++ b/src/pages/package/job/overPackageJob.vue
@@ -190,7 +190,7 @@
 				if (queryParams.creationTime ) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
diff --git a/src/pages/productDismantle/job/productDismantleJob.vue b/src/pages/productDismantle/job/productDismantleJob.vue
index 4712fc84..ea90a1d0 100644
--- a/src/pages/productDismantle/job/productDismantleJob.vue
+++ b/src/pages/productDismantle/job/productDismantleJob.vue
@@ -132,7 +132,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index 25541856..0228ac61 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -161,7 +161,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue
index a9e11e68..3fbc9781 100644
--- a/src/pages/productReceipt/job/ccProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue
@@ -152,7 +152,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productReceipt/job/completeReceiveJob.vue b/src/pages/productReceipt/job/completeReceiveJob.vue
index e8520ab7..5cd87b95 100644
--- a/src/pages/productReceipt/job/completeReceiveJob.vue
+++ b/src/pages/productReceipt/job/completeReceiveJob.vue
@@ -131,7 +131,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 2a34cef8..de94cb2b 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -361,7 +361,7 @@
 				});
 			},
 
-			commit() {
+			async commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
@@ -376,18 +376,40 @@
 				}else{
 					this.toLocationCode = this.jobToLocationCode
 				}
+				//获取管理模式，封装参数
+				var itemCodes = []
+				this.detailSource.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				await getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING'
+					}
+				})
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
-					if (this.checkCount()) {
-						this.submitJob();
+					if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY'){
+						if (this.checkCountBatch()) {
+							this.submitJob();
+						}
+					}else{
+						if (this.checkCount()) {
+							this.submitJob();
+						}
 					}
-
 				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
 					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
-						if (this.checkCount()) {
-							this.submitJob();
+						if(this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY'){
+							if (this.checkCountBatch()) {
+								this.submitJob();
+							}
+						}else{
+							if (this.checkCount()) {
+								this.submitJob();
+							}
 						}
 					} else {
 						//不允许部分提交，提示
@@ -425,7 +447,34 @@
 				return isCheck;
 
 			},
-
+			checkCountBatch(){
+			var isCheck = true;
+			var hint = ""
+			for (var i = 0; i < this.detailSource.length; i++) {
+				var item = this.detailSource[i];
+				for (var j = 0; j < item.subList.length; j++) {
+					var subItem = item.subList[i]
+					console.log(calc.sub(subItem.handleQty, subItem.qty) )
+					if (calc.sub(subItem.handleQty, subItem.qty) < 0 || calc.sub(subItem.handleQty, subItem.qty) > 0) {
+						isCheck = false;
+						hint = "批次【" + subItem.batch + "】实际收货数量:[" + subItem.handleQty + "]与包装数量[" + subItem.qty +
+							"]不相等，是否继续收货?"
+						break
+					}
+					
+				}
+			}
+			console.log(isCheck)
+			if (!isCheck) {
+				this.showQuestMessage(hint, res => {
+					if (res) {
+						this.submitJob();
+					}
+				})
+			}
+			
+			return isCheck;
+			},
 			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 3a722ba8..989029a2 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -166,7 +166,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productReceipt/record/recordList.vue b/src/pages/productReceipt/record/recordList.vue
index 831613b1..ca564a58 100644
--- a/src/pages/productReceipt/record/recordList.vue
+++ b/src/pages/productReceipt/record/recordList.vue
@@ -146,7 +146,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
diff --git a/src/pages/productRecycle/coms/comRecycleJobCard.vue b/src/pages/productRecycle/coms/comRecycleJobCard.vue
index 216deb18..efce0ba2 100644
--- a/src/pages/productRecycle/coms/comRecycleJobCard.vue
+++ b/src/pages/productRecycle/coms/comRecycleJobCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard  :dataContent="dataContent" :isShowToLocation='isShowToLocation'></jobComMainDetailCard>
 	</job-com-main-card>
 </template>
 
@@ -21,6 +21,10 @@
 				type: Object,
 				default: {}
 			},
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
 		},
 
 		methods: {
diff --git a/src/pages/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue
index 3f2e2dcc..72a6f3bb 100644
--- a/src/pages/productRecycle/job/productRecycleJob.vue
+++ b/src/pages/productRecycle/job/productRecycleJob.vue
@@ -11,7 +11,7 @@
 					<uni-swipe-action-item
 						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
 						@click="swipeClick($event,item)">
-						<comRecycleJobCard :dataContent="item" @click='openJobDetail(item)'></comRecycleJobCard>
+						<comRecycleJobCard :dataContent="item" @click='openJobDetail(item)' :isShowToLocation='false'></comRecycleJobCard>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
@@ -134,7 +134,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
@@ -161,6 +161,9 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
+					res.data.list.forEach(item=>{
+						item.fromLocationCode = item.toLocationCode
+					})
 					var list = res.data.list;
 					this.totalCount = res.data.total
 					updateTitle(this.title+"(" + this.totalCount + ")");
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index 4d1f72a0..5d33464d 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -195,7 +195,7 @@
 				if (queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
diff --git a/src/pages/productionReturn/job/holdToReturnJob.vue b/src/pages/productionReturn/job/holdToReturnJob.vue
index 1c10671f..c571028f 100644
--- a/src/pages/productionReturn/job/holdToReturnJob.vue
+++ b/src/pages/productionReturn/job/holdToReturnJob.vue
@@ -135,7 +135,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productionReturn/job/okToReturnJob.vue b/src/pages/productionReturn/job/okToReturnJob.vue
index f6aaada1..bbe43ac5 100644
--- a/src/pages/productionReturn/job/okToReturnJob.vue
+++ b/src/pages/productionReturn/job/okToReturnJob.vue
@@ -135,7 +135,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue
index 5dd8a87b..f4df3056 100644
--- a/src/pages/productionReturn/job/returnJob.vue
+++ b/src/pages/productionReturn/job/returnJob.vue
@@ -135,7 +135,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/productionReturn/record/returnToHoldRecordList.vue b/src/pages/productionReturn/record/returnToHoldRecordList.vue
index 4e3f2d6a..a6f20096 100644
--- a/src/pages/productionReturn/record/returnToHoldRecordList.vue
+++ b/src/pages/productionReturn/record/returnToHoldRecordList.vue
@@ -145,7 +145,7 @@
 				if (this.queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.queryParams.creationTime
 					})
 				}
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 4dace67f..a96f9c75 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -34,7 +34,7 @@
 						<!-- 管理精度是批次 -->
 						<comReceiptDetailCardBacth :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'
-							v-if="managementType == 'BY_BATCH'">
+							v-if="managementType == 'BY_BATCH' || managementType =='BY_QUANTITY'">
 						</comReceiptDetailCardBacth>
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" @remove="updateData"
 							@updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList' v-else>
@@ -289,8 +289,7 @@
 							getManagementPrecisions(itemCodes, that.jobToLocationCode, res => {
 								if (res.success) {
 									this.managementList = res.list;
-									this.managementType = this.managementList.some(item => item.ManagementPrecision ==
-										'BY_BATCH') ? 'BY_BATCH' : ''
+									this.managementType = this.managementList&& this.managementList[0]&& this.managementList[0].ManagementPrecision ? this.managementList[0].ManagementPrecision : 'BY_PACKAGING'
 								}
 							})
 							// if (uni.getStorageSync('purchaseReceiptDetailPointParams')) {
@@ -318,8 +317,11 @@
 			},
 			getScanResult(result) {
 				this.balanceInfo = result.balance
+				console.log(this.managementType)
 				if(this.managementType == 'BY_BATCH'){
 					this.getScanResultAfterBatch(result)
+				}else if(this.managementType == 'BY_QUANTITY' ){
+					this.getScanResultAfterQuantity(result)
 				}else{
 					this.getScanResultAfter(result)
 				}
@@ -560,6 +562,138 @@
 					this.showErrorMessage(e.message)
 				}
 			},
+		// 数量扫码之后逻辑
+			getScanResultAfterQuantity(result){
+				try {
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+						return;
+					}
+					detail.scaned = true;
+					if (result.label.labelType == "ContainerLabel") {
+						var containerNumber = result.label.container;
+						var itemDetail = detail.subList.filter(r => r.containerNumber == containerNumber);
+						if (itemDetail.length == 0) {
+							this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
+						} else {
+							if (itemDetail[0].scaned) {
+								this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
+							} else {
+								itemDetail.forEach(item => {
+									item.scaned = true;
+									itemDetail.scanDate = new Date();
+									item.handleQty = calc.add(item.handleQty,result.label.qty)
+									item.toLocationCode = this.toLocationCode;
+								})
+								// calcHandleQty(this.detailSource);
+								this.detailSource[0].subList.sort(compareDesc('scanDate')); //按扫描信息排序
+								this.continueScan()
+								this.$forceUpdate()
+							}
+						}
+					} else if (result.label.labelType == "PurchaseLabel") {
+						var packingNumber = result.package.number;
+						var parentpackingNumber = result.package.parentNumber;
+						var batch = result.label.batch;
+						var qty = result.label.qty;
+						var detail = this.detailSource.find(r => r.itemCode == itemCode);
+						console.log(8989,this.detailSource)
+						if (detail == undefined) {
+							this.showMessage("物料号【" + itemCode + "】不在列表中")
+						} else {
+							//物料在列表中
+							// var itemDetail = detail.subList.find(r =>  r.batch ==
+							// 	batch);
+							// if (itemDetail == undefined) {
+				// 				itemDetail = detail.subList.find(r => r.batch ==
+				// 					batch);
+				
+				// 				if (itemDetail == undefined) {
+				// 					this.showMessage("批次【" + batch + "】不在列表中")
+				// 				} else {
+									// var pack = itemDetail.packList.find(p => 
+									// 	p.batch == batch)
+									// if (pack == undefined) {
+									// 	this.showMessage("批次【" + batch + "】不在列表中")
+									// } else {
+										let isScan = false
+										const itemDetail = detail.subList[0]
+										let pack = detail.subList[0] && detail.subList[0].length>0 ?detail.subList[0] : {}
+										if(packingNumber){
+											isScan = this.packingNumberList.some(item=>item == packingNumber)
+										}else{
+											isScan = false
+										}
+										if (isScan) {
+											detail.subList[0].scanDate = new Date();
+											// this.showMessage("箱码【" + packingNumber + "】已经扫描");
+											
+											detail.subList[0].handleQty = calc.add(detail.subList[0].handleQty,result.label.qty)
+										} else {
+											this.packingNumberList.push(packingNumber)
+											detail.subList[0].scaned = true
+											detail.subList[0].scanDate = new Date();
+											detail.subList[0].handleQty = Number(result.label.qty);
+											detail.subList[0].toLocationCode = this.toLocationCode;
+											detail.subList[0].labelQty = Number(result.label.qty);
+										}
+									// }
+									calcHandleQty(this.detailSource);
+									this.continueScan()
+									// itemDetail.packList[0] = detail.subList[0]; //按扫描信息排序
+									this.$forceUpdate()
+								// }
+				
+							// } else {
+							// 	//扫描的是外包装,将包装集合全部扫描
+							// 	var scanedLength = 0;
+							// 	itemDetail.packList.forEach(res => {
+							// 		if (res.scaned) {
+							// 			scanedLength++;
+							// 		}
+							// 	})
+							// 	debugger
+							// 	let isScan = false
+							// 	if(packingNumber){
+							// 		isScan = this.packingNumberList.some(item=>item == packingNumber)
+							// 	}else{
+							// 		isScan = false
+							// 	}
+							// 	if (isScan) {
+							// 		itemDetail.scanDate = new Date();
+							// 		// this.showMessage("箱码【" + packingNumber + "】已经扫描")
+							// 		itemDetail.handleQty = calc.add(itemDetail.handleQty,result.label.qty)
+							// 	} else {
+							// 		this.packingNumberList.push(packingNumber)
+							// 		itemDetail.scaned = true;
+							// 		itemDetail.scanDate = new Date();
+							// 		itemDetail.handleQty =itemDetail.handleQty ?itemDetail.handleQty:0
+							// 		itemDetail.handleQty = calc.add(itemDetail.handleQty,result.label.qty)
+							// 		console.log(itemDetail.handleQty)
+							// 		itemDetail.toLocationCode = this.toLocationCode;
+							// 		itemDetail.labelQty = Number(result.label.qty);
+							// 		itemDetail.packList.forEach(pac => {
+							// 			pac.scaned = true
+							// 			pac.scanDate = new Date();
+							// 			pac.handleQty = calc.add(pac.handleQty,result.label.qty);
+							// 			pac.toLocationCode = this.toLocationCode;
+							// 		})
+							// 		detail.handleQty = itemDetail.handleQty
+							// 		this.detailSource[0].subList.sort(compareDesc('scanDate')); //按扫描信息排序
+							// 		this.continueScan()
+							// 		this.$forceUpdate()
+							// 	}
+							// 		calcHandleQty(this.detailSource);
+							// }
+						}
+					}
+				
+				} catch (e) {
+					this.showErrorMessage(e.message)
+				}
+			},
 			//继续扫描
 			continueScan() {
 				this.scanCount = getScanCount(this.subList);
@@ -715,7 +849,8 @@
 			
 				var params = this.setParams();
 				let that = this
-				console.log(params)
+				console.log(877,params)
+				// return;
 				purchaseReceiptJobSubmit(params).then(res => {
 					if (res.data) {
 						let isCheckPrint = getSwitchInfoByCode(this.switchCode)//是否显示上架指引单
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index b1a8c9b6..cd90837b 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -184,7 +184,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue
index c9761207..86572ea5 100644
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@@ -136,7 +136,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/purchaseReturn/job/returnJob_0904.vue b/src/pages/purchaseReturn/job/returnJob_0904.vue
index 97f80e7c..2ab89e75 100644
--- a/src/pages/purchaseReturn/job/returnJob_0904.vue
+++ b/src/pages/purchaseReturn/job/returnJob_0904.vue
@@ -134,7 +134,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index cd09fa03..221be3dd 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -150,7 +150,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue
index 88b999eb..6ea7c10c 100644
--- a/src/pages/putaway/job/quantityPutawayJob.vue
+++ b/src/pages/putaway/job/quantityPutawayJob.vue
@@ -274,7 +274,7 @@
 				if (queryParams.creationTime) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index a1063cda..3af57d9d 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -206,7 +206,7 @@
 				if (queryParams.creationTime ) {
 					filterParams.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: queryParams.creationTime
 					})
 				}
diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue
index e6951b4d..93e93adb 100644
--- a/src/pages/scrap/job/scrapJob.vue
+++ b/src/pages/scrap/job/scrapJob.vue
@@ -130,7 +130,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/stockUp/job/stockUpJob.vue b/src/pages/stockUp/job/stockUpJob.vue
index 58276213..c8114d86 100644
--- a/src/pages/stockUp/job/stockUpJob.vue
+++ b/src/pages/stockUp/job/stockUpJob.vue
@@ -135,7 +135,7 @@ import {
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
index f1cd6202..0b473e82 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
@@ -125,7 +125,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue
index f4997341..2a194fd0 100644
--- a/src/pages/transfer/job/issueJob.vue
+++ b/src/pages/transfer/job/issueJob.vue
@@ -136,7 +136,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue
index eab54301..8f903d7c 100644
--- a/src/pages/transfer/job/receiptJob.vue
+++ b/src/pages/transfer/job/receiptJob.vue
@@ -134,7 +134,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue
index 324f5a48..8750cbee 100644
--- a/src/pages/unPlanned/job/issueJob.vue
+++ b/src/pages/unPlanned/job/issueJob.vue
@@ -137,7 +137,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue
index 0fbfeed8..7f6326a6 100644
--- a/src/pages/unPlanned/job/receiptJob.vue
+++ b/src/pages/unPlanned/job/receiptJob.vue
@@ -126,7 +126,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}