出入库暂存校验

pages/erp/exWarehousing/exWarehousing.vue

@@ -435,7 +435,7 @@
 				}
 
 
-				if (!this.detailData.grossWeight) {
+				if (!this.detailData.grossWeight && num == 2) {
 					this.$api.msg('毛重不能为空')
 					return
 				}
@@ -450,7 +450,7 @@
 					this.$api.msg('毛重输入错误！')
 					return
 				}
-				if (!this.detailData.tare) {
+				if (!this.detailData.tare && num == 2) {
 					this.$api.msg('皮重不能为空')
 					return
 				}
@@ -470,12 +470,12 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight <= 0) {
+				if (this.netWeight <= 0 && num == 2) {
 					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
-					if (!this.detailData.buckleWeightRatio) {
+					if (!this.detailData.buckleWeightRatio && num == 2) {
 						this.$api.msg('扣重比不能为空')
 						return
 					}
@@ -490,7 +490,7 @@
 						this.$api.msg('扣重比输入错误！')
 						return
 					}
-					if (!this.detailData.solidGrainWater) {
+					if (!this.detailData.solidGrainWater && num == 2) {
 						this.$api.msg('干粮水分不能为空')
 						return
 					}
@@ -505,7 +505,7 @@
 						this.$api.msg('干粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.tidalGrainWater) {
+					if (!this.detailData.tidalGrainWater && num == 2) {
 						this.$api.msg('潮粮水分不能为空')
 						return
 					}
@@ -524,12 +524,12 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.pureWeight) {
+					if (!this.detailData.pureWeight && num == 2) {
 						this.$api.msg('纯重不能为空')
 						return
 					}
 				}
-				if (this.detailData.grade == "请输入品级") {
+				if (this.detailData.grade == "请输入品级" && num == 2) {
 					this.$api.msg('品级不能为空')
 					return
 				}
@@ -545,7 +545,7 @@
 					this.$api.msg('出库类型不能为空')
 					return
 				}
-				if (!this.detailData.carNo) {
+				if (!this.detailData.carNo && num == 2) {
 					this.$api.msg('车牌号不能为空')
 					return
 				}
@@ -553,7 +553,7 @@
 					this.$api.msg('车牌号输入有误！')
 					return
 				}
-				if (!this.detailData.addressUrl) {
+				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
 				}

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -410,7 +410,7 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (!this.detailData.grossWeight) {
+				if (!this.detailData.grossWeight && num == 2) {
 					this.$api.msg('毛重不能为空')
 					return
 				}
@@ -425,7 +425,7 @@
 					this.$api.msg('毛重输入错误！')
 					return
 				}
-				if (!this.detailData.tare) {
+				if (!this.detailData.tare && num == 2) {
 					this.$api.msg('皮重不能为空')
 					return
 				}
@@ -444,12 +444,12 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight <= 0) {
+				if (this.netWeight <= 0 && num == 2) {
 					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
-					if (!this.detailData.buckleWeightRatio) {
+					if (!this.detailData.buckleWeightRatio && num == 2) {
 						this.$api.msg('扣重比不能为空')
 						return
 					}
@@ -464,7 +464,7 @@
 						this.$api.msg('扣重比输入错误！')
 						return
 					}
-					if (!this.detailData.solidGrainWater) {
+					if (!this.detailData.solidGrainWater && num == 2) {
 						this.$api.msg('干粮水分不能为空')
 						return
 					}
@@ -479,7 +479,7 @@
 						this.$api.msg('干粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.tidalGrainWater) {
+					if (!this.detailData.tidalGrainWater && num == 2) {
 						this.$api.msg('潮粮水分不能为空')
 						return
 					}
@@ -498,7 +498,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.pureWeight) {
+					if (!this.detailData.pureWeight && num == 2) {
 						this.$api.msg('纯重不能为空')
 						return
 					}
@@ -519,7 +519,7 @@
 					this.$api.msg('出库类型不能为空')
 					return
 				}
-				if (!this.detailData.carNo) {
+				if (!this.detailData.carNo && num == 2) {
 					this.$api.msg('车牌号不能为空')
 					return
 				}
@@ -527,7 +527,7 @@
 					this.$api.msg('车牌号输入有误！')
 					return
 				}
-				if (!this.detailData.addressUrl) {
+				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
 				}

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -531,7 +531,7 @@
 				this.$api.msg('货名不能为空')
 				return
 			}
-			if (!this.detailData.grossWeight) {
+			if (!this.detailData.grossWeight && num == 2) {
 				this.$api.msg('毛重不能为空')
 				return
 			}
@@ -546,7 +546,7 @@
 				this.$api.msg('毛重输入错误！')
 				return
 			}
-			if (!this.detailData.tare) {
+			if (!this.detailData.tare && num == 2) {
 				this.$api.msg('皮重不能为空')
 				return
 			}
@@ -562,7 +562,7 @@
 				return
 			}
 			
-			if (!this.detailData.deductionWeight) {
+			if (!this.detailData.deductionWeight && num == 2) {
 				this.$api.msg('扣重不能为空')
 				return
 			}
@@ -581,12 +581,12 @@
 				this.$api.msg('皮重不能大于毛重')
 				return
 			}
-			if (this.netWeight <= 0) {
+			if (this.netWeight <= 0 && num == 2) {
 				this.$api.msg('净重不能小于等于0')
 				return
 			}
 			if (this.detailData.type == "潮粮") {
-				if (!this.detailData.buckleWeightRatio) {
+				if (!this.detailData.buckleWeightRatio && num == 2) {
 					this.$api.msg('扣重比不能为空')
 					return
 				}
@@ -601,7 +601,7 @@
 					this.$api.msg('扣重比输入错误！')
 					return
 				}
-				if (!this.detailData.solidGrainWater) {
+				if (!this.detailData.solidGrainWater && num == 2) {
 					this.$api.msg('干粮水分不能为空')
 					return
 				}
@@ -616,7 +616,7 @@
 					this.$api.msg('干粮水分输入错误！')
 					return
 				}
-				if (!this.detailData.tidalGrainWater) {
+				if (!this.detailData.tidalGrainWater && num == 2) {
 					this.$api.msg('潮粮水分不能为空')
 					return
 				}
@@ -631,7 +631,7 @@
 					this.$api.msg('扣款输入错误！')
 					return
 				}
-				if (!this.detailData.deductionAmount) {
+				if (!this.detailData.deductionAmount && num == 2) {
 					this.$api.msg('扣款不能为空')
 					return
 				}
@@ -650,7 +650,7 @@
 					this.$api.msg('潮粮水分输入错误！')
 					return
 				}
-				if (!this.detailData.pureWeight) {
+				if (!this.detailData.pureWeight && num == 2) {
 					this.$api.msg('纯重不能为空')
 					return
 				}
@@ -671,7 +671,7 @@
 				this.$api.msg('入库类型不能为空')
 				return
 			}
-			if (!this.detailData.carNo) {
+			if (!this.detailData.carNo && num == 2) {
 				this.$api.msg('车牌号不能为空')
 				return
 			}
@@ -679,11 +679,11 @@
 				this.$api.msg('车牌号输入有误！')
 				return
 			}
-			if (!this.detailData.addressUrl) {
+			if (!this.detailData.addressUrl && num == 2) {
 				this.$api.msg('请上传磅单')
 				return
 			}
-				if (!this.detailData.cost) {
+				if (!this.detailData.cost && num == 2) {
 					this.$api.msg('未获取到成本，请编辑后提交')
 					return
 				}
@@ -697,7 +697,7 @@
 					this.$api.msg('成本输入错误')
 					return
 				}
-			if (!this.detailData.freight) {
+			if (!this.detailData.freight && num == 2) {
 				this.$api.msg('运费不能为空')
 				return
 			}

pages/erp/warehousing/warehousing.vue

@@ -522,7 +522,7 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (!this.detailData.grossWeight) {
+				if (!this.detailData.grossWeight && num == 2) {
 					this.$api.msg('毛重不能为空')
 					return
 				}
@@ -537,7 +537,7 @@
 					this.$api.msg('毛重输入错误！')
 					return
 				}
-				if (!this.detailData.tare) {
+				if (!this.detailData.tare && num == 2) {
 					this.$api.msg('皮重不能为空')
 					return
 				}
@@ -553,7 +553,7 @@
 					return
 				}
 
-				if (!this.detailData.deductionWeight) {
+				if (!this.detailData.deductionWeight && num == 2) {
 					this.$api.msg('扣重不能为空')
 					return
 				}
@@ -572,12 +572,12 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight <= 0) {
+				if (this.netWeight <= 0 && num == 2) {
 					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
-					if (!this.detailData.buckleWeightRatio) {
+					if (!this.detailData.buckleWeightRatio && num == 2) {
 						this.$api.msg('扣重比不能为空')
 						return
 					}
@@ -592,7 +592,7 @@
 						this.$api.msg('扣重比输入错误！')
 						return
 					}
-					if (!this.detailData.solidGrainWater) {
+					if (!this.detailData.solidGrainWater && num == 2) {
 						this.$api.msg('干粮水分不能为空')
 						return
 					}
@@ -607,7 +607,7 @@
 						this.$api.msg('干粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.tidalGrainWater) {
+					if (!this.detailData.tidalGrainWater && num == 2) {
 						this.$api.msg('潮粮水分不能为空')
 						return
 					}
@@ -622,7 +622,7 @@
 						this.$api.msg('扣款输入错误！')
 						return
 					}
-					if (!this.detailData.deductionAmount) {
+					if (!this.detailData.deductionAmount && num == 2) {
 						this.$api.msg('扣款不能为空')
 						return
 					}
@@ -641,7 +641,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.pureWeight) {
+					if (!this.detailData.pureWeight && num == 2) {
 						this.$api.msg('纯重不能为空')
 						return
 					}
@@ -670,11 +670,11 @@
 					this.$api.msg('车牌号输入有误！')
 					return
 				}
-				if (!this.detailData.addressUrl) {
+				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
 				}
-					if (!this.detailData.cost) {
+					if (!this.detailData.cost && num == 2) {
 						this.$api.msg('未获取到成本，请编辑后提交')
 						return
 					}
@@ -688,7 +688,7 @@
 						this.$api.msg('成本输入错误')
 						return
 					}
-				if (!this.detailData.freight) {
+				if (!this.detailData.freight && num == 2) {
 					this.$api.msg('运费不能为空')
 					return
 				}