From 726822bef6daa8b3d5a183e184a28ea5dd1169f9 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 30 Jun 2022 09:21:52 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/stockOrderEditDistribution.vue | 8 +- .../business/stockOrderNewDistribution.vue | 2359 +++++++++-------- src/views/inout/DialogSelectRl.vue | 12 +- src/views/thrsys/SysUdimsConfig.vue | 5 +- 4 files changed, 1192 insertions(+), 1192 deletions(-) diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue index 74a603e..de5ad96 100644 --- a/src/views/business/stockOrderEditDistribution.vue +++ b/src/views/business/stockOrderEditDistribution.vue @@ -430,15 +430,11 @@ export default { this.submitFunction(status); } else { for (let i = 0; i < this.codeArray.length; i++) { - // if (this.$isBlank(this.codeArray[i].batchNo)) { - // if (!this.codeArray[i].allowNoBatch) { - // return this.$message.error('批次号不能为空'); - // } - // } + if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { return this.$message.error('生产日期与失效日期不能全部为空'); } - if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount === '0') { + if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) { return this.$message.error('配货数量不能小于0'); } if (this.detailCountMax) { diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 4a3600c..0088da4 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -1,394 +1,394 @@ diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue index e81470e..07a03c7 100644 --- a/src/views/inout/DialogSelectRl.vue +++ b/src/views/inout/DialogSelectRl.vue @@ -453,22 +453,22 @@
- 以使用单元数量入库 - 是否禁用 - 是否寄售 - 允许无批次号 - 允许无失效日期 - 允许无生产日期
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue index d1e5b47..d977cbf 100644 --- a/src/views/thrsys/SysUdimsConfig.vue +++ b/src/views/thrsys/SysUdimsConfig.vue @@ -199,7 +199,10 @@
- 添加扫码单据类型 + 添加扫码单据类型 +