diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..9fdae23c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+# 设置基础镜像
+FROM nginx:WIN-1.25.3
+
+WORKDIR /opt/sfms3.0-uniapp
+COPY nginx.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
new file mode 100644
index 00000000..6a3d8bc0
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,53 @@
+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:25110 weight=10 max_fails=3 fail_timeout=10s;
+	}
+	server {
+		listen       25102;
+		server_name_in_redirect off;
+		server_name    dev.ccwin-in.com;
+		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 / {
+			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 8517ed4f..38bd5511 100644
--- a/package.json
+++ b/package.json
@@ -6,14 +6,14 @@
     "dev:app-android": "uni -p app-android",
     "dev:app-ios": "uni -p app-ios",
     "dev:custom": "uni -p",
-    "dev:h5": "uni",
+    "dev": "uni",
     "dev:h5:ssr": "uni --ssr",
     "dev:mp-weixin": "uni -p mp-weixin",
     "build:app": "uni build -p app",
     "build:app-android": "uni build -p app-android",
     "build:app-ios": "uni build -p app-ios",
     "build:custom": "uni build -p",
-    "build:h5": "uni build",
+    "test": "uni build",
     "build:h5:ssr": "uni build --ssr",
     "build:mp-weixin": "uni build -p mp-weixin"
   },
diff --git a/src/App.vue b/src/App.vue
index 3621db48..9128a34d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,13 @@
 <script>
+	// #ifdef APP-PLUS
+	import {
+		appUpdate
+	} from "@/common/appUpdate.js"
+	// #endif
+
 	export default {
 		onLaunch: function() {
+
 			console.log('App Launch')
 			// 隐藏顶部电池,时间等信息 
 			// #ifdef APP-PLUS
@@ -11,7 +18,9 @@
 			// plus.screen.lockOrientation('landscape-primary');
 			// // app 强制竖屏
 			// plus.screen.lockOrientation('portrait-primary'); 
+			appUpdate();
 			// #endif
+
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/src/api/request2.js b/src/api/request2.js
index d472a377..56e24930 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -102,9 +102,19 @@ export function updateUserPwd(oldPassword, newPassword) {
  * @param {*}   
  * 
  */
-export function getWarehouseCodeList(pageNo,pageSize) {
+export function getWarehouseCodeList(pageNo, pageSize) {
 	return request({
-		url: baseApi + "/wms/warehouse/page?pageNo="+pageNo+"&pageSize="+pageSize,
+		url: baseApi + "/wms/warehouse/page?pageNo=" + pageNo + "&pageSize=" + pageSize,
+		method: "get",
+		data: {},
+	});
+}
+
+//获取产品标签信息inventorylabel
+export function getInventoryLabel(code) {
+
+	return request({
+		url: baseApi + "/api/pda/label/inventorylabel/by-code?code=" + code,
 		method: "get",
 		data: {},
 	});
@@ -115,9 +125,9 @@ export function getWarehouseCodeList(pageNo,pageSize) {
  * @param {*} 
  * 
  */
-export function getMessageList(pageNo,pageSize) {
+export function getMessageList(pageNo, pageSize) {
 	return request({
-		url: baseApi + "/system/notify-message/my-page?pageNo="+pageNo+"&pageSize="+pageSize,
+		url: baseApi + "/system/notify-message/my-page?pageNo=" + pageNo + "&pageSize=" + pageSize,
 		method: "get",
 		data: {},
 	});
@@ -130,7 +140,7 @@ export function getMessageList(pageNo,pageSize) {
  */
 export function setMessageUpdateRead(ids) {
 	return request({
-		url: baseApi + "/system/notify-message/update-read?ids="+ids,
+		url: baseApi + "/system/notify-message/update-read?ids=" + ids,
 		method: "put",
 		data: {},
 	});
@@ -980,7 +990,16 @@ export function inspectJobSubmit(params) {
 	});
 }
 
+//根据检验记录单号创建上架申请
+export function createPutAwayRequest(number) {
+	return request({
+		url: baseApi + "/wms/inspect-record-main/createPutAwayRequest?number=" + number,
+		method: "post",
+		data: {},
+	});
+}
 
+ 
 /**
  * 采购上架 任务
  * status 任务状态 
@@ -1974,7 +1993,7 @@ export function productPutawayJobSubmit(params) {
 	});
 }
 
- 
+
 
 
 
@@ -3617,3 +3636,15 @@ export function getMainMessage() {
 	});
 }
 
+/**
+ * app检查更新 
+ * @param {*} 
+ * 
+ */
+export function appCheckUpdate() {
+	return uni.request({
+		url:"http://192.168.0.119:9527/appUpdate.json",
+		method:"GET",
+		data:{}
+	})
+}
\ No newline at end of file
diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js
new file mode 100644
index 00000000..03af4c39
--- /dev/null
+++ b/src/common/appUpdate.js
@@ -0,0 +1,116 @@
+import {
+	appCheckUpdate
+} from '../api/request2.js';
+export function appUpdate() {
+	let curversion = 0;
+	plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+		const data = {
+			action: 'checkVersion',
+			appid: plus.runtime.appid,
+			appVersion: plus.runtime.version,
+			wgtVersion: widgetInfo.version,
+			versionCode: widgetInfo.versionCode
+		}
+		curversion=data.versionCode
+	appCheckUpdate().then(res => {
+		console.log("当前版本提示",curversion)
+		if (res.data) {
+			if (res.data.versionCode > Number(curversion)) {
+				var downUrl = res.data.downUrl;
+				var content = res.data.content;
+				var version =res.data.version
+				console.log("新版本提示")
+				uni.showModal({
+					title: "发现新版本:("+version+")",
+					content: content,
+					confirmText: "更新",
+					cancelText: "取消",
+					success: (res) => {
+						if (res.confirm) {
+							confirm(downUrl);
+							console.log('comfirm') //点击确定之后执行的代码
+						} else {
+							console.log('cancel') //点击取消之后执行的代码
+						}
+					}
+				})
+			} else {
+				uni.showToast({
+					title:"当前是最新版本"
+				})
+				console.log("没有新版本")
+			}
+		}
+	}).catch(error => {
+		console.log("版本错误", error)
+	})
+	
+	})
+	
+	
+
+}
+
+export function confirm(downUrl) {
+	var downloadApkUrl = downUrl
+	var dtask = plus.downloader.createDownload(downloadApkUrl, {},
+		function(d, status) {
+
+			// 下载完成  
+			if (status == 200) {
+
+				plus.runtime.install(plus.io.convertLocalFileSystemURL(
+					d.filename), {}, {}, function(error) {
+					uni.showToast({
+						title: '安装失败',
+						duration: 1500
+					});
+				})
+			} else {
+				uni.showToast({
+					title: '更新失败',
+					duration: 1500
+				});
+			}
+		});
+	try {
+		dtask.start(); // 开启下载的任务
+		var prg = 0;
+		var showLoading = plus.nativeUI.showWaiting(
+			"正在下载"); //创建一个showWaiting对象 
+		dtask.addEventListener('statechanged', function(
+			task,
+			status
+		) {
+			// 给下载任务设置一个监听 并根据状态  做操作
+			switch (task.state) {
+				case 1:
+					showLoading.setTitle("正在下载");
+					break;
+				case 2:
+					showLoading.setTitle("已连接到服务器");
+					break;
+				case 3:
+					prg = parseInt(
+						(parseFloat(task.downloadedSize) /
+							parseFloat(task.totalSize)) *
+						100
+					);
+					showLoading.setTitle("  正在下载" + prg + "%  ");
+					break;
+				case 4:
+					plus.nativeUI.closeWaiting();
+					//下载完成
+					break;
+			}
+		});
+	} catch (err) {
+		plus.nativeUI.closeWaiting();
+		uni.showToast({
+			title: '更新失败-03',
+			mask: false,
+			duration: 1500
+		});
+	}
+
+}
\ No newline at end of file
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 0ff8e4ab..83a2cd46 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2089,6 +2089,17 @@ button::after {
 	padding: 5px;
 }
 
+.card_container {
+	color: #0076F6;
+	padding: 5px;
+}
+
+
+.card_container_content {
+	font-size: 32rpx;
+	padding: 5px;
+}
+
 .card_business {
 	color: #F1A532;
 	padding: 5px;
diff --git a/src/common/style/pdabasic.css b/src/common/style/pdabasic.css
index 7b7f368a..d3b92cec 100644
--- a/src/common/style/pdabasic.css
+++ b/src/common/style/pdabasic.css
@@ -733,7 +733,7 @@ page {
 .page-header .header_item {
 	/* padding-left: 10rpx; */
 	padding: 5rpx 10rpx;
-	font-size:15px ;
+	font-size:32rpx ;
 }
 
 .page-header .header_job_top {
diff --git a/src/mycomponents/balance/balanceDetailPopup.vue b/src/mycomponents/balance/balanceDetailPopup.vue
index 61947b28..62c0be1e 100644
--- a/src/mycomponents/balance/balanceDetailPopup.vue
+++ b/src/mycomponents/balance/balanceDetailPopup.vue
@@ -60,8 +60,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
-
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			// avaliable(value) {
 			// 	return value == "TRUE" ? "可用" : "不可用"
@@ -84,4 +85,4 @@
 <style>
 
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/balance/recommendBalance.vue b/src/mycomponents/balance/recommendBalance.vue
index 1acfad8a..ce7daee8 100644
--- a/src/mycomponents/balance/recommendBalance.vue
+++ b/src/mycomponents/balance/recommendBalance.vue
@@ -26,7 +26,7 @@
 	import pack from '@/mycomponents/balance/pack.vue'
 	import location from '@/mycomponents/balance/location.vue'
 	import batch from '@/mycomponents/balance/batch.vue'
-	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import recommendQty from '@/mycomponents/qty/RecommendQty.vue'
 	import compareQty from '@/mycomponents/qty/compareQty.vue'
 
 	export default {
diff --git a/src/mycomponents/detail/jobDetailPopup.vue b/src/mycomponents/detail/jobDetailPopup.vue
index f2eeed6f..85a10d0c 100644
--- a/src/mycomponents/detail/jobDetailPopup.vue
+++ b/src/mycomponents/detail/jobDetailPopup.vue
@@ -32,7 +32,9 @@
 		methods: {
 			openScanPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/detail/recordDetailPopup.vue b/src/mycomponents/detail/recordDetailPopup.vue
index c3b4503e..a92991f0 100644
--- a/src/mycomponents/detail/recordDetailPopup.vue
+++ b/src/mycomponents/detail/recordDetailPopup.vue
@@ -54,7 +54,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/job/jobDetailPopup.vue b/src/mycomponents/job/jobDetailPopup.vue
index 07cd68ea..1b2116e5 100644
--- a/src/mycomponents/job/jobDetailPopup.vue
+++ b/src/mycomponents/job/jobDetailPopup.vue
@@ -32,7 +32,9 @@
 		methods: {
 			openScanPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/job/jobInfoPopup.vue b/src/mycomponents/job/jobInfoPopup.vue
index 170be4b4..92f04d7f 100644
--- a/src/mycomponents/job/jobInfoPopup.vue
+++ b/src/mycomponents/job/jobInfoPopup.vue
@@ -58,7 +58,9 @@
 			openPopup(dataContent, dataList) {
 				this.dataContent = dataContent;
 				// this.dataList = dataList;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/package/packageDetailPopup.vue b/src/mycomponents/package/packageDetailPopup.vue
index 383e920d..de2c5a5b 100644
--- a/src/mycomponents/package/packageDetailPopup.vue
+++ b/src/mycomponents/package/packageDetailPopup.vue
@@ -49,7 +49,9 @@
 			openPopup(val) {
 				this.dataContent = val;
 				this.getDataList();
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 
 			},
 			closePopup(val) {
diff --git a/src/mycomponents/qty/CountQtyEdit.vue b/src/mycomponents/qty/CountQtyEdit.vue
index cb58b281..1d1cbce2 100644
--- a/src/mycomponents/qty/CountQtyEdit.vue
+++ b/src/mycomponents/qty/CountQtyEdit.vue
@@ -166,7 +166,9 @@
 				// this.detailList = detailList
 				this.showConfirmCountdown = false;
 				this.mode = 'edit';
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 				clearInterval(this.timer)
 			},
 
@@ -175,7 +177,9 @@
 				this.initData(item, detailList);
 				this.showConfirmCountdown = true;
 				this.mode = 'add';
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 				this.startTimer()
 			},
 
diff --git a/src/mycomponents/qty/inspectQtyEdit.vue b/src/mycomponents/qty/inspectQtyEdit.vue
index 4fba09db..c12ab109 100644
--- a/src/mycomponents/qty/inspectQtyEdit.vue
+++ b/src/mycomponents/qty/inspectQtyEdit.vue
@@ -118,7 +118,9 @@
 				this.toInventoryStatus = this.dataContent.toInventoryStatus
 				this.allQty = Number(handleQty)
 				this.FailedQty = Number(item.FailedQty)
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 100)
 			},
 			closeEditPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue
index 6524d262..f0800362 100644
--- a/src/mycomponents/qty/recommendQtyEdit.vue
+++ b/src/mycomponents/qty/recommendQtyEdit.vue
@@ -119,7 +119,9 @@
 				}
 			},
 			openEditPopup() {
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			openTaskEditPopup(recommendQty, handleQty, labelQty) {
 				this.recommendQty = Number(recommendQty);
@@ -133,7 +135,9 @@
 				this.recommendQty = 0;
 				this.labelQty = Number(labelQty);
 				this.allQty = Number(labelQty)
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeEditPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue
index 8011ba5d..b161d195 100644
--- a/src/mycomponents/recommend/recommend.vue
+++ b/src/mycomponents/recommend/recommend.vue
@@ -3,10 +3,10 @@
 		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<!-- uni-inline-item 暂时拿掉-->
 			<view style="word-break: break-all;">
-				<container v-if="isShowContainer&&detail.containerNumber!=''" :container="detail.containerNumber">
+				<container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber">
 				</container>
-				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
-				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<pack v-if="isShowPack && detail.packingNumber!=null" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch && detail.batch!=null" :batch="detail.batch"></batch>
 				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
 				</location>
 				<!-- 	<to-location></to-location> -->
@@ -15,7 +15,6 @@
 			</view>
 			<view style="word-break: break-all;">
 				<!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
-
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
 					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
diff --git a/src/mycomponents/scan/winScanAsnNumber.vue b/src/mycomponents/scan/winScanAsnNumber.vue
index 3a0e420d..38a7f906 100644
--- a/src/mycomponents/scan/winScanAsnNumber.vue
+++ b/src/mycomponents/scan/winScanAsnNumber.vue
@@ -55,7 +55,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/scan/winScanContainer.vue b/src/mycomponents/scan/winScanContainer.vue
index de88a909..3324db49 100644
--- a/src/mycomponents/scan/winScanContainer.vue
+++ b/src/mycomponents/scan/winScanContainer.vue
@@ -54,7 +54,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index 5333073b..bac4db70 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -76,7 +76,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue
index 84d09b86..9dbab854 100644
--- a/src/mycomponents/scan/winScanJobNumber.vue
+++ b/src/mycomponents/scan/winScanJobNumber.vue
@@ -55,7 +55,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index f0ccae6c..8f40ed87 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -63,7 +63,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeScanPopup() {
 				this.$refs.popup.close()
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index 3046aa74..07d50872 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -56,7 +56,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			closeScanPopup() {
diff --git a/src/mycomponents/scan/winScanPackAndCont.vue b/src/mycomponents/scan/winScanPackAndCont.vue
index 54cdcb4f..c6b5ad68 100644
--- a/src/mycomponents/scan/winScanPackAndCont.vue
+++ b/src/mycomponents/scan/winScanPackAndCont.vue
@@ -20,7 +20,9 @@
 				</view>
 			</view>
 		</uni-popup>
+
 		<comMessage ref="comMessage" @afterClose="getfocus"></comMessage>
+
 	</view>
 </template>
 
@@ -59,7 +61,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			closeScanPopup() {
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index b4d9620c..976e827a 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -139,7 +139,9 @@
 				this.fromInventoryStatuses = this.businessType.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
 				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			//在任务中扫描
@@ -155,7 +157,9 @@
 						this.fromLocationCode = this.fromLocationList[0];
 					}
 				}
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
diff --git a/src/mycomponents/scan/winScanPackAndPosition.vue b/src/mycomponents/scan/winScanPackAndPosition.vue
index 9733ae81..8709d076 100644
--- a/src/mycomponents/scan/winScanPackAndPosition.vue
+++ b/src/mycomponents/scan/winScanPackAndPosition.vue
@@ -106,7 +106,9 @@
 					})
 				}
 
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			
 			initData(){
diff --git a/src/pages/count/coms/detailInfoPopup.vue b/src/pages/count/coms/detailInfoPopup.vue
index 7e75ffce..b80e9021 100644
--- a/src/pages/count/coms/detailInfoPopup.vue
+++ b/src/pages/count/coms/detailInfoPopup.vue
@@ -36,7 +36,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/count/coms/jobInfoPopup.vue b/src/pages/count/coms/jobInfoPopup.vue
index 0d3996e4..08244cd8 100644
--- a/src/pages/count/coms/jobInfoPopup.vue
+++ b/src/pages/count/coms/jobInfoPopup.vue
@@ -53,7 +53,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/count/job/countDetail.vue b/src/pages/count/job/countDetail.vue
index 159898c5..cff4f506 100644
--- a/src/pages/count/job/countDetail.vue
+++ b/src/pages/count/job/countDetail.vue
@@ -84,7 +84,7 @@
 	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
+	import countQtyEdit from '@/mycomponents/qty/CountQtyEdit.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 
diff --git a/src/pages/customerReturn/coms/detailInfoPopup.vue b/src/pages/customerReturn/coms/detailInfoPopup.vue
index d12228aa..487c1998 100644
--- a/src/pages/customerReturn/coms/detailInfoPopup.vue
+++ b/src/pages/customerReturn/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/customerReturn/coms/jobInfoPopup.vue b/src/pages/customerReturn/coms/jobInfoPopup.vue
index 568f1737..cd90fcad 100644
--- a/src/pages/customerReturn/coms/jobInfoPopup.vue
+++ b/src/pages/customerReturn/coms/jobInfoPopup.vue
@@ -61,7 +61,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/customerReturn/coms/requestDetailInfoPopup.vue b/src/pages/customerReturn/coms/requestDetailInfoPopup.vue
index bc963019..54490011 100644
--- a/src/pages/customerReturn/coms/requestDetailInfoPopup.vue
+++ b/src/pages/customerReturn/coms/requestDetailInfoPopup.vue
@@ -70,7 +70,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/customerReturn/coms/requestInfoPopup.vue b/src/pages/customerReturn/coms/requestInfoPopup.vue
index dfd49978..1799e48b 100644
--- a/src/pages/customerReturn/coms/requestInfoPopup.vue
+++ b/src/pages/customerReturn/coms/requestInfoPopup.vue
@@ -88,7 +88,9 @@
 						title: '到月台代码',
 						content: this.dataContent.toDockCode,
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/deliver/coms/comDeliverRequestPopup.vue b/src/pages/deliver/coms/comDeliverRequestPopup.vue
index 8e15357e..84f61013 100644
--- a/src/pages/deliver/coms/comDeliverRequestPopup.vue
+++ b/src/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -164,7 +164,9 @@
 					this.itemCodeGetFocus();
 				}
 
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeRequestPopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index fe54e0e1..4339befe 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -181,7 +181,9 @@
 				this.initData();
 				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 					"-" + this.jobContent.subList[0].workStationCode
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			closeScanPopup() {
diff --git a/src/pages/deliver/coms/detailInfoPopup.vue b/src/pages/deliver/coms/detailInfoPopup.vue
index d12228aa..487c1998 100644
--- a/src/pages/deliver/coms/detailInfoPopup.vue
+++ b/src/pages/deliver/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/deliver/coms/requestDetailInfoPopup.vue b/src/pages/deliver/coms/requestDetailInfoPopup.vue
index e2c75dc3..ac7ff32a 100644
--- a/src/pages/deliver/coms/requestDetailInfoPopup.vue
+++ b/src/pages/deliver/coms/requestDetailInfoPopup.vue
@@ -70,7 +70,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/deliver/coms/requestInfoPopup.vue b/src/pages/deliver/coms/requestInfoPopup.vue
index 8553b7af..6ecf270d 100644
--- a/src/pages/deliver/coms/requestInfoPopup.vue
+++ b/src/pages/deliver/coms/requestInfoPopup.vue
@@ -82,7 +82,9 @@
 						title: '到库区代码范围',
 						content: this.dataContent.toAreaCodes
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/inspect/coms/inspectInfoPopup.vue b/src/pages/inspect/coms/inspectInfoPopup.vue
index e022fe0f..33d87d52 100644
--- a/src/pages/inspect/coms/inspectInfoPopup.vue
+++ b/src/pages/inspect/coms/inspectInfoPopup.vue
@@ -93,7 +93,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/inspect/coms/requestDetailInfoPopup.vue b/src/pages/inspect/coms/requestDetailInfoPopup.vue
index 8bc5c446..13ec8997 100644
--- a/src/pages/inspect/coms/requestDetailInfoPopup.vue
+++ b/src/pages/inspect/coms/requestDetailInfoPopup.vue
@@ -68,7 +68,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/inspect/coms/requestInfoPopup.vue b/src/pages/inspect/coms/requestInfoPopup.vue
index 07e38dfc..0fcc258b 100644
--- a/src/pages/inspect/coms/requestInfoPopup.vue
+++ b/src/pages/inspect/coms/requestInfoPopup.vue
@@ -99,7 +99,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/inspect/job/inspectDetail.vue b/src/pages/inspect/job/inspectDetail.vue
index eafd2045..7be5a0f8 100644
--- a/src/pages/inspect/job/inspectDetail.vue
+++ b/src/pages/inspect/job/inspectDetail.vue
@@ -41,7 +41,8 @@
 		getInspectJobDetail,
 		inspectJobSubmit,
 		getFileList,
-		deleteFileByTable
+		deleteFileByTable,
+		createPutAwayRequest
 	} from '@/api/request2.js';
 	import {
 		goHome,
@@ -147,8 +148,7 @@
 		methods: {
 			deleteFileByTable(id) {
 				debugger
-				deleteFileByTable("jobInspectDetail", id).then(res=>{
-				})
+				deleteFileByTable("jobInspectDetail", id).then(res => {})
 			},
 
 			clearPicList(subList) {
@@ -374,6 +374,12 @@
 					uni.hideLoading()
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录<br>" + res.data)
+						createPutAwayRequest(res.data).then(putawayres => {
+							this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
+						}).catch(error => {
+							uni.hideLoading();
+							this.showErrorMessage(error);
+						})
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
@@ -454,8 +460,8 @@
 									detail.toInventoryStatus = "NOK"
 								}
 							}
-						} 
-						
+						}
+
 						// else {
 						// 	detail.sampleQty = detail.qty;
 						// 	detail.failedQty = 0;
@@ -524,4 +530,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/inspect/job/inspectFullDetail.vue b/src/pages/inspect/job/inspectFullDetail.vue
index 4d17ce0f..2373ccfa 100644
--- a/src/pages/inspect/job/inspectFullDetail.vue
+++ b/src/pages/inspect/job/inspectFullDetail.vue
@@ -42,7 +42,8 @@
 		inspectJobSubmit,
 		deleteFileById,
 		getFileList,
-		deleteFileByTable
+		deleteFileByTable,
+		createPutAwayRequest
 	} from '@/api/request2.js';
 	import {
 		goHome,
@@ -98,7 +99,7 @@
 				fromInventoryStatuses: "",
 				managementList: [],
 				selectedItem: {},
-				jobStatus:""
+				jobStatus: ""
 			};
 		},
 		onLoad(option) {
@@ -125,7 +126,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeInspectJob(this.id).then(res => {
 						uni.navigateBack();
@@ -151,10 +152,9 @@
 		},
 		methods: {
 			deleteFileByTable(id) {
-				deleteFileByTable("jobInspectDetail", id).then(res=>{
-				})
+				deleteFileByTable("jobInspectDetail", id).then(res => {})
 			},
-			
+
 			clearPicList(subList) {
 				subList.forEach(item => {
 					this.deleteFileByTable(item.id)
@@ -247,8 +247,8 @@
 				for (let item of this.detailSource) {
 					for (let detail of item.subList) {
 						if (detail != undefined && detail.scaned) {
-							failedQty= calc.add(failedQty,detail.failedQty)
-							crackQty= calc.add(crackQty,detail.crackQty)
+							failedQty = calc.add(failedQty, detail.failedQty)
+							crackQty = calc.add(crackQty, detail.crackQty)
 						}
 					}
 				}
@@ -379,10 +379,6 @@
 						}
 					}
 				}
-
-
-
-
 			},
 
 			submitJob() {
@@ -397,6 +393,13 @@
 					uni.hideLoading()
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
+						//创建完检验记录后创建上架申请
+						createPutAwayRequest(res.data).then(putawayres => {
+							this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
+						}).catch(error => {
+							uni.hideLoading();
+							this.showErrorMessage(error);
+						}) 
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
@@ -462,8 +465,8 @@
 							detail.failedQty = detail.failedQty;
 							detail.crackQty = detail.crackQty;
 							detail.notPassedQty = detail.failedQty;
-							var tempQty = calc.sub(detail.handleQt,detail.failedQty)
-							detail.goodQty = calc.sub(tempQty,detail.crackQty) ;
+							var tempQty = calc.sub(detail.handleQty, detail.failedQty)
+							detail.goodQty = calc.sub(tempQty, detail.crackQty);
 							detail.inspectUser = this.$store.state.user.id
 
 							//合格数==样品数，全部合格
@@ -518,6 +521,7 @@
 		height: 100%;
 		background-color: #fff;
 	}
+
 	.page-wraper {
 		display: flex;
 		flex-direction: column;
@@ -546,4 +550,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue
index 86de1539..2cb2ab9b 100644
--- a/src/pages/inspect/job/inspectJob.vue
+++ b/src/pages/inspect/job/inspectJob.vue
@@ -41,9 +41,9 @@
 
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
 	import jobFilter from '@/mycomponents/job/jobFilter.vue'
-	import inspectInfoPopup from '@/pages/Inspect/coms/inspectInfoPopup.vue'
-	import comInspectJobCard from '@/pages/Inspect/coms/comInspectJobCard.vue'
-	import comInspectJobList from '@/pages/Inspect/coms/comInspectJobList.vue'
+	import inspectInfoPopup from '@/pages/inspect/coms/inspectInfoPopup.vue'
+	import comInspectJobCard from '@/pages/inspect/coms/comInspectJobCard.vue'
+	import comInspectJobList from '@/pages/inspect/coms/comInspectJobList.vue'
 
 	export default {
 		name: 'receipt',
diff --git a/src/pages/inspect/job/inspectResult.vue b/src/pages/inspect/job/inspectResult.vue
index 11c31c83..ff2988bb 100644
--- a/src/pages/inspect/job/inspectResult.vue
+++ b/src/pages/inspect/job/inspectResult.vue
@@ -143,7 +143,8 @@
 		getInspectJobDetail,
 		takeInspectJob,
 		cancleTakeInspectJob,
-		inspectJobSubmit
+		inspectJobSubmit,
+		createPutAwayRequest
 	} from '@/api/request2.js';
 
 	import {
@@ -159,8 +160,7 @@
 	} from '@/common/basic.js';
 
 	export default {
-		components: {
-		},
+		components: {},
 		data() {
 			return {
 				id: '',
@@ -178,7 +178,7 @@
 				detailSource: [], //绑定在页面上的数据源
 				nextActionList: [],
 				nextAction: null,
-				jobStatus:""
+				jobStatus: ""
 
 			}
 		},
@@ -207,7 +207,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeInspectJob(this.id).then(res => {
 						uni.navigateBack();
@@ -546,6 +546,12 @@
 							hint = "提交成功<br>生成到货检验任务<br>" + res.data
 						} else {
 							hint = "提交成功<br>生成到货检验记录<br>" + res.data
+							createPutAwayRequest(res.data).then(putawayres => {
+								this.showCommitSuccessMessage("生成上架申请单号<br>" + putawayres.data)
+							}).catch(error => {
+								uni.hideLoading();
+								this.showErrorMessage(error);
+							})
 						}
 						this.showCommitSuccessMessage(hint)
 					} else {
@@ -573,4 +579,4 @@
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/coms/detailInfoPopup.vue b/src/pages/inventoryMove/coms/detailInfoPopup.vue
index 72340688..8a7d67b4 100644
--- a/src/pages/inventoryMove/coms/detailInfoPopup.vue
+++ b/src/pages/inventoryMove/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/inventoryMove/coms/jobInfoPopup.vue b/src/pages/inventoryMove/coms/jobInfoPopup.vue
index 7b02b6ab..9f72ee98 100644
--- a/src/pages/inventoryMove/coms/jobInfoPopup.vue
+++ b/src/pages/inventoryMove/coms/jobInfoPopup.vue
@@ -36,7 +36,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/inventoryMove/record/oktoScrapRecord.vue b/src/pages/inventoryMove/record/okToScrapRecord.vue
similarity index 100%
rename from src/pages/inventoryMove/record/oktoScrapRecord.vue
rename to src/pages/inventoryMove/record/okToScrapRecord.vue
diff --git a/src/pages/issue-按批次推荐/coms/comScanIssuePack.vue b/src/pages/issue-按批次推荐/coms/comScanIssuePack.vue
index c954a41c..206e4c56 100644
--- a/src/pages/issue-按批次推荐/coms/comScanIssuePack.vue
+++ b/src/pages/issue-按批次推荐/coms/comScanIssuePack.vue
@@ -100,7 +100,9 @@
 				this.dataContent = content;
 				this.jobContent = jobcontent;
 				this.initData();
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			closeScanPopup() {
diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue
index e3011198..bbd6dd95 100644
--- a/src/pages/issue/coms/comIssueRequestPopup.vue
+++ b/src/pages/issue/coms/comIssueRequestPopup.vue
@@ -196,7 +196,9 @@
 					this.itemCodeGetFocus();
 				}
 
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			initData() {
 				this.positionList = [];
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 1775e4a5..0572aa58 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -174,7 +174,9 @@
 				this.initData();
 				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 				// 	"-" + this.jobContent.subList[0].workStationCode
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			closeScanPopup() {
diff --git a/src/pages/issue/coms/detailInfoPopup.vue b/src/pages/issue/coms/detailInfoPopup.vue
index 72340688..8a7d67b4 100644
--- a/src/pages/issue/coms/detailInfoPopup.vue
+++ b/src/pages/issue/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/issue/coms/requestDetailInfoPopup.vue b/src/pages/issue/coms/requestDetailInfoPopup.vue
index d20250bd..377a384e 100644
--- a/src/pages/issue/coms/requestDetailInfoPopup.vue
+++ b/src/pages/issue/coms/requestDetailInfoPopup.vue
@@ -68,7 +68,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/issue/coms/requestInfoPopup.vue b/src/pages/issue/coms/requestInfoPopup.vue
index 8a73b229..433374aa 100644
--- a/src/pages/issue/coms/requestInfoPopup.vue
+++ b/src/pages/issue/coms/requestInfoPopup.vue
@@ -60,7 +60,9 @@
 						title: '到库区代码范围',
 						content: this.dataContent.toAreaCodes,
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 4a9ffd22..d3e76f5f 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -36,7 +36,7 @@
 								用户名
 							</view>
 							<view>
-								<input class="uni-input" placeholder="请输入用户名" v-model="username" />
+								<input class="uni-input" style="padding:25rpx" placeholder="请输入用户名" v-model="username" />
 							</view>
 						</view>
 						<view class="conone">
@@ -44,8 +44,8 @@
 								<image class="icon_normal" src="../../static/icons_ui/icon_login_password.svg"></image>
 								密码
 							</view>
-							<view class="uni-input-wrapper">
-								<input class="uni-input" placeholder="请输入密码" :password="showPassword"
+							<view class="uni-input-wrapper" >
+								<input class="uni-input" style="padding:25rpx" placeholder="请输入密码" :password="showPassword"
 									v-model="password" />
 								<text class="uni-icon" :class="[!showPassword ? 'uni-eye-active' : '']"
 									@click="changePassword">&#xe568;</text>
diff --git a/src/pages/message/index.vue b/src/pages/message/index.vue
index 3035b6a6..fba36d3f 100644
--- a/src/pages/message/index.vue
+++ b/src/pages/message/index.vue
@@ -1,7 +1,8 @@
 <template>
 
-	<view class="body-view msg_body">
+	<view class="">
 		<!-- 头部 -->
+		
 		<scroll-view class="top-menu-view" scroll-x="true" :scroll-left="scrollLeft">
 			<block v-for="(menuTab,index) in menuTabs" :key="index">
 				<view class="menu-topic-view" v-bind:id="'tabNum'+index" @click="swichMenu(index)" clickable>
@@ -39,7 +40,6 @@
 </template>
 
 <script>
-	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import {
 		getMessageList,
 		getMessageUnreadCount,
@@ -52,7 +52,6 @@
 	export default {
 		name: '',
 		components: {
-			comMessage
 
 		},
 
diff --git a/src/pages/productDismantle/coms/detailInfoPopup.vue b/src/pages/productDismantle/coms/detailInfoPopup.vue
index 2fc76f5b..4b64c50c 100644
--- a/src/pages/productDismantle/coms/detailInfoPopup.vue
+++ b/src/pages/productDismantle/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productDismantle/coms/jobInfoPopup.vue b/src/pages/productDismantle/coms/jobInfoPopup.vue
index 2a0ab3f2..91888580 100644
--- a/src/pages/productDismantle/coms/jobInfoPopup.vue
+++ b/src/pages/productDismantle/coms/jobInfoPopup.vue
@@ -36,7 +36,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productDismantle/coms/requestDetailInfoPopup.vue b/src/pages/productDismantle/coms/requestDetailInfoPopup.vue
index 8bc5c446..13ec8997 100644
--- a/src/pages/productDismantle/coms/requestDetailInfoPopup.vue
+++ b/src/pages/productDismantle/coms/requestDetailInfoPopup.vue
@@ -68,7 +68,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productDismantle/coms/requestInfoPopup.vue b/src/pages/productDismantle/coms/requestInfoPopup.vue
index 91c320a4..3a39a00b 100644
--- a/src/pages/productDismantle/coms/requestInfoPopup.vue
+++ b/src/pages/productDismantle/coms/requestInfoPopup.vue
@@ -73,7 +73,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productPutaway/coms/detailInfoPopup.vue b/src/pages/productPutaway/coms/detailInfoPopup.vue
index 2fc76f5b..4b64c50c 100644
--- a/src/pages/productPutaway/coms/detailInfoPopup.vue
+++ b/src/pages/productPutaway/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productPutaway/coms/jobInfoPopup.vue b/src/pages/productPutaway/coms/jobInfoPopup.vue
index 2a0ab3f2..91888580 100644
--- a/src/pages/productPutaway/coms/jobInfoPopup.vue
+++ b/src/pages/productPutaway/coms/jobInfoPopup.vue
@@ -36,7 +36,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productPutaway/coms/requestDetailInfoPopup.vue b/src/pages/productPutaway/coms/requestDetailInfoPopup.vue
index d7a87a60..a5bf0df1 100644
--- a/src/pages/productPutaway/coms/requestDetailInfoPopup.vue
+++ b/src/pages/productPutaway/coms/requestDetailInfoPopup.vue
@@ -56,7 +56,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productPutaway/coms/requestInfoPopup.vue b/src/pages/productPutaway/coms/requestInfoPopup.vue
index 85136228..eea5cfd4 100644
--- a/src/pages/productPutaway/coms/requestInfoPopup.vue
+++ b/src/pages/productPutaway/coms/requestInfoPopup.vue
@@ -56,7 +56,9 @@
 						title: '到库区代码范围',
 						content: this.dataContent.toAreaCodes,
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productReceipt/coms/detailInfoPopup.vue b/src/pages/productReceipt/coms/detailInfoPopup.vue
index 5c5f52a0..ae303440 100644
--- a/src/pages/productReceipt/coms/detailInfoPopup.vue
+++ b/src/pages/productReceipt/coms/detailInfoPopup.vue
@@ -72,7 +72,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productReceipt/coms/jobInfoPopup.vue b/src/pages/productReceipt/coms/jobInfoPopup.vue
index 89c88846..e5513bcc 100644
--- a/src/pages/productReceipt/coms/jobInfoPopup.vue
+++ b/src/pages/productReceipt/coms/jobInfoPopup.vue
@@ -49,7 +49,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productReceipt/coms/productDetailInfoPopup.vue b/src/pages/productReceipt/coms/productDetailInfoPopup.vue
index b6a69898..daed7eea 100644
--- a/src/pages/productReceipt/coms/productDetailInfoPopup.vue
+++ b/src/pages/productReceipt/coms/productDetailInfoPopup.vue
@@ -74,7 +74,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReceipt/coms/detailInfoPopup.vue b/src/pages/productionReceipt/coms/detailInfoPopup.vue
index 7dc7d5f2..ca7f7836 100644
--- a/src/pages/productionReceipt/coms/detailInfoPopup.vue
+++ b/src/pages/productionReceipt/coms/detailInfoPopup.vue
@@ -44,7 +44,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReceipt/coms/jobInfoPopup.vue b/src/pages/productionReceipt/coms/jobInfoPopup.vue
index 764e671f..005efdb1 100644
--- a/src/pages/productionReceipt/coms/jobInfoPopup.vue
+++ b/src/pages/productionReceipt/coms/jobInfoPopup.vue
@@ -45,7 +45,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReturn/coms/comReturnRequestPopup.vue b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
index a7d1c3b1..1206fa20 100644
--- a/src/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -237,7 +237,9 @@
 					this.itemCodeGetFocus();
 				}
 
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeRequestPopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue
index 2a6fdae6..b9175d36 100644
--- a/src/pages/productionReturn/coms/comScanReturnPack.vue
+++ b/src/pages/productionReturn/coms/comScanReturnPack.vue
@@ -168,7 +168,9 @@
 				this.initData();
 				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 				// 	"-" + this.jobContent.subList[0].workStationCode
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			closeScanPopup() {
diff --git a/src/pages/productionReturn/coms/detailInfoPopup.vue b/src/pages/productionReturn/coms/detailInfoPopup.vue
index bb89e506..3c0d9640 100644
--- a/src/pages/productionReturn/coms/detailInfoPopup.vue
+++ b/src/pages/productionReturn/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReturn/coms/jobInfoPopup.vue b/src/pages/productionReturn/coms/jobInfoPopup.vue
index 2a0ab3f2..91888580 100644
--- a/src/pages/productionReturn/coms/jobInfoPopup.vue
+++ b/src/pages/productionReturn/coms/jobInfoPopup.vue
@@ -36,7 +36,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReturn/coms/requestDetailInfoPopup.vue b/src/pages/productionReturn/coms/requestDetailInfoPopup.vue
index 22e6abbe..e9258a9e 100644
--- a/src/pages/productionReturn/coms/requestDetailInfoPopup.vue
+++ b/src/pages/productionReturn/coms/requestDetailInfoPopup.vue
@@ -69,7 +69,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReturn/coms/requestInfoPopup.vue b/src/pages/productionReturn/coms/requestInfoPopup.vue
index 52ca2286..685f2c6b 100644
--- a/src/pages/productionReturn/coms/requestInfoPopup.vue
+++ b/src/pages/productionReturn/coms/requestInfoPopup.vue
@@ -56,7 +56,9 @@
 						title: '到库区代码范围',
 						content: this.dataContent.toAreaCodes,
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/productionReturn/coms/returnDetailInfoPopup.vue b/src/pages/productionReturn/coms/returnDetailInfoPopup.vue
index d01fcc04..4e1973e2 100644
--- a/src/pages/productionReturn/coms/returnDetailInfoPopup.vue
+++ b/src/pages/productionReturn/coms/returnDetailInfoPopup.vue
@@ -46,7 +46,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue b/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
index 52bb66c5..b44816ce 100644
--- a/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
+++ b/src/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue
@@ -86,7 +86,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue b/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue
index 92c401ff..dc5bf8e0 100644
--- a/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue
+++ b/src/pages/purchaseReceipt/coms/receiptInfoPopup.vue
@@ -60,7 +60,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 8411daaa..8fcd6aa0 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -40,6 +40,7 @@
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		<winScanPackAndCont ref="scanPopup" @getResult='getScanResult'></winScanPackAndCont>
 		<comMessage ref="comMessage"></comMessage>
+
 	</view>
 </template>
 
diff --git a/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue b/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
index a22e2d66..b7edbb2e 100644
--- a/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
+++ b/src/pages/purchaseReturn/coms/requestDetailInfoPopup.vue
@@ -88,7 +88,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/purchaseReturn/coms/requestInfoPopup.vue b/src/pages/purchaseReturn/coms/requestInfoPopup.vue
index 98dabe0b..80d32c45 100644
--- a/src/pages/purchaseReturn/coms/requestInfoPopup.vue
+++ b/src/pages/purchaseReturn/coms/requestInfoPopup.vue
@@ -85,7 +85,9 @@
 						title: '从月台代码',
 						content: this.dataContent.fromDockCode
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/purchaseReturn/coms/returnDetailInfoPopup.vue b/src/pages/purchaseReturn/coms/returnDetailInfoPopup.vue
index 7128d112..642fa7ee 100644
--- a/src/pages/purchaseReturn/coms/returnDetailInfoPopup.vue
+++ b/src/pages/purchaseReturn/coms/returnDetailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res=>{
+					this.$refs.popup.open('bottom')
+				},500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/purchaseReturn/coms/returnInfoPopup.vue b/src/pages/purchaseReturn/coms/returnInfoPopup.vue
index 5765e481..abef1359 100644
--- a/src/pages/purchaseReturn/coms/returnInfoPopup.vue
+++ b/src/pages/purchaseReturn/coms/returnInfoPopup.vue
@@ -58,7 +58,10 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res=>{
+					this.$refs.popup.open('bottom')
+				},500)
+				
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/purchaseReturn/coms/returnJobListPopup.vue b/src/pages/purchaseReturn/coms/returnJobListPopup.vue
index 9a17ec18..56759af1 100644
--- a/src/pages/purchaseReturn/coms/returnJobListPopup.vue
+++ b/src/pages/purchaseReturn/coms/returnJobListPopup.vue
@@ -31,6 +31,11 @@
 			openPopup(items) {
 				this.receiptList = items;
 				this.$refs['popupItems'].open("center");
+				// setTimeout(res=>{
+				// 	this.receiptList = items;
+				// 	this.$refs['popupItems'].open("center");
+				// },100)
+				
 			},
 			closePopup() {
 				this.$refs.popupItems.close()
diff --git a/src/pages/putaway/coms/putawayDetailInfoPopup.vue b/src/pages/putaway/coms/putawayDetailInfoPopup.vue
index 7128d112..eef803ff 100644
--- a/src/pages/putaway/coms/putawayDetailInfoPopup.vue
+++ b/src/pages/putaway/coms/putawayDetailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/putaway/coms/putawayInfoPopup.vue b/src/pages/putaway/coms/putawayInfoPopup.vue
index fd6f9882..e3e2e798 100644
--- a/src/pages/putaway/coms/putawayInfoPopup.vue
+++ b/src/pages/putaway/coms/putawayInfoPopup.vue
@@ -36,7 +36,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/putaway/coms/requestDetailInfoPopup.vue b/src/pages/putaway/coms/requestDetailInfoPopup.vue
index d68114d3..21a597b9 100644
--- a/src/pages/putaway/coms/requestDetailInfoPopup.vue
+++ b/src/pages/putaway/coms/requestDetailInfoPopup.vue
@@ -69,7 +69,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/putaway/coms/requestInfoPopup.vue b/src/pages/putaway/coms/requestInfoPopup.vue
index ab530294..d4aed62f 100644
--- a/src/pages/putaway/coms/requestInfoPopup.vue
+++ b/src/pages/putaway/coms/requestInfoPopup.vue
@@ -56,7 +56,9 @@
 					title: '供应商代码',
 					content: this.dataContent.supplierCode,
 				}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
index cf09cdc1..b3a21ed2 100644
--- a/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
+++ b/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue
@@ -173,7 +173,9 @@
 				this.toLocationCode = '请扫目标库位'
 				this.counQty =undefined;
 				this.numberFocus = false
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 				// this.showScanLocation();
 			},
 			closeRequestPopup() {
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 92774423..25684348 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -167,7 +167,9 @@
 				this.initData();
 				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 					"-" + this.jobContent.subList[0].workStationCode
-				this.$refs.popup.open('bottom');
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 
 			closeScanPopup() {
diff --git a/src/pages/repleinsh/coms/repleinshDetailInfoPopup.vue b/src/pages/repleinsh/coms/repleinshDetailInfoPopup.vue
index 7128d112..eef803ff 100644
--- a/src/pages/repleinsh/coms/repleinshDetailInfoPopup.vue
+++ b/src/pages/repleinsh/coms/repleinshDetailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/repleinsh/coms/repleinshInfoPopup.vue b/src/pages/repleinsh/coms/repleinshInfoPopup.vue
index 082a2bd9..88b2e0f8 100644
--- a/src/pages/repleinsh/coms/repleinshInfoPopup.vue
+++ b/src/pages/repleinsh/coms/repleinshInfoPopup.vue
@@ -56,7 +56,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/repleinsh/coms/requestDetailInfoPopup.vue b/src/pages/repleinsh/coms/requestDetailInfoPopup.vue
index d68114d3..21a597b9 100644
--- a/src/pages/repleinsh/coms/requestDetailInfoPopup.vue
+++ b/src/pages/repleinsh/coms/requestDetailInfoPopup.vue
@@ -69,7 +69,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/repleinsh/coms/requestInfoPopup.vue b/src/pages/repleinsh/coms/requestInfoPopup.vue
index 5815fb83..14f9d09d 100644
--- a/src/pages/repleinsh/coms/requestInfoPopup.vue
+++ b/src/pages/repleinsh/coms/requestInfoPopup.vue
@@ -73,7 +73,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/scrap/coms/requestDetailInfoPopup.vue b/src/pages/scrap/coms/requestDetailInfoPopup.vue
index 8b4679fc..4c965d15 100644
--- a/src/pages/scrap/coms/requestDetailInfoPopup.vue
+++ b/src/pages/scrap/coms/requestDetailInfoPopup.vue
@@ -61,7 +61,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/scrap/coms/requestInfoPopup.vue b/src/pages/scrap/coms/requestInfoPopup.vue
index f468e6d3..871a73f8 100644
--- a/src/pages/scrap/coms/requestInfoPopup.vue
+++ b/src/pages/scrap/coms/requestInfoPopup.vue
@@ -43,7 +43,9 @@
 						title: '从库区代码范围',
 						content: this.dataContent.fromAreaCodes,
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/scrap/coms/scrapDetailInfoPopup.vue b/src/pages/scrap/coms/scrapDetailInfoPopup.vue
index 26c801eb..7a5ba512 100644
--- a/src/pages/scrap/coms/scrapDetailInfoPopup.vue
+++ b/src/pages/scrap/coms/scrapDetailInfoPopup.vue
@@ -82,7 +82,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/scrap/coms/scrapInfoPopup.vue b/src/pages/scrap/coms/scrapInfoPopup.vue
index 71a8f427..8bb7ec38 100644
--- a/src/pages/scrap/coms/scrapInfoPopup.vue
+++ b/src/pages/scrap/coms/scrapInfoPopup.vue
@@ -57,7 +57,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/setter/index.vue b/src/pages/setter/index.vue
index ab483ee5..9b616cfc 100644
--- a/src/pages/setter/index.vue
+++ b/src/pages/setter/index.vue
@@ -4,30 +4,22 @@
 			<image src="/static/avatar.png" class="tx"></image>
 			<!-- 	<view class="text">admin</view> -->
 		</view>
-		<view>
-			<uni-list>
-				<!-- <uni-list-item title="工号" clickable @click="onClick" :rightText="usermsg.phoneNumber"></uni-list-item> -->
-				<uni-list-item title="姓名" clickable :rightText="userName" thumb="/static/icon_personal_name.png">
-				</uni-list-item>
-
-				<uni-list-item v-if="userInfo!=null" title="部门" :rightText="userInfo.dept.name"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item v-if="userInfo!=null" title="岗位"
-					:rightText="(userInfo.posts || []).map(post => post.name).join(',')"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item v-if="userInfo!=null" title="角色"
-					:rightText="(userInfo.roles || []).map(role => role.name).join(',')"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item title="" clickable rightText="清除缓存" thumb="/static/icon_personal_name.png"
-					@click="clear"></uni-list-item>
-				<uni-list-item rightText="修改密码" link to="/pages/setter/passwordpage"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<!-- <uni-list-item title="服务器地址" 
-					thumb="/static/icon_personal_password.png"></uni-list-item> -->
-				<!-- 	<uni-list-item title="参数设置" link to="/pages/setter/setterDetail"
-					thumb="/static/icon_personal_setting.png"></uni-list-item> -->
-			</uni-list>
+		<view class="">
+			<u-cell-group >
+				<u-cell-item  icon="account-fill" title="姓名" :arrow="false">{{userName}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="file-text" title="部门" :arrow="false">{{userInfo.dept.name}}</u-cell-item>
+				<u-cell-item v-if="userInfo!=null" icon="photo" title="岗位" :arrow="false">{{(userInfo.posts || []).map(post => post.name).join(',')}}</u-cell-item>
+				<u-cell-item icon="level" v-if="userInfo!=null" title="角色" :arrow="false">{{(userInfo.roles || []).map(role => role.name).join(',')}}</u-cell-item>
+				<u-cell-item icon="trash" title="清除缓存" @click="clear()" ></u-cell-item>
+				<u-cell-item icon="edit-pen" title="修改密码" @click="modifiedPassWord()" ></u-cell-item>
+				<u-cell-item icon="order" title="版本号" :arrow="false">{{version}}</u-cell-item>
+				<!-- #ifdef APP -->
+				<u-cell-item icon="reload" title="检查更新" @click="update">{{version}}</u-cell-item>
+				<!-- #endif -->
+				
+			</u-cell-group>
 		</view>
+		
 		<view>
 			<button class="footbtn" @click="handlerlogout">退出登录</button>
 		</view>
@@ -47,20 +39,31 @@
 	import {
 		removeToken
 	} from '@/common/utils/auth'
+	
+	// #ifdef APP-PLUS
+	import {
+		appUpdate
+	} from "@/common/appUpdate.js"
+	// #endif
 	import {
 		ref,
 		reactive,
-		nextTick
+		nextTick,
+		createApp
 	} from "vue";
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
-	
+	const app = createApp({});
+	// app.component({
+	// });
 
 	const userName = ref(store.state.user.name);
 	let test = ref("123");
+	let version = ref();
 	let userInfo = ref(null);
 	onLoad(() => {
+		getAppVersion()
 		getUserProfile().then(res => {
 			userInfo.value = res.data
 			// nextTick(()=>{
@@ -75,15 +78,23 @@
 	function handlerlogout() {
 		store.dispatch('LogOut', {}).then(() => {
 			clearStorage();
+			// #ifdef H5
 			uni.reLaunch({
 				url: '../login/index'
 			})
+			// #endif
+			
+			// #ifdef APP
+			 plus.runtime.quit()
+			// #endif
+			
 		})
 	};
 
 	function clearStorage() {
 		uni.clearStorageSync()
 		removeToken();
+
 	};
 
 	function clear() {
@@ -93,44 +104,29 @@
 		})
 	}
 
+	function getAppVersion() {
+		const systemInfo = uni.getSystemInfoSync();
+		// #ifdef H5
+		version.value = systemInfo.appVersion;
+		console.log(systemInfo.appVersion, '版本号');
+		// #endif
+
+		// #ifdef APP
+		version.value = systemInfo.appWgtVersion;
+		// #endif
+
+	}
+
+	function update() {
+		console.log("update");
+		appUpdate()
+	}
+	function modifiedPassWord() {
+		uni.navigateTo({
+			url:"./passwordpage"
+		})
+	}
 
-	// export default {
-	// 	data() {
-	// 		return {
-	// 			userName: '',
-	// 			usermsg: {}
-	// 		}
-	// 	},
-	// 	onLoad() {
-	// 	},
-	// 	created() {
-	// 		this.userName = this.$store.getters.name
-	// 	},
-	// 	methods: {
-	// 		handlerlogout() {
-	// 			this.$store.dispatch('LogOut', params).then(() => {
-	// 				uni.reLaunch({
-	// 					url: '../login/index'
-	// 				})
-	// 				this.clearStorage();
-	// 			})
-	// 		},
-	// 		clearStorage() {
-	// 			uni.clearStorageSync()
-	// 			localStorage.clear();
-	// 			sessionStorage.clear();
-	// 			removeToken();
-	// 		},
-
-	// 		clear(){
-	// 			clearCacheData()
-	// 			uni.showToast({
-	// 				title:"清理缓存成功"
-	// 			})
-	// 		}
-
-	// 	}
-	// }
 </script>
 
 <style>
@@ -167,4 +163,4 @@
 		color: #333;
 		line-height: 90rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue b/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue
index 1689d6c4..7ef4023c 100644
--- a/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue
+++ b/src/pages/supplierDeliver/coms/recordDetailInfoPopup.vue
@@ -146,7 +146,9 @@
 						content: this.dataContent.toOwnerCode
 					}
 				]
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/supplierDeliver/coms/recordInfoPopup.vue b/src/pages/supplierDeliver/coms/recordInfoPopup.vue
index 12d5abfb..8eadb471 100644
--- a/src/pages/supplierDeliver/coms/recordInfoPopup.vue
+++ b/src/pages/supplierDeliver/coms/recordInfoPopup.vue
@@ -93,7 +93,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/supplierDeliver/coms/recordListDetailPop.vue b/src/pages/supplierDeliver/coms/recordListDetailPop.vue
index 3a8a98f1..a8dae9b3 100644
--- a/src/pages/supplierDeliver/coms/recordListDetailPop.vue
+++ b/src/pages/supplierDeliver/coms/recordListDetailPop.vue
@@ -72,7 +72,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue b/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue
index 26c801eb..7a5ba512 100644
--- a/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue
+++ b/src/pages/supplierDeliver/coms/recordtDetailInfoPopup.vue
@@ -82,7 +82,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/transfer/coms/detailInfoPopup.vue b/src/pages/transfer/coms/detailInfoPopup.vue
index 2fc76f5b..4b64c50c 100644
--- a/src/pages/transfer/coms/detailInfoPopup.vue
+++ b/src/pages/transfer/coms/detailInfoPopup.vue
@@ -40,7 +40,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/transfer/coms/jobInfoPopup.vue b/src/pages/transfer/coms/jobInfoPopup.vue
index 465fb5a2..ae2a0e95 100644
--- a/src/pages/transfer/coms/jobInfoPopup.vue
+++ b/src/pages/transfer/coms/jobInfoPopup.vue
@@ -45,7 +45,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/unPlanned/coms/comReceiptRequestPopup.vue b/src/pages/unPlanned/coms/comReceiptRequestPopup.vue
index 550d683a..583541fa 100644
--- a/src/pages/unPlanned/coms/comReceiptRequestPopup.vue
+++ b/src/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -154,7 +154,9 @@
 					this.counQty = undefined;
 					this.itemCodeGetFocus();
 				}
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closeRequestPopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/unPlanned/coms/detailInfoPopup.vue b/src/pages/unPlanned/coms/detailInfoPopup.vue
index f9dafe90..be4a5712 100644
--- a/src/pages/unPlanned/coms/detailInfoPopup.vue
+++ b/src/pages/unPlanned/coms/detailInfoPopup.vue
@@ -36,7 +36,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/unPlanned/coms/jobInfoPopup.vue b/src/pages/unPlanned/coms/jobInfoPopup.vue
index 9076bb71..f361f301 100644
--- a/src/pages/unPlanned/coms/jobInfoPopup.vue
+++ b/src/pages/unPlanned/coms/jobInfoPopup.vue
@@ -28,7 +28,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/unPlanned/coms/requestIssDetailInfoPopup.vue b/src/pages/unPlanned/coms/requestIssDetailInfoPopup.vue
index 584178df..0e72cf65 100644
--- a/src/pages/unPlanned/coms/requestIssDetailInfoPopup.vue
+++ b/src/pages/unPlanned/coms/requestIssDetailInfoPopup.vue
@@ -61,7 +61,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/unPlanned/coms/requestIssInfoPopup.vue b/src/pages/unPlanned/coms/requestIssInfoPopup.vue
index eac873df..dc6bf5e5 100644
--- a/src/pages/unPlanned/coms/requestIssInfoPopup.vue
+++ b/src/pages/unPlanned/coms/requestIssInfoPopup.vue
@@ -43,7 +43,9 @@
 						title: '从库区代码范围',
 						content: this.dataContent.fromAreaCodes,
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/unPlanned/coms/requestRecDetailInfoPopup.vue b/src/pages/unPlanned/coms/requestRecDetailInfoPopup.vue
index acb6cb5f..8f8d7992 100644
--- a/src/pages/unPlanned/coms/requestRecDetailInfoPopup.vue
+++ b/src/pages/unPlanned/coms/requestRecDetailInfoPopup.vue
@@ -78,7 +78,9 @@
 		methods: {
 			openPopup(val) {
 				this.dataContent = val;
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/pages/unPlanned/coms/requestRecInfoPopup.vue b/src/pages/unPlanned/coms/requestRecInfoPopup.vue
index d7a281ca..3d6fe239 100644
--- a/src/pages/unPlanned/coms/requestRecInfoPopup.vue
+++ b/src/pages/unPlanned/coms/requestRecInfoPopup.vue
@@ -43,7 +43,9 @@
 						title: '到库区代码范围',
 						content: this.dataContent.toAreaCodes,
 					}];
-				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.$refs.popup.open('bottom')
+				}, 500)
 			},
 			closePopup() {
 				this.$refs.popup.close()
diff --git a/src/static/config.js b/src/static/config.js
index d2bc8acf..d5fe7571 100644
--- a/src/static/config.js
+++ b/src/static/config.js
@@ -1,4 +1,4 @@
-let request_url = "http://dev.ccwin-in.com:25100/api/admin-api"
+let request_url = "http://dev.ccwin-in.com:25102/api/admin-api"
 
 let isDevelopment = true
 
diff --git a/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue b/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
index eb9661bd..b512d803 100644
--- a/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
+++ b/src/uni_modules/vk-uview-ui/components/u-cell-item/u-cell-item.vue
@@ -221,7 +221,7 @@ export default {
 	width: 100%;
 	padding: 10rpx 10rpx 10rpx 10rpx ;
 	font-size: 30rpx;
-	line-height: 40rpx;
+	line-height: 60rpx;
 	color: $u-content-color;
 	background-color: #fff;
 	text-align: left;