From 7a227332a1167bf4fc8bf1dd2616821a929d6349 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 6 Dec 2023 11:27:15 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/inspect/job/inspectDetail.vue | 2 --
 pages/inspect/job/inspectResult.vue | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 9344f778..f1800641 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -194,8 +194,6 @@
 								res.photos = ""
 								res.inspectResult = ""
 							})
-							// that.jobContent.outInventoryStatuses='INSP,OK'
-							that.jobContent.outInventoryStatuses='HOLD'
 							that.fromInventoryStatuses = that.jobContent.outInventoryStatuses  
 							that.detailSource = getDataSource(that.subList);
 						} else {
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index bfadca80..000d765a 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -394,7 +394,7 @@
 							res.photos = ""
 							res.inspectResult = ""
 							res.toInventoryStatus = "NOK"
-							re.inspectUser = this.$store.state.user.id
+							res.inspectUser = this.$store.state.user.id
 						})
 						this.jobContent.nextAction = this.nextAction;
 						this.jobContent.goodQty = 0

From 0ea03011a9e713e44f1c1752472ebcbd36a4cca2 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 6 Dec 2023 16:01:48 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   3 +-
 pages.json                                    | 412 +++++++++---------
 pages/config/config.vue                       |  42 ++
 .../customerReturn/coms/comReturnJobCard.vue  |   8 +-
 pages/customerReturn/job/returnDetail.vue     |  35 +-
 pages/deliver/coms/comScanDeliverPack.vue     |  12 +-
 pages/login/index.vue                         |   8 +
 pages/purchaseReturn/job/returnDetail.vue     |   7 +-
 router/my_router.js                           |   3 +-
 .../iconfont.css}                             |  10 +-
 static/ali_icon/iconfont.ttf                  | Bin 0 -> 2604 bytes
 static/config.json                            |   2 +-
 static/icon/iconfont.css                      |  18 -
 static/icon/iconfont.ttf                      | Bin 1672 -> 0 bytes
 static/icon/iconfont_filter.ttf               | Bin 1696 -> 0 bytes
 static/iconfont.css                           |  32 --
 static/iconfont.ttf                           | Bin 4284 -> 0 bytes
 static/iconfont/iconfont.ttf                  | Bin 1976 -> 0 bytes
 static/scss/index.scss                        |   4 +-
 19 files changed, 309 insertions(+), 287 deletions(-)
 create mode 100644 pages/config/config.vue
 rename static/{icon/iconfont_filter.css => ali_icon/iconfont.css} (64%)
 create mode 100644 static/ali_icon/iconfont.ttf
 delete mode 100644 static/icon/iconfont.css
 delete mode 100644 static/icon/iconfont.ttf
 delete mode 100644 static/icon/iconfont_filter.ttf
 delete mode 100644 static/iconfont.css
 delete mode 100644 static/iconfont.ttf
 delete mode 100644 static/iconfont/iconfont.ttf

diff --git a/App.vue b/App.vue
index fce6d215..32eb067a 100644
--- a/App.vue
+++ b/App.vue
@@ -21,11 +21,12 @@
 	@import "./uni_modules/vk-uview-ui/index.scss";
 	// @import './common/PDA_style.css'; 
 	@import './common/style/new_style.css';
-    @import "./static/icon/iconfont.css";	
 	@import './common/style/uni.css';
 	@import './common/style/pdabasic.css';
 	@import './uni.scss';
 	@import '@/static/scss/index.scss';
+	@import './static/ali_icon/iconfont.css';
+	
 	
     body{
         background-color: #EBEEF0;
diff --git a/pages.json b/pages.json
index 8f8e9dce..b86ffb87 100644
--- a/pages.json
+++ b/pages.json
@@ -34,8 +34,30 @@
 			"style": {
 				"navigationBarTitleText": "登录",
 				"titleNView": {
-					"autoBackButton": "true",
-					"buttons": [{}]
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						// {
+						// 	"float": "right",
+						// 	"fontSize": "52rpx", //按钮上文字的大小
+						// 	"text": "\ue706",
+						// 	"fontSrc": "/static/ali_icon/iconfont.ttf"
+						// }
+						
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/config/config",
+			"style": {
+				"navigationBarTitleText": "配置",
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						
+						
+					]
 				}
 			}
 		},
@@ -66,17 +88,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -101,17 +123,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -139,17 +161,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -174,15 +196,15 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -209,17 +231,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -251,17 +273,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -287,17 +309,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -330,17 +352,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -358,17 +380,17 @@
 						{
 		
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -423,17 +445,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -466,17 +488,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -515,17 +537,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -542,17 +564,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -615,17 +637,17 @@
 						{
 				
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -650,17 +672,17 @@
 						{
 				
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -694,16 +716,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -727,16 +749,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -753,16 +775,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -779,16 +801,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -805,16 +827,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -831,16 +853,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -903,16 +925,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -941,16 +963,16 @@
 				"titleNView": {
 					"buttons": [{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -983,17 +1005,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1026,17 +1048,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1068,17 +1090,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1112,17 +1134,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 				
 						},
 						{
 				
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1148,17 +1170,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1208,17 +1230,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1243,16 +1265,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1278,17 +1300,17 @@
 						{
 
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1312,16 +1334,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1360,16 +1382,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1400,16 +1422,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1443,16 +1465,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1484,16 +1506,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1526,17 +1548,17 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 		
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1560,16 +1582,16 @@
 						// 右边按钮
 						{
 							"float": "right",
-							"fontSize": "23px", //按钮上文字的大小
-							"text": "\ue7c6",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						},
 						{
 		
 							"float": "right",
-							"fontSize": "21px", //按钮上文字的大小
+							"fontSize": "52rpx", //按钮上文字的大小
 							"text": "\ue6e2",
-							"fontSrc": "/static/iconfont/iconfont.ttf"
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
 						}
 					]
 				}
@@ -1648,9 +1670,9 @@
 			"autoBackButton": "true",
 			"buttons": [{
 				"float": "right",
-				"text": "\ue7c6",
-				"fontSrc": "/static/icon/iconfont.ttf",
-				"fontSize": "22px"
+				"text": "\ue696",
+				"fontSrc": "/static/ali_icon/iconfont.ttf",
+				"fontSize": "58rpx"
 			}]
 		},
 		"softinputMode": "adjustPan" //adjustResize
diff --git a/pages/config/config.vue b/pages/config/config.vue
new file mode 100644
index 00000000..25011727
--- /dev/null
+++ b/pages/config/config.vue
@@ -0,0 +1,42 @@
+<template>
+	<view class="" style="background-color: #fff; height: 100%;">
+		<view class="" style="font-size: 35rpx;padding: 15rpx;">
+			请求地址
+		</view>
+		<uni-combox :candidates="candidates" placeholder="请选择请求地址" v-model="city"></uni-combox>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				candidates:["http://192.168.0.178:12080/admin-api(陈放)",
+				"http://192.168.0.178:12080/admin-api"
+					],
+				city:""
+				
+			};
+		},
+	
+		
+	
+		
+	
+		methods: {
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/customerReturn/coms/comReturnJobCard.vue b/pages/customerReturn/coms/comReturnJobCard.vue
index 1d282c73..4691483d 100644
--- a/pages/customerReturn/coms/comReturnJobCard.vue
+++ b/pages/customerReturn/coms/comReturnJobCard.vue
@@ -9,13 +9,7 @@
 
  			<view class="task_text">
  				<view class="">
- 					客户名称 : {{dataContent.customerName}}
- 				</view>
- 			</view>
-
- 			<view class="task_text">
- 				<view class="">
- 					物品代码 : {{dataContent.itemCode}}
+ 					客户代码 : {{dataContent.customerCode}}
  				</view>
  			</view>
  		</view>
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index 7e9e7725..ae34419d 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -95,8 +95,6 @@
 			};
 		},
 		onLoad(option) {
-			console.log("任务id",option.id)
-			console.log("任务状态",option.status)
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收
@@ -277,8 +275,7 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+												itemDetail.handleQty = Number(result.balance.qty)
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
 												itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -290,8 +287,7 @@
 										});
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty)
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = result.balance.qty;
 									itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -363,19 +359,18 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
-						// customerReturnJobSubmit(this.id, params).then(res => {
-						// 	uni.hideLoading()
-						// 	if (res.data) {
-						// 		var hint = res.data.Number;
-						// 		this.showCommitSuccessMessage("提交成功" + hint)
-
-						// 	} else {
-						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-						// 	}
-						// }).catch(error => {
-						// 	uni.hideLoading()
-						// 	this.showErrorMessage(error)
-						// })
+						customerReturnJobSubmit(this.id, params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成客户退货记录:" + res.data)
+
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
 					} else {
 						uni.hideLoading();
 						this.showErrorMessage(res.message);
@@ -394,7 +389,9 @@
 							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.batch);
 							detail.toPackingNumber = info.packingNumber;
+							detail.toContainerNumber = detail.containerNumber;
 							detail.toBatch = info.batch;
+							detail.toLocationCode = detail.toLocationCode;
 							subList.push(detail)
 						}
 					})
diff --git a/pages/deliver/coms/comScanDeliverPack.vue b/pages/deliver/coms/comScanDeliverPack.vue
index 8b02061f..42391651 100644
--- a/pages/deliver/coms/comScanDeliverPack.vue
+++ b/pages/deliver/coms/comScanDeliverPack.vue
@@ -138,7 +138,7 @@
 				fromLocationList: [],
 				fromLocationCode: '',
 				fromLocation: null,
-				issueRecord: [], //补料历史
+				issueRecord: [], //发货历史
 				expand: true,
 				scanOptions: {},
 				editItem: {},
@@ -212,7 +212,7 @@
 				let location = this.fromLocationList.find(r => r == fromlocation)
 				if (location == undefined) {
 					this.fromLocationCode = ''
-					this.showErrorMessage('补料库位【' + fromlocation + '】不存在')
+					this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
 				}
 			},
 			onScan(result) {
@@ -231,7 +231,7 @@
 					let lot = result.label.batch;
 					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
 					if (item == undefined) {
-						that.showErrorMessage('未查找到零件【' + itemCode + '】的补料明细',
+						that.showErrorMessage('未查找到零件【' + itemCode + '】的发货明细',
 							res => {
 								that.getfocus();
 							}
@@ -321,21 +321,21 @@
 						} else {
 							if (this.jobContent.AllowModifyBatch == null) {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
-									'】的补料明细,是否要继续补料?', res => {
+									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
 											let batch = that.createBatchInfo(label, balance);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
 							} else {
-								that.showErrorMessage('未查找到批次【' + lot + '】的补料明细',
+								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
 									res => {
 										that.getfocus();
 									});
 							}
 						}
 					} else {
-						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的补料明细',
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
 							res => {
 								that.getfocus();
 							}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index dd305289..790d8e4a 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -136,6 +136,14 @@
 				backgroundColor: "#476DF5 !important"
 			})
 		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				uni.navigateTo({
+					url:"/pages/config/config"
+				})
+			} 
+		},
 		onLoad() {
 			getCaptchaImage().then(res => {
 				if (res) {
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index be7d1b76..5fd66b57 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -248,7 +248,8 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(qty);
+												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
 												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
@@ -262,13 +263,13 @@
 										});
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(qty);
+									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = result.balance.qty;
 									itemDetail.balance.stdPackQty =result.package.stdPackQty
 									itemDetail.balance.stdPackUnit =result.package.stdPackUnit
-									itemDetail.handleQty = Number(qty);
 									this.calcHandleQty();
 								}
 							}
diff --git a/router/my_router.js b/router/my_router.js
index e0370424..1d6dfc55 100644
--- a/router/my_router.js
+++ b/router/my_router.js
@@ -1,7 +1,8 @@
 //只要是未登录状态，想要跳转到名单内的路径时，直接跳到登录页
 // 页面白名单，不受拦截
 const whiteList = [
-	'/pages/login/index'
+	'/pages/login/index',
+	'/pages/config/config'
 ]
 
 function hasPermission(url) {
diff --git a/static/icon/iconfont_filter.css b/static/ali_icon/iconfont.css
similarity index 64%
rename from static/icon/iconfont_filter.css
rename to static/ali_icon/iconfont.css
index 980b6ae6..8034fb9b 100644
--- a/static/icon/iconfont_filter.css
+++ b/static/ali_icon/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4087030 */
-	src: url('@/static/icon/iconfont_filter.ttf') format('truetype');
+  src: url('/static/ali_icon/iconfont.ttf') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shezhi:before {
+  content: "\e706";
+}
+
+.icon-icon_home:before {
+  content: "\e696";
+}
+
 .icon-guolv:before {
   content: "\e6e2";
 }
diff --git a/static/ali_icon/iconfont.ttf b/static/ali_icon/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..984d072b18127ec867b150ac4a681ae14409b468
GIT binary patch
literal 2604
zcmd^B-)~b@9RGgruioC<Ut7C&T}Rt>tTVK|Ep69Mpc@K|I9xD*L=(&?Tept1Yv~Fy
zo@R^>DpBJPV#Eg$<iYsjL@_4L5Mm+^K7$X02<m16@j+wagX{dBd+!i||G?9nbH6`6
zpYQpebH4Z70s?>v3&2Ba_x@*}48PuY3IGSmdSLJVWO~~tPhBJZH0g&Ys>S*j-}Ia(
z{cq|YPFLoq=CAg20`MPEzfmp~C!?bmUnK00)N^GrSZ?yKko-0Ejpb_dq>BXN-lf4+
zsZA95K|Dv?_eoc(#glbxhrh^AF(Eu#td?Bow|xp=SpeXs>$SON;KG#%fc01M?*z)7
zUszj!LjtJ)G_uv)-vr%4*6IC)8{^Jxe}ZaYZ@u^B5(65~wFQA9ktzentkhT}0q(M(
z)R<MFAHW(@sWHC-DHsB7=g89sz)>kSXQ9i)uk&@Nkwax>x=8U24-$?=MzSDCrd6PH
z-vW`QdzJg1Y;PJ*yaQ<@CI=!<)<?8wrglxj<>fOglD;2w7O+6D|Lz9ICcM9sN^{Z4
z1H=s%mQBtPvNCp@p0sMR3y>pSHg;(F%<}COX^r;cUx~cNdKiW!t4Bb#w*Pyx=^KzW
zw}JM1`Haz7T`k`>Iy;9I+AY?NQ@~L?hrf|Vhh|o&4g7Ex?f~>fG|UcRI*1+z@(~Am
zf|wq{tcLF1NVI_2XcD866Qu|}v%@%qNz^cgx-YjC)45^HF%0=~=@15yVTi|k-VNyS
zhS19}na$+&dYtG$hBCbpMPktzihOJq4H<@*Qh#P3%c$hc_iK9KtvEnw(R5_*w>b1<
z3fSA>ku1Fu*)6`HPLE+nCe4CUa9@5%pR$AF9v>eZ96!c}!Nh1hKKeWxvfrvMr`>7`
zC^6Y9zb4BuMUqhR*`H8dE_J)ZCyJ6tKKV4c6V`wo?M|0UB$r*a2NX?KRmMsxqR0`e
zz*q%h@x)3PtT?f(#9BHR^2=R0cc>9|t17Q(-LY6eQ#e)i^wcBnykF@G5d{4?ceoMs
zC^kXW0$P$m6xAK92R%9B2S3Xnt{=|p10IX*d2UZUPD5<<1tVQS6qQZJ#G90WT`<#i
z+U=BX+*qS#l|&SMj-mBzMM<)121!!_Ht8P8LZpO2iYt;R5NTL-B@*2Um8ZNz^&WT5
zZ}GFdMOs=<qsOhN0$W<VTT=)Tu7^B%zpAfH@aNqd=4fTaO?0zD)^8&I3bzUY=z~1n
z$rz1Tr~-W6OnMmGJl;%CIycbf^A2GYsUVEX$@C6nqpWx~U~gNVRUZF&>z&ZvQ0r|)
zkQJw5EwtOYNqc)i>2e7z*(Q(4wjVx7MaCkjvwt}H9KYjL?DluIev<vFDkWQoY;Ly=
zFQjC?!{2&oQMTFS#l=V}6<NefOR9~1cv!A$7x_#4PRdn-Bwc&#tr%#__G5oEo1;X%
z9t%nxZS*en_WRnhdCX;_y*&}h6GHTMv~dSi>qQ&3e&##V8@bE9na<XAR2-Ifn;v{j
za#&ZlD|Si1fP2jHhT^1G0kK=?8p&iv{H<$<tud?1vUCU=0fJlH4u{(!w0`jfTDMqs
z?QrwnP3<P#xV71r!EMSMSSWMD&XYZ2$^yxoOj)F_c-oXDvKLHQff(#EWtAe<*}W`S
zX`U#&Y|02O_}G*=aKKll%#-~)Qx-_RZptEfVa1dsvag!50teA<$|^*0Vn?G?Y?da&
zN9Myb6Sdi?+H7<Exvw;Ryi#netLx8$rN-P$Z8p4FORbxBmu5?i^)PcMrqj*lRCuaU
ztA<A?Ua3;4h3k#l(b7ayD>s|<Ey*OChuO7>S`~Ic14>YYCXJI2h9fXf;|xqd4Q63V
zADa*9`v^S^$Du;Z#zWo**#`;TfH}gkm|@sVWtMt~wVP10I`YA6=HLX)mZlt=lu?*^
zgCbQ)8Zq-LQ6?3V!*qbmca-8x5L$z>&Z@%}D(vLF^{nGHeVtX~9}KHD_8;a^O+XHL
c6i@_du3S1*p0Tq1A1~LcC2{(At#Sh3AMo68{{R30

literal 0
HcmV?d00001

diff --git a/static/config.json b/static/config.json
index 1c570702..471c6bba 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://192.168.0.178:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
deleted file mode 100644
index 6d78f452..00000000
--- a/static/icon/iconfont.css
+++ /dev/null
@@ -1,18 +0,0 @@
-@font-face {
-	font-family: "iconfont";
-	/* Project id  */
-	/* src: url('iconfont.ttf?t=1653546564489') format('truetype'); */
-	src: url('@/static/icon/iconfont.ttf') format('truetype');
-}
-
-/* .iconfont {
-	font-family: "iconfont" !important;
-	font-size: 16px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.icon-home:before {
-	content: "\e7c6";
-} */
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
deleted file mode 100644
index ddc7c080777b8d20933339a6e7ef1f2ecec7ea04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1672
zcmd^9U27Cq7=F&oWRp$&$ePwjqGg(xwHUjJYof)f7g{$UVv9+G7eXC(XFu$Gb#@dZ
z2#c21(t=)j;g!&fws(a}p`jOENW2lR1fi9nMTpQMUg(|O?Q>?%sx|!weTQ?-^FHs#
zdCxnC0|B514d@u3n*MmN`Sr*dK)gqG=ELc+{O;cmT&DgF^<zcX3LZV4e@^`=M^JI*
z%8%as<1IjUX#c!wTP5?tgD;5hb8N4Y=v>s#6aUJwvFb*ry9gNj7pE@AFIw0ub-lzX
z<yxl$u^JP!ucK~ymTUKZyX!~Vp8#4V@as{n;eATiBedth+Vw`OfujahfU`W!tD?mW
z+3$XSe)W^pyPlyZ@m;)j`-XH(*47;Z`ny!Sps8?~Ny9trixkOr^8;E^rAT`>#<2(5
z2Ze((SmjuehXGkcEYkie7EY~VF@F*%Xp>e!Mj)kF!+^Mi4sQ3Ac8lD_WEFoRFBqwz
zBdLa_f6GVZ{UuyqT3A|$`vLtP8uXAgycA7ts7m4<@yWI%l$cSzhsesPEnIn8@&<-t
zAC?9zEwp(4WTu{+07BOPf0q?;1J<iH#J!T8qMrN(dC&RxT6gpX-n2DXi%mdUY|0LG
ziqsox-xry;Gu!gpC&cjNwjG(_$%*W!7)osr!<pf<(0^*49Y_zPo29<&;AZXG=-^1R
z9t6K#>Carv^j|q9LVjP0a|3DVGC9(m7lo0@=J&VGH0K{?`uj5vML~Slyck!v28*gD
zpzlR}@+S5vUPC7a71qfQDQpmLR=9(&Mqc3*`P~Y4V-))p?qSA2-Y6r@eX=;Ous|<<
zP*}q%{GzZ<{-(kP@m+;G*sUdnQ{?|vxEr%#rNTYPisHV|wj#S^9-lL7Mc*s?UesO>
z+m(}!6}Hv(I%|jZn(vugbK`Al%J%HAou+=Ol8>UYSq^>IEHIz#IKCN#{t3Gn<*HE>
z>>L}D`$#@l^j+*j2pbk6&Lx;QjycXX6yd`|Ii90s`eAxka1st9!)4ajqi5+IqE0`V
z)5KOjhU3ekrs(Cxp08I^$0_cXXN?gnGC4wKa)}D6KAV*|#3p~Bw4Gp{BE55{#!&%w
iVvJw=JZ=A6d`>rcG39lWZ{~lACN!bLsQRug&Hn(l_wN}1

diff --git a/static/icon/iconfont_filter.ttf b/static/icon/iconfont_filter.ttf
deleted file mode 100644
index aa26b1026a88bc2be7acd2f1865e8588a79fae10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1696
zcmd^9&2JM&9DTF9wi6qi1e-J^NZowYsak3$PMTII1ysOkr9$~gb3&qvy|#na-qm^&
zk)9$UAyE+YfH?Kko_a%#RJBqoapS^?L%CEDjUYv8k3~IU_s#AYDCvLDS?$dGz2C>Y
znf+-Y0Hm-69h38?KmEYG^7`k1c#rJDC#MU=xxYX9j`mgBpOqVy_c-~(3EF@0^=i&)
zb?WPbcL3d?|Es!fRmMMje3SSA-`P5e#D;#6_$R*O^+s@^hk&_%a_Vv1vW4T))+?Oi
z4eNp@`Y=cT5N)$*HSGRx=57H7)3loBwt|gIUW=g~{RL3FzSdd88G|OHm>7cRlNK^$
zb6>nYa<*^o2~tt)gB$lw%CKndtQ*je(CmSxl4T_gle`x>B%9;|bfn24{Ym-{Ks!?U
zcmZk03Yyp>MTA58U&O*$s#&ZbWeWPFSCA2iE7mX|zC?`MUDocByB@9L4-|#G0mLFT
zbp3mrs2;80_SWXsW_Taaf5jRjq=x51lN%~Y+#@{MzK9YFD)u;8nYE8APfOmwXc$9j
zz}9Am=Z|LE(Fq`={{Q>f5njMvbq(QN$(y1beFfR){Cb^r{d;!WF!JnQ#6}Au_s+n~
zgqX<9%ubIK2eSzg-#w5`i?NAU24>zBvopD|k<obeH6aFf4`>Ui-t`@#{ZJn&j%&Ba
zria@1MKYbZ5oE<1@pSLgL&=?SLkwq*C9Wm=L|zE7*Vt2<o-V!G{zZuPvEKf~&u4@`
z%<x1eoz5hT_M_}@`!^|j7dDhuAoEPO?9hzjH6*A!I*(3%RAGboO@(9pn-mp}lYd{~
zB;LYNg;T8P$xbtRxlaxk6&C2nw+d@W<41*c@^=(Ai0>;L!ytZFI8Oel!bvQOoeHOr
z6XnCcZ3TA4Jhy5tmEC65Z3f--lwDhPEWc}Z*G1cJExAo|DnHq!=Iy5KcgwU^YQ-R^
znpNLzm?hS;9mh32-#u@agM2**y#0lO+(+{HvfIF6_^@Fi;9P-;b6DlPgfd(-Q4Qx{
zn|+GWH7vtnroYYma`qyleY6-SYnqs1n@w)ZnrBoqjC@&53oG2MNR0s%nS6a#Y7mu_
zKATD$Vv`?G`p&aXnbCRF!z>T`+1Q0==jq1h!*e#GKdJ0C`7iyip$Sdsh}D)|XNCTM
E0J6L1Q2+n{

diff --git a/static/iconfont.css b/static/iconfont.css
deleted file mode 100644
index 18cf80a4..00000000
--- a/static/iconfont.css
+++ /dev/null
@@ -1,32 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id  */
-  src: url('@/static/iconfont.ttf') format('truetype');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-link:before {
-  content: "\e772";
-}
-
-.icon-poweroff:before {
-  content: "\e774";
-}
-
-.icon-safety-certificate:before {
-  content: "\e776";
-}
-
-.icon-chart-pie-alt:before {
-  content: "\e78c";
-}
-
-.icon-kongxincai:before {
-  content: "\e642";
-}
diff --git a/static/iconfont.ttf b/static/iconfont.ttf
deleted file mode 100644
index 2b132b606c3b5c19f2b6d19da6079e3e85b73d82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4284
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
KQmZb4-TwlL+f^O_

diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
deleted file mode 100644
index 60c761731df72501cd1ee0ed219c03d36fa98e10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1976
zcmd^A-EZ4e6hFsy?8aHsx=BB1_;8yxMeRtsB+bw$2<;=4fC1V{pC(Z^agtU^oH=gQ
zPC}|c2q6&L0|-<hfi%AMG9il4C_^eQ<z){%pjJX?8dYg4!Q&7w%;j9$p=0Gg;9B?I
z-}#-7d+zbQHXr~5U=es29y|NOarKS<3jp{ivE$F3O(aMEeEL(8-z0f5SJ7(Mz8n0A
z<iDuDUo0;aqz@9;0C>jbOS+ctdul}`+gsE#B_gDo{HuhoQ|~KPtoc>~Wcxb}tz{#p
z!ELxi{_l}2SG4&WDlkg=E|S%%R?%B8kA4o|YXabkHKT4N-pzahAk|2p1<IXY+*^cm
z0*L@LvfbR>1cxEE|LV}~7h6XEfPiaz>z!{pn4vrGEepV(B(VuN&z(gQV3_K{8e?U8
z0QQ(jjp=35KLOmy>@(vKENfO3x>*uVbN%-*mZysv#dkfC?3g7IgCKgWK<QorA1(Jf
zcZ0Z#?u@@d5?KYn=Vn8yf4Aogr}D76y}7&L)C2gRVUa9Y4*QK`3*OyHq_vzK9(Gk&
z@_eR<W!{Hrrd<;+K!)Tdw?f;SJ8QcedsK^kL|S)0%!Vb4EHbja{omUmrvPcM3{;iv
zO}DdiwX^1SR`1;nw>$3y;5gllFUX5L_I~8o_(z}(I$!|6j{~t@3B_>7W2p2fsbnUN
z(UH_qB|4Ih4PmeN07jLlANghbrEY(>-_D0(kwNaup-8`7uho89>Qp{dI+rHVq~|q!
zx!cc7M*8g)%=VAipWV1%uWTuuoyrzw@w|P}%VC-Sif%~+;*g-D)0@E9h>{+lT+*3T
zPqHIS8MQ0nAVvo|mGn`}q+`*ZUNQU-Vn@5ejR*Y8htS^QyOMp}YBbelZ=f8M-nPQ{
zuo(2;c~Wi`1&oAFOK-_77)QkWh3;%BmA%hiN3>7-TcvN$p&21_DHIHbB*FeQ9I=1#
z&N+XcTLt>O__00Qf+D4cF()m4#$FdErI5WYH3hiqvY-3dUiv{2pOs`8AH+gaTbuJ{
z+Tf;l`T;`3xVMMh(2$2YkZAWV&lBJ4VS(_Vhkf)lO?p@){&5e>Fa)PO9H59bdaEe-
zX`L9n;$fuxuXvb)Abjm%p7`%QED+xCu#Zl|j)z6!?|4{-32gRo0AiRsVd|Qt=hdkN
zbvkEM3r5vy%xCoCY*{lKVq>1r&HA)aRgc7n8`PLy)y+nj`dl$-Sp~IV8WlB5@$_=p
zP-~_!qvx!6$+Bw45(%~r<KsD_0w=%(9W=0L%!3M3ut4K9<iLO`6r9mIAfF-YBFsXW
zJk0~zd%Y*f+JrjUv6w0xp`$u{z-x@Gs*dHo+0<c<R!dTj7G<PTHz`tuP}a*&r%cL(
zReFI;H$!o9WF3c+<5h!WbU70L?5ANLclKFv|0L|Vv46>bH32!~Q9vIEC8MJIinB&}
RuDM>)rsrq1sv|MCzX9ioEs_8L

diff --git a/static/scss/index.scss b/static/scss/index.scss
index 745cffa2..0ae6983d 100644
--- a/static/scss/index.scss
+++ b/static/scss/index.scss
@@ -1,6 +1,4 @@
 // global
 @import "./global.scss";
 // color-ui
-@import "@/static/scss/colorui.css";
-// iconfont
-@import "@/static/font/iconfont.css";
\ No newline at end of file
+@import "@/static/scss/colorui.css";
\ No newline at end of file

From 9121f3e859c01086a3bf4ab13d3c00b01bcb402e Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 6 Dec 2023 18:17:49 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/job/jobDetailPopup.vue           |  2 +-
 mycomponents/recommend/recommend.vue          |  2 +-
 pages/inspect/coms/inspectComDetailCard.vue   | 43 ++++++++++++-------
 pages/inspect/coms/inspectEdit.vue            |  3 +-
 pages/inspect/job/inspectDetail.vue           |  8 ++--
 pages/inspect/job/inspectResult.vue           | 23 ++++++++--
 .../inspect/request/inspectRequestDetail.vue  |  4 +-
 7 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/mycomponents/job/jobDetailPopup.vue b/mycomponents/job/jobDetailPopup.vue
index 611bdd03..07cd68ea 100644
--- a/mycomponents/job/jobDetailPopup.vue
+++ b/mycomponents/job/jobDetailPopup.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<uni-popup ref="popup">
-			<detail-common-info :dataContent='dataContent'></detail-common-info>
+			<detail-common-info :dataContent='dataContent' @onClose="closeScanPopup()" ></detail-common-info>
 		</uni-popup>
 	</view>
 </template>
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index 44fb58d0..ffbbedd7 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -11,7 +11,7 @@
 				</location>
 			</view>
 			<view>
-				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
+				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined||detail.handleQty==0" :dataContent="detail"
 					:isShowStdPack="false"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
diff --git a/pages/inspect/coms/inspectComDetailCard.vue b/pages/inspect/coms/inspectComDetailCard.vue
index cae19e61..e788e4ff 100644
--- a/pages/inspect/coms/inspectComDetailCard.vue
+++ b/pages/inspect/coms/inspectComDetailCard.vue
@@ -1,23 +1,33 @@
 <template>
 	<view class="" style="background-color: #fff;">
 		<view class="">
-			<view class="" style="font-size: 32rpx;margin-left: 20rpx;">
-				<view class="">
-					检验类型 : {{getInspectType(jobContent.inspectType)}}
-				</view>
-				<view class="">
-					收货数量 : {{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}
-				</view>
-				<view class="">
-					检验数量 : {{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}}
-				</view>
-				<view class="">
-					不合格数量 : {{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}
-				</view>
-				<view class="">
-					报废数量 : {{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}
+			
+			<view class="cen_card" style="padding: 20rpx;">
+				<view class="cell_box uni-flex uni-row">
+					<view class="cell_info">
+						<view class="text_lightblue">类型</view>
+						<view>{{getInspectType(jobContent.inspectType)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">收货数</view>
+						<view>{{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">检验数</view>
+						<view>{{jobContent.sampleQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">不合格数</view>
+						<view>{{jobContent.failedQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
+					<view class="cell_info">
+						<view class="text_lightblue">报废数</view>
+						<view>{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view>
+					</view>
 				</view>
+				<u-line />
 			</view>
+			
 		</view>
 		<u-line />
 		<uni-collapse ref="collapse1" @change="">
@@ -168,7 +178,7 @@
 
 			detail(item) {
 				this.showItem = item;
-				this.$refs.receiptHint.openScanPopup()
+				this.$refs.receiptHint.openScanPopup(item)
 			},
 			remove(item) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
@@ -181,6 +191,7 @@
 							item.notPassedQty = 0;
 							item.inspectResult =""
 							item.failedReason =""
+							item.handleQty =0;
 							item.photos =""
 							this.$forceUpdate()
 							this.$emit('remove', item)
diff --git a/pages/inspect/coms/inspectEdit.vue b/pages/inspect/coms/inspectEdit.vue
index 27157e93..9857f87b 100644
--- a/pages/inspect/coms/inspectEdit.vue
+++ b/pages/inspect/coms/inspectEdit.vue
@@ -100,7 +100,7 @@
 			openEditPopup(item) {
 				this.failedReasonArray = getInspectFailedReasonList();
 				//拷贝数据到页面显示，防止修改数据原数据修改
-				Object.assign(this.dataContent, item)
+				this.dataContent = Object.assign({}, item)
 				this.$refs['editPopup'].open("bottom");
 			},
 
@@ -138,6 +138,7 @@
 				this.dataContent.failedQty = failedQty;
 				this.dataContent.crackQty = crackQty
 				this.dataContent.goodQty = this.dataContent.handleQty -failedQty-crackQty
+				debugger
 				this.afterSave()
 
 
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index f1800641..e32a286a 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -291,8 +291,7 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+												itemDetail.handleQty = Number(result.balance.qty)
 												itemDetail.balance = result.balance;
 												this.calcHandleQty();
 											} else {
@@ -302,8 +301,7 @@
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.balance = result.balance;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
-										result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty)
 									this.calcHandleQty();
 								}
 							}
@@ -370,7 +368,7 @@
 				inspectJobSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data, )
+						this.showCommitSuccessMessage("提交成功<br>生成到货检验记录" + res.data)
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index 000d765a..e24ad139 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -51,7 +51,7 @@
 					<view class="uni-label">不合格数量</view>
 				</view>
 				<view class="pda-list-cell-db">
-					<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty"
+					<uni-easyinput :inputBorder="true" type="number" placeholder="请输入数字" v-model="jobContent.failedQty" @clear="clearFailedQty"
 						@blur="failedQtyConfirm" class="count-input">
 					</uni-easyinput>
 				</view>
@@ -63,7 +63,7 @@
 					<view class="uni-label">报废数量</view>
 				</view>
 				<view class="pda-list-cell-db">
-					<uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur=""
+					<uni-easyinput placeholder="请输入数字" type="number" v-model="jobContent.crackQty" @blur="" @clear="clearCrackQty"
 						class="count-input">
 					</uni-easyinput>
 				</view>
@@ -155,6 +155,10 @@
 		getInspectType,
 		getUnitInfo
 	} from '@/common/directory.js';
+	
+	import {
+		goHome
+	} from '@/common/basic.js';
 
 	export default {
 		components: {
@@ -181,6 +185,12 @@
 
 			}
 		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
 		onLoad(option) {
 			this.id = option.id;
 			this.status = option.status;
@@ -317,7 +327,14 @@
 					}
 				}
 			},
-
+			
+			clearFailedQty(){
+				this.jobContent.failedQty = null;
+			},
+			
+			clearCrackQty(){
+				this.jobContent.crackQty = null
+			},
 
 			commit() {
 
diff --git a/pages/inspect/request/inspectRequestDetail.vue b/pages/inspect/request/inspectRequestDetail.vue
index a74b28ba..26e6c558 100644
--- a/pages/inspect/request/inspectRequestDetail.vue
+++ b/pages/inspect/request/inspectRequestDetail.vue
@@ -5,10 +5,10 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
 					<view class="" style="font-size: 35rpx;">
-						发货单号 :
+						单据号 : {{jobContent.number}}
 					</view>
 					<view class="" style="font-size: 35rpx;">
-						<text>供应商 : </text>
+						<text>供应商代码 :  {{jobContent.supplierCode}} </text>
 					</view>
 				</view>
 				<u-line />

From e90c330c774576c725362fec7638bb55cf9a249c Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 6 Dec 2023 19:11:31 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/basic.js                               | 14 +++++++++++++-
 pages/customerReturn/job/returnDetail.vue     |  3 +--
 pages/inspect/job/inspectDetail.vue           | 19 +++++++++++++++----
 pages/inspect/job/inspectResult.vue           | 11 +++++------
 .../inspect/request/inspectRequestDetail.vue  |  6 +++---
 static/config.json                            |  2 +-
 6 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/common/basic.js b/common/basic.js
index 45b24ed5..ba15c4d1 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -877,5 +877,17 @@ export function updateTitle(title) {
 }
 
 export function clearTirmAndWrap(content) {
-	return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g,'')
+	return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g, '')
+}
+
+export function navigateBack(backIndex) {
+	let canNavBack = getCurrentPages()
+	console.log("返回",canNavBack.length )
+	if (canNavBack && canNavBack.length - 1 > backIndex) {
+		uni.navigateBack({
+			delta: backIndex
+		})
+	} else {
+		history.back();
+	}
 }
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index ae34419d..8affa224 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -359,11 +359,10 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
-						customerReturnJobSubmit(this.id, params).then(res => {
+						customerReturnJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
 								this.showCommitSuccessMessage("提交成功<br>生成客户退货记录:" + res.data)
-
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index e32a286a..99904637 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -42,6 +42,7 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		navigateBack
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName,
@@ -312,8 +313,12 @@
 					this.showErrorMessage(e.message);
 				}
 			},
+			commit(){
+				this.showCommitSuccessMessage("提交成功")
+			},
 
-			commit() {
+			commits() {
+				
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
@@ -476,9 +481,15 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './inspectJob'
-					})
+					// let canNavBack = getCurrentPages()
+					// if( canNavBack && canNavBack.length>1) {  
+					//     uni.navigateBack({
+					// 	delta:2
+					// }) 
+					// } else {  
+					//     history.back();  
+					// }
+					navigateBack(2);
 				})
 
 			},
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index e24ad139..840141b8 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -157,7 +157,8 @@
 	} from '@/common/directory.js';
 	
 	import {
-		goHome
+		goHome,
+		navigateBack
 	} from '@/common/basic.js';
 
 	export default {
@@ -382,7 +383,7 @@
 					} else {
 						//报废数大于0，进入详情
 						//进入下一页面
-						uni.navigateTo({
+						uni.redirectTo({
 							url: './inspectDetail?id=' + this.id +
 								'&status=' + this.status +
 								'&failedQty=' + this.jobContent.failedQty +
@@ -419,7 +420,7 @@
 						//部分合格
 					} else if (this.nextAction == "PARTIAL_OK") {
 						//进入下一页面
-						uni.navigateTo({
+						uni.redirectTo({
 							url: './inspectDetail?id=' + this.id +
 								'&status=' + this.status +
 								'&failedQty=' + this.jobContent.failedQty +
@@ -475,9 +476,7 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './inspectJob'
-					})
+					navigateBack(1)
 				})
 			},
 			showErrorMessage(message) {
diff --git a/pages/inspect/request/inspectRequestDetail.vue b/pages/inspect/request/inspectRequestDetail.vue
index 26e6c558..78d19a77 100644
--- a/pages/inspect/request/inspectRequestDetail.vue
+++ b/pages/inspect/request/inspectRequestDetail.vue
@@ -5,10 +5,10 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
 					<view class="" style="font-size: 35rpx;">
-						单据号 : {{jobContent.number}}
+						单据号 : {{requestContent.number}}
 					</view>
 					<view class="" style="font-size: 35rpx;">
-						<text>供应商代码 :  {{jobContent.supplierCode}} </text>
+						<text>供应商代码 :  {{requestContent.supplierCode}} </text>
 					</view>
 				</view>
 				<u-line />
@@ -93,7 +93,7 @@
 						that.showMessage('未获取到详情');
 					} else {
 					if (res.data.subList.length > 0) {
-						that.jobContent = res.data;
+						that.requestContent = res.data;
 						that.subList = res.data.subList;
 						that.detailSource = getDataSource(that.subList)
 						// that.subList = res.data[0];
diff --git a/static/config.json b/static/config.json
index 471c6bba..4f688e61 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.178:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",

From 7169af26b39f693418065ed5efd03eeda6586889 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 7 Dec 2023 08:58:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request2.js                               |   6 +-
 common/basic.js                               |   1 -
 mycomponents/scan/winScanPackAndLocation.vue  |   2 +-
 pages/inspect/job/inspectDetail.vue           |   6 +-
 pages/inspect/job/inspectResult.vue           |   4 +-
 .../coms/comReturnJobCard.vue                 |  18 ++--
 pages/productionReturn/job/returnDetail.vue   | 100 +++++++++---------
 pages/purchaseReceipt/job/receiptDetail.vue   |  17 +--
 pages/purchaseReturn/job/returnDetail.vue     |   5 +-
 pages/purchaseReturn/record/returnRecord.vue  |   7 +-
 pages/putaway/job/putawayDetail.vue           |   5 +-
 static/config.json                            |   2 +-
 12 files changed, 77 insertions(+), 96 deletions(-)

diff --git a/api/request2.js b/api/request2.js
index 1db71757..45b1d8b6 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -2234,7 +2234,7 @@ export function getProductionReturnJobDetail(id) {
  */
 export function takeProductionReturnJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/productionreturn-job-main/accept?id=" + id,
 		method: "put",
 		data: {},
 	});
@@ -2247,7 +2247,7 @@ export function takeProductionReturnJob(id) {
  */
 export function cancleTakeProductionReturnJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/productionreturn-job-main/abandon?id=" + id,
 		method: "put",
 		data: {},
 	});
@@ -2260,7 +2260,7 @@ export function cancleTakeProductionReturnJob(id) {
  */
 export function productionReturnJobSubmit(params) {
 	return request({
-		url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit",
+		url: baseApi + "/wms/productionreturn-job-main/execute",
 		method: "put",
 		data: params,
 	});
diff --git a/common/basic.js b/common/basic.js
index ba15c4d1..68e219a3 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -882,7 +882,6 @@ export function clearTirmAndWrap(content) {
 
 export function navigateBack(backIndex) {
 	let canNavBack = getCurrentPages()
-	console.log("返回",canNavBack.length )
 	if (canNavBack && canNavBack.length - 1 > backIndex) {
 		uni.navigateBack({
 			delta: backIndex
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 8e91fa81..e84e4197 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -136,7 +136,7 @@
 						this.fromLocationCode = this.fromLocationList[0];
 					}
 				}
-				this.$refs.popup.open('bottom');
+				this.$refs.popup.open('bottom');  
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 99904637..f79f0cb3 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -313,12 +313,8 @@
 					this.showErrorMessage(e.message);
 				}
 			},
-			commit(){
-				this.showCommitSuccessMessage("提交成功")
-			},
 
-			commits() {
-				
+			commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
diff --git a/pages/inspect/job/inspectResult.vue b/pages/inspect/job/inspectResult.vue
index 840141b8..3946deaa 100644
--- a/pages/inspect/job/inspectResult.vue
+++ b/pages/inspect/job/inspectResult.vue
@@ -383,7 +383,7 @@
 					} else {
 						//报废数大于0，进入详情
 						//进入下一页面
-						uni.redirectTo({
+						uni.navigateTo({
 							url: './inspectDetail?id=' + this.id +
 								'&status=' + this.status +
 								'&failedQty=' + this.jobContent.failedQty +
@@ -420,7 +420,7 @@
 						//部分合格
 					} else if (this.nextAction == "PARTIAL_OK") {
 						//进入下一页面
-						uni.redirectTo({
+						uni.navigateTo({
 							url: './inspectDetail?id=' + this.id +
 								'&status=' + this.status +
 								'&failedQty=' + this.jobContent.failedQty +
diff --git a/pages/productionReturn/coms/comReturnJobCard.vue b/pages/productionReturn/coms/comReturnJobCard.vue
index 0c128100..9f4c26ec 100644
--- a/pages/productionReturn/coms/comReturnJobCard.vue
+++ b/pages/productionReturn/coms/comReturnJobCard.vue
@@ -9,15 +9,10 @@
 
 			<view class="task_text">
 				<view class="">
-					物品代码 : {{dataContent.itemCode}}
+					业务类型 : {{getBusinessTypeName(dataContent.businessType)}}
 				</view>
 			</view>
 
-			<view class="task_text">
-				<view class="">
-					目标库位 : {{dataContent.toLocationCode}}
-				</view>
-			</view>
 		</view>
 	</job-com-main-card>
 </template>
@@ -40,7 +35,16 @@
 		},
 
 		methods: {
-
+			getBusinessTypeName(value) {
+				var name = "";
+				if (value == 'ReturnToStore') {
+					name = "合格退料"
+				} else if (value == 'ReturnToHold') {
+					name = "隔离退料"
+				}
+				return name;
+
+			}
 		}
 	}
 </script>
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 8ab84e96..915013ad 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -14,14 +14,14 @@
 			</scroll-view>
 		</view>
 
-		
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation title="目标库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation==1"
-						@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
+					<requiredLocation title="目标库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -37,7 +37,6 @@
 </template>
 
 <script>
-
 	import {
 		getProductionReturnJobDetail,
 		productionReturnJobSubmit,
@@ -53,12 +52,12 @@
 		getDirectoryItemArray,
 		getInventoryStatusName
 	} from '@/common/directory.js';
-	
+
 	import {
 		getManagementPrecisions
 	} from '@/common/balance.js';
-	
-	
+
+
 	import {
 		getDataSource,
 		createRecordInfo,
@@ -105,15 +104,14 @@
 			this.id = option.id;
 			if (this.id != undefined) {
 				// //新建的任务自动接收
-				// if (option.status == "JOB_PENDING") {
-				// 	this.receive((callback => {
-				// 		this.received = true;
-				// 		this.getDetail();
-				// 	}));
-				// } else {
-				// 	this.getDetail();
-				// }
-				this.getDetail();
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.received = true;
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
 			}
 		},
 		//返回首页
@@ -268,11 +266,11 @@
 										']不一致,是否继续上架?', res => {
 											if (res) {
 												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty)>Number(result.balance.qty)?Number(result.balance.qty):Number(result.label.qty);
+												itemDetail.handleQty = Number(result.balance.qty)
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty =result.package.stdPackQty
-												itemDetail.balance.stdPackUnit =result.package.stdPackUnit
+												itemDetail.balance.stdPackQty = result.package.stdPackQty
+												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 												this.calcHandleQty();
 											} else {
 												this.scanPopupGetFocus();
@@ -280,11 +278,11 @@
 										});
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty)>Number(result.balance.qty)?Number(result.balance.qty):Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty)
 									itemDetail.balance = result.balance;
 									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty =result.package.stdPackQty
-									itemDetail.balance.stdPackUnit =result.package.stdPackUnit
+									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}
 							}
@@ -337,7 +335,7 @@
 				}
 			},
 
-			async submitJob() {
+			 submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -347,7 +345,7 @@
 				this.detailSource.forEach(item => {
 					itemCodes.push(item.itemCode)
 				})
-				
+
 				var param = {
 					itemCode: itemCodes,
 					locationCode: this.toLocationCode
@@ -355,22 +353,20 @@
 				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						 var params = this.setParams()
-						 console.log("提交参数",JSON.stringify(params));
-						
-						// productionReturnJobSubmit(this.id, params).then(res => {
-						// 	uni.hideLoading()
-						// 	if (res.data) {
-						// 		var hint = res.data.Number;
-						// 		this.showCommitSuccessMessage("提交成功" + hint)
-						
-						// 	} else {
-						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-						// 	}
-						// }).catch(error => {
-						// 	uni.hideLoading()
-						// 	this.showErrorMessage(error)
-						// })
+						var params = this.setParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						productionReturnJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成生产退料记录:" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
 					} else {
 						uni.hideLoading();
 						this.showErrorMessage(res.message);
@@ -381,30 +377,33 @@
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
-				
+
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.batch);
-								detail.toPackingNumber =info.packingNumber;
-								detail.toBatch =info.batch;
+							detail.toPackingNumber = detail.packingNumber;
+							detail.toContainerNumber = detail.containerNumber;
+							detail.toBatch = detail.batch;
+							
+							detail.toLocationCode = detail.toLocationCode;
 							subList.push(detail)
 						}
 					})
 				})
 				this.jobContent.subList = subList
-				this.jobContent.creator =creator;
+				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
-			
+
 			checkLocation() {
 				var isPass = true;
-				if (this.toLocationCode == ""||this.toLocationCode == null) {
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.showMessageHint('请扫描收货库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
-			
+
 					return isPass = false;
 				}
 				return isPass;
@@ -448,7 +447,7 @@
 			scanPopupLoseFocus() {
 				this.$refs.scanPopup.packLoseFocus();
 			},
-			
+
 			showQuestionMessage(message, callback) {
 				setTimeout(r => {
 					this.scanPopupLoseFocus();
@@ -463,13 +462,10 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-
-				})
-				setTimeout(() => {
 					uni.navigateTo({
 						url: './returnJob'
 					})
-				}, 3000)
+				})
 			},
 		}
 	}
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 76488b19..25262234 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -46,7 +46,8 @@
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		updateTitle,
-		compareAsc
+		compareAsc,
+		navigateBack
 	} from '@/common/basic.js';
 
 	import {
@@ -417,21 +418,9 @@
 			},
 
 
-			closeCommitMessage() {
-				setTimeout(() => {
-					uni.navigateTo({
-						url: './receipt'
-					})
-				})
-				//点关闭直接返回列表
-				uni.hideLoading();
-			},
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './receiptJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 5fd66b57..fbe9d4fa 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -53,6 +53,7 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		navigateBack
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName
@@ -419,9 +420,7 @@
 
 			showCommitSuccessMessage(number) {
 				this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
-						uni.navigateTo({
-							url: './returnJob'
-						})
+						navigateBack()
 				})
 			}
 		}
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index d0aa5b87..060b49ad 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -44,7 +44,8 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
+		navigateBack
 	} from '@/common/basic.js';
 
 	import {
@@ -381,9 +382,7 @@
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
 					if (this.fromType == "requestType") {
-						uni.navigateTo({
-							url: '../request/issueRequest'
-						})
+						navigateBack(1)
 					}else {
 						//清空
 						this.subList = [];
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 3e776b2d..567c648f 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -54,6 +54,7 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		navigateBack
 	} from '@/common/basic.js';
 
 	import {
@@ -499,9 +500,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './putawayJob'
-					})
+					navigateBack(1)
 				})
 			},
 		}
diff --git a/static/config.json b/static/config.json
index 4f688e61..1c570702 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
+			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",