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

src/pages/fg/fgChange.vue

@@ -146,7 +146,8 @@
 				toItemList: [],
 				fgList: [],
 				currentPackage: null,
-				reason: ''
+				reason: '',
+				options:[]
 			};
 		},
 		mounted() {
@@ -157,7 +158,7 @@
 				title: option.title
 			});
 			this.getBusinessType();
-			this.options = getRemoveOption()
+			// this.options = getRemoveOption()
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -322,11 +323,11 @@
 				let params = this.setParams();
 				console.log('params', JSON.stringify(params))
 				fgChangeCommit(params).then(res => {
-
 					let ss = res;
-
-
+					uni.hideLoading()
+					this.currentPackage = null
 				}).catch(err => {
+					uni.hideLoading()
 					this.showErrorMessage(err.message)
 				})
 			},

src/pages/issue/record/directIssue.vue

@@ -510,6 +510,8 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						detail.toLocationCode = toLocationCode
+						detail.productionLineCode = this.productionLineCode
+						detail.workStationCode = this.workStationCode
 					})
 				})