haugnfuli 3 anos atrás
pai
commit
f044907c1b

+ 4 - 2
pages/erp/exWarehousing/exWarehousing.vue

@@ -362,7 +362,7 @@
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
 						3) ||
-					this.detailData.grossWeight < 1 ||
+					this.detailData.grossWeight < 0 ||
 					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误!')
@@ -377,7 +377,7 @@
 						String(this.detailData.tare).length -
 						(String(this.detailData.tare).indexOf('.') + 1) >
 						3) ||
-					this.detailData.tare < 1 ||
+					this.detailData.tare < 0 ||
 					this.detailData.tare > 10000
 				) {
 					this.$api.msg('皮重输入错误!')
@@ -586,6 +586,8 @@
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
+					this.detailData.backOffice = this.userInfo.userName
+					this.detailData.backOfficeId = this.userInfo.id
 					title = "提交成功"
 				}
 				let that = this

+ 10 - 10
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -328,8 +328,6 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-
-
 				if (!this.detailData.grossWeight) {
 					this.$api.msg('毛重不能为空')
 					return
@@ -338,9 +336,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误!')
 					return
@@ -353,9 +351,9 @@
 					(String(this.detailData.tare).indexOf('.') != -1 &&
 						String(this.detailData.tare).length -
 						(String(this.detailData.tare).indexOf('.') + 1) >
-						1) ||
-					this.detailData.tare < 1 ||
-					this.detailData.tare > 100000
+						3) ||
+					this.detailData.tare < 0 ||
+					this.detailData.tare > 10000
 				) {
 					this.$api.msg('皮重输入错误!')
 					return
@@ -379,7 +377,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误!')
 						return
@@ -414,7 +412,7 @@
 						this.$api.msg('潮粮水分输入错误!')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误!')
 						return
 					}
@@ -563,6 +561,8 @@
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
+					this.detailData.backOffice = this.userInfo.userName
+					this.detailData.backOfficeId = this.userInfo.id
 					title = "提交成功"
 				}
 				let that = this

+ 5 - 5
pages/erp/warehousing/warehousing.vue

@@ -442,9 +442,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误!')
 					return
@@ -499,7 +499,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误!')
 						return
@@ -549,7 +549,7 @@
 						this.$api.msg('潮粮水分输入错误!')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误!')
 						return
 					}