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

pages/business/businessNew.vue

@@ -366,6 +366,8 @@
 						uni.navigateTo({
 							url: 'release'
 						})
+					}else{
+						
 					}
 					
 				}

pages/business/release.vue

@@ -146,9 +146,9 @@
 		},
 		onLoad() {
 			console.log("user", this.userInfo)
-			this.dataObj.userId = this.userInfo.id
-			this.dataObj.publisher = this.userInfo.wechatNo
-			this.dataObj.remark = this.userInfo.phone
+			this.dataObj.userId = uni.getStorageSync('userInfo').id
+			this.dataObj.publisher = uni.getStorageSync('userInfo').wechatNo
+			this.dataObj.remark = uni.getStorageSync('userInfo').phone
 		},
 		onNavigationBarButtonTap(e) {
 			console.log(e)
@@ -179,8 +179,9 @@
 		},
 		methods: {
 			deleteImg(index) {
-				this.num = this.imgList.length
 				this.imgList.splice(index, 1)
+				this.num = this.imgList.length
+				
 			},
 			async uploadClick() {
 				let baseUrlNew = config.def().baseUrlNew
@@ -203,11 +204,11 @@
 								url: item.path
 							});
 						}
-						console.log(files)
+						console.log(files,this.num)
 						for (let i = 0; i < files.length; i++) {
 							this.num++
 							if (this.num < 10) {
-								console.log(this.num)
+								console.log(this.num,11111111111)
 								uni.uploadFile({
 									url: baseUrlNew + 'appendix/api/uploadFiles',
 									// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址

pages/erpbusiness/edit_quality_testing.vue

@@ -1340,7 +1340,7 @@
 				var kid=JSON.parse(JSON.stringify(this.gridList.warehouseInOutId))
 				this.zjid=JSON.parse(JSON.stringify(this.gridList.id))
 				that.gridList.warehouseInOutDetail={
-					id:that.gridList.warehouseInOutId,
+					id:that.gridList.warehouseInOutDetailId,
 					grade:that.gridList.grade,
 					reGrade:that.gridList.grade,
 					waterContent:that.gridList.waterContent,
@@ -1378,12 +1378,12 @@
 											'/qualityInspectionManagement/api/editQualityInspection', that.gridList)
 										.then(res => {
 											uni.setStorageSync("quality_print", that.gridList)
-											that.gridList.id=kid
-											that.gridList.statusFlag=1
-											that.$api.doRequest('post',
-													'/warehouseInOutInfo/InOutWarehouse',
-													that.gridList)
-												.then(res => {
+											// that.gridList.id=kid
+											// that.gridList.statusFlag=1
+											// that.$api.doRequest('post',
+											// 		'/warehouseInOutInfo/InOutWarehouse',
+											// 		that.gridList)
+											// 	.then(res => {
 											if (res.data.code == 200) {
 												that.$api.msg('编辑质检成功')
 												that.gridList.warehouseId = that.cangid
@@ -1397,7 +1397,7 @@
 												// uni.getStorageSync("depotAcquisition_warehouseName")
 												// uni.navigateBack({})
 											}
-										})
+										// })
 									})
 								}
 							}