前端

pages/erpbusiness/acquisitionInformation.vue

@@ -209,7 +209,7 @@
 				} else {
 					_flag = 0
 				}
-				if(!this.textareaValue){
+				if(!this.textareaValue&&_flag==1){
 					this.$api.msg('收购信息不能为空！')
 					return
 				}

pages/erpbusiness/add_quality_testing.vue

@@ -320,6 +320,11 @@
 			}
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
+			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+				id: this.cangid
+			}).then(res => {
+				this.warehouseList = res.data.data.warehousePositionInfoList
+			})
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				warehouseId: this.cangid
 			}).then(res => {
@@ -625,11 +630,6 @@
 						uni.hideLoading()
 						// let data = res.data.data
 						// that.gridList =data
-						that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
-							id: this.cangid
-						}).then(res => {
-							that.warehouseList = res.data.data.warehousePositionInfoList
-						})
 					}
 				})
 				uni.setStorageSync('goodsName', this.gridList.goodsName)