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

src/pages/index/index.vue

@@ -365,10 +365,12 @@
 					console.log("包装规格获取失败", res)
 				})
 				
-				// getSwitchByCode(code).then(res=>{
+				var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate";
-				// 	uni.setStorageSync("switch", res.data)
+
-				// }).catch(error=>{
+				getSwitchByCode(switchCode).then(res=>{
-				// })
+					uni.setStorageSync("switch", res.data)
+				}).catch(error=>{
+				})
 			},
 
 			openCheck(url) {

src/pages/productPutaway/job/fgProductPutawayJob.vue

@@ -8,7 +8,6 @@
 	import productPutawayJob from '@/pages/productPutaway/job/productPutawayJob.vue'
 
 	export default {
-		name: 'productPutawayJob',
 		components: {
 			productPutawayJob
 		},
@@ -29,9 +28,9 @@
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
-				this.$refs.productreceiptjob.toHome();
+				this.$refs.productPutawayJob.toHome();
 			} else if (e.index == 1) {
-				this.$refs.productreceiptjob.openFilter();
+				this.$refs.productPutawayJob.openFilter();
 			}
 		},
 

src/pages/productPutaway/job/productPutawayJob.vue

@@ -49,7 +49,6 @@
 	import jobInfoPopup from '@/pages/productPutaway/coms/jobInfoPopup.vue'
 
 	export default {
-		name: 'Putaway',
 		components: {
 			comEmptyView,
 			jobFilter,

src/pages/productPutaway/job/semiProductPutawayJob.vue

@@ -8,7 +8,6 @@
 	import productPutawayJob from '@/pages/productPutaway/job/productPutawayJob.vue'
 
 	export default {
-		name: 'productPutawayJob',
 		components: {
 			productPutawayJob
 		},
@@ -29,9 +28,9 @@
 		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
-				this.$refs.productreceiptjob.toHome();
+				this.$refs.productPutawayJob.toHome();
 			} else if (e.index == 1) {
-				this.$refs.productreceiptjob.openFilter();
+				this.$refs.productPutawayJob.openFilter();
 			}
 		},