Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

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;

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,
 	});

common/basic.js

@@ -877,5 +877,16 @@ 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()
+	if (canNavBack && canNavBack.length - 1 > backIndex) {
+		uni.navigateBack({
+			delta: backIndex
+		})
+	} else {
+		history.back();
+	}
 }

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>

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">

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); //出库库存状态

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

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>

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>

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,17 @@
 						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(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 +388,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)
 						}
 					})

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();
 							}

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)

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()
 
 

pages/inspect/job/inspectDetail.vue

@@ -42,6 +42,7 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		navigateBack
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName,
@@ -194,8 +195,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 {
@@ -293,8 +292,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 {
@@ -304,8 +302,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();
 								}
 							}
@@ -372,7 +369,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 + "]")
 					}
@@ -480,9 +477,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);
 				})
 
 			},

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,11 @@
 		getInspectType,
 		getUnitInfo
 	} from '@/common/directory.js';
+	
+	import {
+		goHome,
+		navigateBack
+	} from '@/common/basic.js';
 
 	export default {
 		components: {
@@ -181,6 +186,12 @@
 
 			}
 		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
 		onLoad(option) {
 			this.id = option.id;
 			this.status = option.status;
@@ -317,7 +328,14 @@
 					}
 				}
 			},
-
+			
+			clearFailedQty(){
+				this.jobContent.failedQty = null;
+			},
+			
+			clearCrackQty(){
+				this.jobContent.crackQty = null
+			},
 
 			commit() {
 
@@ -394,7 +412,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
@@ -458,9 +476,7 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './inspectJob'
-					})
+					navigateBack(1)
 				})
 			},
 			showErrorMessage(message) {

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;">
-						发货单号 :
+						单据号 : {{requestContent.number}}
 					</view>
 					<view class="" style="font-size: 35rpx;">
-						<text>供应商 : </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];

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) {

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>

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)
+				})
 			},
 		}
 	}

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)
 				})
 			},
 		}

pages/purchaseReturn/job/returnDetail.vue

@@ -53,6 +53,7 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		navigateBack
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName
@@ -248,7 +249,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 +264,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();
 								}
 							}
@@ -418,9 +420,7 @@
 
 			showCommitSuccessMessage(number) {
 				this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
-						uni.navigateTo({
-							url: './returnJob'
-						})
+						navigateBack()
 				})
 			}
 		}

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 = [];

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)
 				})
 			},
 		}

router/my_router.js

@@ -1,7 +1,8 @@
 //只要是未登录状态，想要跳转到名单内的路径时，直接跳到登录页
 // 页面白名单，不受拦截
 const whiteList = [
-	'/pages/login/index'
+	'/pages/login/index',
+	'/pages/config/config'
 ]
 
 function hasPermission(url) {

static/icon/iconfont_filter.css → 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";
 }

static/icon/iconfont.css

@@ -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";
-} */

static/iconfont.css

@@ -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";
-}

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";
+@import "@/static/scss/colorui.css";