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

pages/erp/warehousing/warehousing.vue

@@ -525,7 +525,7 @@
 					this.$api.msg('扣重输入错误！')
 					return
 				}
-				if (this.detailData.tare > this.detailData.grossWeight) {
+				if (Number(this.detailData.tare) > Number(this.detailData.grossWeight)) {
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}