Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erpbusiness/edit_quality_testing.vue

@@ -597,6 +597,7 @@
 						return
 					}
 				}
+				this.gridList.storageNumber = this.gridList.storageTagNo
 				uni.showModal({
 					content: "确定提交质检信息？",
 					showCancel: true,

pages/erpbusiness/sendCommand.vue

@@ -104,7 +104,9 @@
 		},
 		onShow() {
 			this.gridList = uni.getStorageSync("quality_print")
-			// this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
+			if(!this.gridList.compId){
+				this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
+			}
 			console.log(this.gridList)
 			let that = this;
 			let width;