diff --git a/ruoyi-ui/src/views/oa/costing/list.vue b/ruoyi-ui/src/views/oa/costing/list.vue index 63bcf08..b03e485 100644 --- a/ruoyi-ui/src/views/oa/costing/list.vue +++ b/ruoyi-ui/src/views/oa/costing/list.vue @@ -926,13 +926,9 @@ export default { this.$modal.msgWarning("第" + ii + "条明细名称不能为空!"); } else if (vo.price == null || vo.price == undefined || vo.price == "") { this.$modal.msgWarning("第" + ii + "条明细金额不能为空,且必须是两位小数点数字!"); - } else if (!price) { - this.$modal.msgWarning("第" + ii + "条明细金额必须是两位小数点数字!"); } else if (vo.bigPrice == null || vo.bigPrice == undefined || vo.bigPrice == "" ) { this.$modal.msgWarning("第" + ii + "条明细大写金额不能为空!"); - } else if(this.smalltoBIG(vo.price) != vo.bigPrice){ - this.$modal.msgWarning("第" + ii + "条明细大小写金额不一致!"); - }else { + } else { boolValue.push(1) } }) diff --git a/ruoyi-ui/src/views/oa/finance/index.vue b/ruoyi-ui/src/views/oa/finance/index.vue index 9f34a86..f4e28ff 100644 --- a/ruoyi-ui/src/views/oa/finance/index.vue +++ b/ruoyi-ui/src/views/oa/finance/index.vue @@ -1133,12 +1133,8 @@ export default { this.$modal.msgWarning("第" + ii + "条明细名称不能为空!"); } else if (vo.price == null || vo.price == undefined || vo.price == "") { this.$modal.msgWarning("第" + ii + "条明细金额不能为空,且必须是两位小数点数字!"); - } else if (!price) { - this.$modal.msgWarning("第" + ii + "条明细金额必须是两位小数点数字!"); } else if (vo.bigPrice == null || vo.bigPrice == undefined || vo.bigPrice == "") { this.$modal.msgWarning("第" + ii + "条明细大写金额不能为空!"); - } else if (this.smalltoBIG(vo.price) != vo.bigPrice) { - this.$modal.msgWarning("第" + ii + "条明细大小写金额不一致!"); } else { boolValue.push(1) }