diff --git a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmInvoiceOcrServiceImpl.java b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmInvoiceOcrServiceImpl.java index f2ad035..7ff09fa 100644 --- a/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmInvoiceOcrServiceImpl.java +++ b/fad-hrm/src/main/java/com/ruoyi/hrm/service/impl/HrmInvoiceOcrServiceImpl.java @@ -153,7 +153,15 @@ public class HrmInvoiceOcrServiceImpl implements IHrmInvoiceOcrService { HrmInvoiceOcrResultVo.Item item = new HrmInvoiceOcrResultVo.Item(); item.setItemName(name); - item.setAmount(parseBigDecimal(getStringOrFieldValue(li, "amount"))); + // 行项目金额取价税合计:税前金额 + 税额 + BigDecimal preAmt = parseBigDecimal(getStringOrFieldValue(li, "amount")); + BigDecimal taxAmt = parseBigDecimal(getStringOrFieldValue(li, "tax_amount")); + BigDecimal withTax = null; + if (preAmt != null || taxAmt != null) { + withTax = (preAmt != null ? preAmt : BigDecimal.ZERO) + .add(taxAmt != null ? taxAmt : BigDecimal.ZERO); + } + item.setAmount(withTax != null ? withTax : preAmt); item.setTaxRate(getStringOrFieldValue(li, "tax_rate")); items.add(item); } diff --git a/ruoyi-ui/src/views/hrm/requests/appropriation.vue b/ruoyi-ui/src/views/hrm/requests/appropriation.vue index 8d47e4d..bc72b79 100644 --- a/ruoyi-ui/src/views/hrm/requests/appropriation.vue +++ b/ruoyi-ui/src/views/hrm/requests/appropriation.vue @@ -36,8 +36,10 @@ - - + + + {{ form.amount != null && form.amount > 0 ? '¥' + form.amount : '根据发票明细自动汇总' }} + @@ -300,7 +302,7 @@ export default { }, rules: { appropriationType: [{ required: true, message: '请选择/输入拨款类型', trigger: 'change' }], - amount: [{ required: true, message: '请填写拨款总金额', trigger: 'blur' }] + amount: [] } } }, @@ -675,6 +677,18 @@ export default { b { color: #e6a23c; font-size: 14px; } } +.amount-readonly { + height: 32px; + line-height: 32px; + padding: 0 12px; + font-size: 14px; + font-weight: 600; + color: #e6a23c; + background: #fffbf2; + border: 1px solid #faecd8; + border-radius: 4px; +} + .flow-preview { margin-top: 10px; padding: 12px; diff --git a/ruoyi-ui/src/views/hrm/requests/reimburse.vue b/ruoyi-ui/src/views/hrm/requests/reimburse.vue index db46c9e..78385db 100644 --- a/ruoyi-ui/src/views/hrm/requests/reimburse.vue +++ b/ruoyi-ui/src/views/hrm/requests/reimburse.vue @@ -36,8 +36,10 @@ - - + + + {{ form.totalAmount != null && form.totalAmount > 0 ? '¥' + form.totalAmount : '根据发票明细自动汇总' }} + @@ -274,7 +276,7 @@ export default { }, rules: { reimburseType: [{ required: true, message: '请选择/输入报销类型', trigger: 'change' }], - totalAmount: [{ required: true, message: '请填写报销总金额', trigger: 'blur' }], + totalAmount: [], accessoryApplyIds: [{ required: true, message: '请上传报销单据附件', trigger: 'change' }] } } @@ -661,6 +663,18 @@ export default { b { color: #e6a23c; font-size: 14px; } } +.amount-readonly { + height: 32px; + line-height: 32px; + padding: 0 12px; + font-size: 14px; + font-weight: 600; + color: #e6a23c; + background: #fffbf2; + border: 1px solid #faecd8; + border-radius: 4px; +} + .flow-preview { margin-top: 10px; padding: 12px;